mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Completely remove Graphics::PrintWrap

Browse source 
All print calls are font:: ones now and all the old Graphics:: print
functions have been removed, the migration is complete!
This commit is contained in:
Dav999-v 2023-01-20 21:11:18 +01:00 committed by Misa Elizabeth Kai
parent 0e30087f3b
commit 0eaceed0a2
4 changed files with 177 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
desktop_version/src/Editor.cpp
View file

@ -492,11 +492,11 @@ static void editormenurender(int tr, int tg, int tb)
songname = loc::gettext("?: something else"); songname = loc::gettext("?: something else");
break; break;
} }
graphics.PrintWrap( -1, 120, songname, tr, tg, tb, true); font::print_wrap(PR_CEN, -1, 120, songname, tr, tg, tb);
break; break;
} }
case Menu::ed_quit: case Menu::ed_quit:
graphics.PrintWrap(-1, 90, loc::gettext("Save before quitting?"), tr, tg, tb, true); font::print_wrap(PR_CEN, -1, 90, loc::gettext("Save before quitting?"), tr, tg, tb);
break; break;
default: default:
break; break;
@ -1167,7 +1167,7 @@ void editorrender(void)
graphics.fill_rect(0,238-textheight,320,240, graphics.getRGB(32,32,32)); graphics.fill_rect(0,238-textheight,320,240, graphics.getRGB(32,32,32));
graphics.fill_rect(0,239-textheight,320,240, graphics.getRGB(0,0,0)); graphics.fill_rect(0,239-textheight,320,240, graphics.getRGB(0,0,0));
graphics.PrintWrap(4, 240-textheight, message, 255,255,255, false, 8, 312); font::print_wrap(0, 4, 240-textheight, message, 255,255,255, 8, 312);
} }
else if(ed.scripteditmod) else if(ed.scripteditmod)
{ {
@ -1204,7 +1204,7 @@ void editorrender(void)
else else
{ {
font::print(PR_CEN, -1,110,loc::gettext("NO SCRIPT IDS FOUND"), 123, 111, 218); font::print(PR_CEN, -1,110,loc::gettext("NO SCRIPT IDS FOUND"), 123, 111, 218);
graphics.PrintWrap(16,130,loc::gettext("CREATE A SCRIPT WITH EITHER THE TERMINAL OR SCRIPT BOX TOOLS"), 123, 111, 218, true, 10, 288); font::print_wrap(PR_CEN, -1,130,loc::gettext("CREATE A SCRIPT WITH EITHER THE TERMINAL OR SCRIPT BOX TOOLS"), 123, 111, 218, 10, 288);
} }
break; break;
case 1: case 1:
@ -1611,7 +1611,7 @@ void editorrender(void)
float alpha = graphics.lerp(ed.oldnotedelay, ed.notedelay); float alpha = graphics.lerp(ed.oldnotedelay, ed.notedelay);
graphics.fill_rect(0, banner_y, 320, 10+textheight, graphics.getRGB(92,92,92)); graphics.fill_rect(0, banner_y, 320, 10+textheight, graphics.getRGB(92,92,92));
graphics.fill_rect(0, banner_y+1, 320, 8+textheight, graphics.getRGB(0,0,0)); graphics.fill_rect(0, banner_y+1, 320, 8+textheight, graphics.getRGB(0,0,0));
graphics.PrintWrap(0,banner_y+5, wrapped, 196-((45.0f-alpha)*4), 196-((45.0f-alpha)*4), 196-((45.0f-alpha)*4), true); font::print_wrap(PR_CEN, -1,banner_y+5, wrapped, 196-((45.0f-alpha)*4), 196-((45.0f-alpha)*4), 196-((45.0f-alpha)*4));
} }
graphics.drawfade(); graphics.drawfade();

18
desktop_version/src/Graphics.cpp
View file

@ -337,24 +337,6 @@ void Graphics::map_option(int opt, int num_opts, const std::string& text, bool s
} }
} }
int Graphics::PrintWrap(
const int x,
int y,
const std::string& text,
const int r,
const int g,
const int b,
const bool cen /*= false*/,
int linespacing /*= -1*/,
int maxwidth /*= -1*/
) {
// DEPRECATED
if (cen)
return font::print_wrap(PR_CEN, -1, y, text, r, g, b, linespacing /*= -1 */, maxwidth /*= -1 */);
else
return font::print_wrap(0, x, y, text, r, g, b, linespacing /*= -1 */, maxwidth /*= -1 */);
}
void Graphics::printcrewname( int x, int y, int t ) void Graphics::printcrewname( int x, int y, int t )
{ {

2
desktop_version/src/Graphics.h
View file

@ -202,8 +202,6 @@ public:
void map_option(int opt, int num_opts, const std::string& text, bool selected = false); void map_option(int opt, int num_opts, const std::string& text, bool selected = false);
int PrintWrap(int x, int y, const std::string& s, int r, int g, int b, bool cen = false, int linespacing = -1, int maxwidth = -1);
void drawspritesetcol(int x, int y, int t, int c); void drawspritesetcol(int x, int y, int t, int c);

344
desktop_version/src/Render.cpp
View file

File diff suppressed because it is too large Load diff