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::len

Browse source 
I migrated all graphics.len calls over to font::len (and also migrated
prints mainly surrounding those graphics.len's) so the old len function
is now completely removed.
This commit is contained in:
Dav999-v 2023-01-17 04:41:12 +01:00 committed by Misa Elizabeth Kai
parent a706fb249a
commit da6be09993
3 changed files with 112 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
desktop_version/src/Graphics.cpp
View file

@ -297,11 +297,11 @@ void Graphics::map_tab(int opt, const char* text, bool selected /*= false*/)
{ {
char buffer[SCREEN_WIDTH_CHARS + 1]; char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf(buffer, sizeof(buffer), loc::get_langmeta()->menu_select_tight.c_str(), "label:str", text); vformat_buf(buffer, sizeof(buffer), loc::get_langmeta()->menu_select_tight.c_str(), "label:str", text);
Print(x - len(buffer)/2, 220, buffer, 196, 196, 255 - help.glow); font::print(PR_CEN, x, 220, buffer, 196, 196, 255 - help.glow);
} }
else else
{ {
Print(x - len(text)/2, 220, text, 64, 64, 64); font::print(PR_CEN, x, 220, text, 64, 64, 64);
} }
} }
@ -393,12 +393,6 @@ void Graphics::bigbprint(int x, int y, const std::string& text, int r, int g, in
font::print(PR_scX | PR_BOR, x, y, text, r, g, b); font::print(PR_scX | PR_BOR, x, y, text, r, g, b);
} }
int Graphics::len(const std::string& t)
{
// DEPRECATED
return font::len(0, t);
}
void Graphics::bprint( int x, int y, const std::string& text, int r, int g, int b, bool cen /*= false*/ ) { void Graphics::bprint( int x, int y, const std::string& text, int r, int g, int b, bool cen /*= false*/ ) {
// DEPRECATED // DEPRECATED
if (cen) if (cen)
@ -907,7 +901,7 @@ void Graphics::drawgui(void)
{ {
int sc = 2; int sc = 2;
int y = 28; int y = 28;
if (len(translation) > 144) if (font::len(0, translation) > 144)
{ {
// We told translators how long it could be... Ah well, mitigate the damage. // We told translators how long it could be... Ah well, mitigate the damage.
sc = 1; sc = 1;
@ -917,7 +911,7 @@ void Graphics::drawgui(void)
{ {
y = 240 - y - 8*sc; y = 240 - y - 8*sc;
} }
bigprint(-1, y, translation, 164, 164, 255, true, sc); font::print(sc==2 ? PR_2X : PR_1X | PR_CEN, -1, y, translation, 164, 164, 255);
} }
else else
{ {
@ -943,7 +937,7 @@ void Graphics::drawgui(void)
{ {
int sc = 2; int sc = 2;
int y = 28; int y = 28;
if (len(translation) > 144) if (font::len(0, translation) > 144)
{ {
// We told translators how long it could be... Ah well, mitigate the damage. // We told translators how long it could be... Ah well, mitigate the damage.
sc = 1; sc = 1;
@ -953,7 +947,7 @@ void Graphics::drawgui(void)
{ {
y = 240 - y - 8*sc; y = 240 - y - 8*sc;
} }
bigprint(-1, y, translation, 164, 164, 255, true, sc); font::print(sc==2 ? PR_2X : PR_1X | PR_CEN, -1, y, translation, 196, 196, 243);
} }
else else
{ {

2
desktop_version/src/Graphics.h
View file

@ -212,8 +212,6 @@ public:
void bprintalpha(int x, int y, const std::string& t, int r, int g, int b, int a, bool cen = false); void bprintalpha(int x, int y, const std::string& t, int r, int g, int b, int a, bool cen = false);
int len(const std::string& t);
void bigprint( int _x, int _y, const std::string& _s, int r, int g, int b, bool cen = false, int sc = 2 ); void bigprint( int _x, int _y, const std::string& _s, int r, int g, int b, bool cen = false, int sc = 2 );
void bigbprint(int x, int y, const std::string& s, int r, int g, int b, bool cen = false, int sc = 2); void bigbprint(int x, int y, const std::string& s, int r, int g, int b, bool cen = false, int sc = 2);
void drawspritesetcol(int x, int y, int t, int c); void drawspritesetcol(int x, int y, int t, int c);

210
desktop_version/src/Render.cpp
View file

@ -635,8 +635,7 @@ static void menurender(void)
graphics.Print(8, 208, loc::gettext("Language folder:"), tr/2, tg/2, tb/2); graphics.Print(8, 208, loc::gettext("Language folder:"), tr/2, tg/2, tb/2);
} }
char* mainLangDir = FILESYSTEM_getUserMainLangDirectory(); font::print(PR_RIGHT, 316, 224, FILESYSTEM_getUserMainLangDirectory(), tr/2, tg/2, tb/2);
graphics.Print(316-graphics.len(mainLangDir), 224, mainLangDir, tr/2, tg/2, tb/2);
} }
break; break;
case Menu::translator_options: case Menu::translator_options:
@ -1139,7 +1138,7 @@ static void menurender(void)
"savebox_n_trinkets:int", "savebox_n_trinkets:int",
game.tele_trinkets game.tele_trinkets
); );
graphics.Print(262-graphics.len(buffer), 132-20, buffer, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2)); font::print(PR_RIGHT, 262, 132-20, buffer, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
graphics.draw_sprite(34, 126-20, 50, graphics.col_clock); graphics.draw_sprite(34, 126-20, 50, graphics.col_clock);
graphics.draw_sprite(270, 126-20, 22, graphics.col_trinket); graphics.draw_sprite(270, 126-20, 22, graphics.col_trinket);
@ -1163,7 +1162,7 @@ static void menurender(void)
"savebox_n_trinkets:int", "savebox_n_trinkets:int",
game.quick_trinkets game.quick_trinkets
); );
graphics.Print(262-graphics.len(buffer), 132-20, buffer, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2)); font::print(PR_RIGHT, 262, 132-20, buffer, 255 - (help.glow / 2), 255 - (help.glow / 2), 255 - (help.glow / 2));
graphics.draw_sprite(34, 126-20, 50, graphics.col_clock); graphics.draw_sprite(34, 126-20, 50, graphics.col_clock);
graphics.draw_sprite(270, 126-20, 22, graphics.col_trinket); graphics.draw_sprite(270, 126-20, 22, graphics.col_trinket);
@ -1256,25 +1255,25 @@ static void menurender(void)
case Menu::timetrialcomplete2: case Menu::timetrialcomplete2:
case Menu::timetrialcomplete3: case Menu::timetrialcomplete3:
{ {
graphics.bigprint( -1, 20, loc::gettext("Results"), tr, tg, tb, true, 3); font::print(PR_3X | PR_CEN, -1, 20, loc::gettext("Results"), tr, tg, tb);
std::string tempstring = game.resulttimestring() + loc::gettext(" / ") + game.timetstring(game.timetrialresultpar) + loc::gettext(".99"); std::string tempstring = game.resulttimestring() + loc::gettext(" / ") + game.timetstring(game.timetrialresultpar) + loc::gettext(".99");
graphics.drawspritesetcol(22, 80-15, 50, 22); graphics.drawspritesetcol(22, 80-15, 50, 22);
graphics.Print(49, 80-15, loc::gettext("TIME TAKEN:"), 255, 255, 255); font::print(PR_CJK_HIGH, 49, 80-15, loc::gettext("TIME TAKEN:"), 255, 255, 255);
graphics.Print(49, 90-15, tempstring, tr, tg, tb); font::print(PR_CJK_LOW, 49, 90-15, tempstring, tr, tg, tb);
if (game.timetrialresulttime <= game.timetrialresultpar) if (game.timetrialresulttime <= game.timetrialresultpar)
{ {
graphics.Print(228, 90-15, loc::gettext("+1 Rank!"), 255, 255, 255); font::print(PR_CJK_LOW, 228, 90-15, loc::gettext("+1 Rank!"), 255, 255, 255);
} }
tempstring = help.String(game.timetrialresultdeaths); tempstring = help.String(game.timetrialresultdeaths);
graphics.drawspritesetcol(22-4, 80+20-4, 12, 22); graphics.drawspritesetcol(22-4, 80+20-4, 12, 22);
graphics.Print(49, 80+20, loc::gettext("NUMBER OF DEATHS:"), 255, 255, 255); font::print(PR_CJK_HIGH, 49, 80+20, loc::gettext("NUMBER OF DEATHS:"), 255, 255, 255);
graphics.Print(49, 90+20, tempstring, tr, tg, tb); font::print(PR_CJK_LOW, 49, 90+20, tempstring, tr, tg, tb);
if (game.timetrialresultdeaths == 0) if (game.timetrialresultdeaths == 0)
{ {
graphics.Print(228, 90+20, loc::gettext("+1 Rank!"), 255, 255, 255); font::print(PR_CJK_LOW, 228, 90+20, loc::gettext("+1 Rank!"), 255, 255, 255);
} }
char buffer[SCREEN_WIDTH_CHARS + 1]; char buffer[SCREEN_WIDTH_CHARS + 1];
@ -1285,11 +1284,11 @@ static void menurender(void)
game.timetrialresulttrinkets, game.timetrialresultshinytarget game.timetrialresulttrinkets, game.timetrialresultshinytarget
); );
graphics.drawspritesetcol(22, 80+55, 22, 22); graphics.drawspritesetcol(22, 80+55, 22, 22);
graphics.Print(49, 80+55, loc::gettext("SHINY TRINKETS:"), 255, 255, 255); font::print(PR_CJK_HIGH, 49, 80+55, loc::gettext("SHINY TRINKETS:"), 255, 255, 255);
graphics.Print(49, 90+55, buffer, tr, tg, tb); font::print(PR_CJK_LOW, 49, 90+55, buffer, tr, tg, tb);
if (game.timetrialresulttrinkets >= game.timetrialresultshinytarget) if (game.timetrialresulttrinkets >= game.timetrialresultshinytarget)
{ {
graphics.Print(228, 90+55, loc::gettext("+1 Rank!"), 255, 255, 255); font::print(PR_CJK_LOW, 228, 90+55, loc::gettext("+1 Rank!"), 255, 255, 255);
} }
const char* rank = ""; const char* rank = "";
@ -1308,18 +1307,18 @@ static void menurender(void)
rank = loc::gettext("V"); rank = loc::gettext("V");
break; break;
} }
int rankw = graphics.len(rank)*4; int rankw = font::len(PR_4X, rank);
int ranktextw = graphics.len(loc::gettext("Rank:"))*2 + 16 + rankw; int ranktextw = font::len(PR_2X, loc::gettext("Rank:")) + 16 + rankw;
int ranktextx = (320-ranktextw)/2; int ranktextx = (320-ranktextw)/2;
int rankx = ranktextx + ranktextw - rankw; int rankx = ranktextx + ranktextw - rankw;
if (game.currentmenuname == Menu::timetrialcomplete2 || game.currentmenuname == Menu::timetrialcomplete3) if (game.currentmenuname == Menu::timetrialcomplete2 || game.currentmenuname == Menu::timetrialcomplete3)
{ {
graphics.bigprint(ranktextx, 175, loc::gettext("Rank:"), tr, tg, tb, false, 2); font::print(PR_2X, ranktextx, 175, loc::gettext("Rank:"), tr, tg, tb);
} }
if (game.currentmenuname == Menu::timetrialcomplete3) if (game.currentmenuname == Menu::timetrialcomplete3)
{ {
graphics.bigprint(rankx, 165, rank, 255, 255, 255, false, 4); font::print(PR_4X, rankx, 165, rank, 255, 255, 255);
} }
break; break;
} }
@ -1442,18 +1441,20 @@ static void menurender(void)
} }
else else
{ {
graphics.Print(32, 65, loc::gettext("RECORDS"), tr, tg, tb); int sp = SDL_max(10, font::height(0));
const char* label = loc::gettext("TIME");
int label_len = graphics.len(label);
graphics.Print(32, 75, label, tr, tg, tb);
label = loc::gettext("SHINY");
label_len = SDL_max(label_len, graphics.len(label));
graphics.Print(32, 85, label, tr, tg, tb);
label = loc::gettext("LIVES");
label_len = SDL_max(label_len, graphics.len(label));
graphics.Print(32, 95, label, tr, tg, tb);
graphics.Print(label_len+48, 75, game.timetstring(game.besttimes[id_trial]), tr, tg, tb); font::print(0, 32, 65, loc::gettext("RECORDS"), tr, tg, tb);
const char* label = loc::gettext("TIME");
int label_len = font::len(0, label);
font::print(0, 32, 65+sp, label, tr, tg, tb);
label = loc::gettext("SHINY");
label_len = SDL_max(label_len, font::len(0, label));
font::print(0, 32, 65+sp*2, label, tr, tg, tb);
label = loc::gettext("LIVES");
label_len = SDL_max(label_len, font::len(0, label));
font::print(0, 32, 65+sp*3, label, tr, tg, tb);
font::print(0, label_len+48, 65+sp, game.timetstring(game.besttimes[id_trial]), tr, tg, tb);
char buffer[SCREEN_WIDTH_CHARS + 1]; char buffer[SCREEN_WIDTH_CHARS + 1];
vformat_buf( vformat_buf(
@ -1462,8 +1463,8 @@ static void menurender(void)
"n_trinkets:int, max_trinkets:int", "n_trinkets:int, max_trinkets:int",
game.besttrinkets[id_trial], max_trinkets game.besttrinkets[id_trial], max_trinkets
); );
graphics.Print(label_len+48, 85, buffer, tr, tg, tb); font::print(0, label_len+48, 65+sp*2, buffer, tr, tg, tb);
graphics.Print(label_len+48, 95, help.String(game.bestlives[id_trial]), tr, tg, tb); font::print(0, label_len+48, 65+sp*3, help.String(game.bestlives[id_trial]), tr, tg, tb);
const char* str_par_time = loc::gettext("PAR TIME"); const char* str_par_time = loc::gettext("PAR TIME");
@ -1489,10 +1490,10 @@ static void menurender(void)
} }
int w[4] = { int w[4] = {
graphics.len(str_par_time), font::len(0, str_par_time),
graphics.len(par_time), font::len(0, par_time),
graphics.len(str_best_rank), font::len(0, str_best_rank),
graphics.len(rank)*2 font::len(PR_2X, rank)
}; };
int longest_w = 0; int longest_w = 0;
for (size_t i = 0; i < 4; i++) for (size_t i = 0; i < 4; i++)
@ -1504,12 +1505,13 @@ static void menurender(void)
} }
int center_x = 288 - longest_w/2; int center_x = 288 - longest_w/2;
graphics.Print(center_x - w[0]/2, 65, str_par_time, tr, tg, tb); font::print(PR_CEN, center_x, 65, str_par_time, tr, tg, tb);
graphics.Print(center_x - w[1]/2, 75, par_time, tr, tg, tb); font::print(PR_CEN, center_x, 65+sp, par_time, tr, tg, tb);
graphics.Print(center_x - w[2]/2, 95, str_best_rank, tr, tg, tb); font::print(PR_CEN, center_x, 65+sp*3, str_best_rank, tr, tg, tb);
graphics.bigprint( font::print(
center_x - w[3]/2, PR_2X | PR_CEN,
106, center_x,
66+sp*4,
rank, rank,
225, 225, 225 225, 225, 225
); );
@ -1904,11 +1906,11 @@ void gamerender(void)
&& !roomname_translator::enabled) && !roomname_translator::enabled)
{ {
const char* tempstring = loc::gettext("TIME:"); const char* tempstring = loc::gettext("TIME:");
int label_len = graphics.len(tempstring); int label_len = font::len(0, tempstring);
graphics.bprint(6, 6, tempstring, 255,255,255); font::print(PR_BOR, 6, 6, tempstring, 255,255,255);
char buffer[SCREEN_WIDTH_CHARS + 1]; char buffer[SCREEN_WIDTH_CHARS + 1];
game.timestringcenti(buffer, sizeof(buffer)); game.timestringcenti(buffer, sizeof(buffer));
graphics.bprint(6+label_len, 6, buffer, 196, 196, 196); font::print(PR_BOR, 6+label_len, 6, buffer, 196,196,196);
} }
bool force_roomname_hidden = false; bool force_roomname_hidden = false;
@ -2011,51 +2013,49 @@ void gamerender(void)
if (game.swnmessage == 0) if (game.swnmessage == 0)
{ {
std::string tempstring = help.timestring(game.swntimer); std::string tempstring = help.timestring(game.swntimer);
graphics.bprint( 10, 10, loc::gettext("Current Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false); font::print(PR_BOR, 10, 10, loc::gettext("Current Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
font::print(PR_2X | PR_BOR | PR_FONT_8X8, 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2)); font::print(PR_2X | PR_BOR | PR_FONT_8X8, 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
tempstring = help.timestring(game.swnrecord); tempstring = help.timestring(game.swnrecord);
const char* besttimelabel = loc::gettext("Best Time"); font::print(PR_BOR | PR_RIGHT, 320-8, 10, loc::gettext("Best Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
graphics.bprint( 320-graphics.len(besttimelabel)-8, 10, besttimelabel, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false);
font::print(PR_2X | PR_BOR | PR_FONT_8X8 | PR_RIGHT, 300, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2)); font::print(PR_2X | PR_BOR | PR_FONT_8X8 | PR_RIGHT, 300, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
switch(game.swnbestrank) switch(game.swnbestrank)
{ {
case 0: case 0:
graphics.PrintWrap( -1, 204, loc::gettext("Next Trophy at 5 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true); font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 5 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
break; break;
case 1: case 1:
graphics.PrintWrap( -1, 204, loc::gettext("Next Trophy at 10 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true); font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 10 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
break; break;
case 2: case 2:
graphics.PrintWrap( -1, 204, loc::gettext("Next Trophy at 15 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true); font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 15 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
break; break;
case 3: case 3:
graphics.PrintWrap( -1, 204, loc::gettext("Next Trophy at 20 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true); font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 20 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
break; break;
case 4: case 4:
graphics.PrintWrap( -1, 204, loc::gettext("Next Trophy at 30 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true); font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 30 seconds"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
break; break;
case 5: case 5:
graphics.PrintWrap( -1, 204, loc::gettext("Next Trophy at 1 minute"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true); font::print_wrap(PR_CEN, -1, 204, loc::gettext("Next Trophy at 1 minute"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
break; break;
case 6: case 6:
graphics.Print( -1, 204, loc::gettext("All Trophies collected!"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true); font::print_wrap(PR_CEN, -1, 204, loc::gettext("All Trophies collected!"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
break; break;
} }
} }
else if (game.swnmessage == 1) else if (game.swnmessage == 1)
{ {
std::string tempstring = help.timestring(game.swntimer); std::string tempstring = help.timestring(game.swntimer);
graphics.bprint( 10, 10, loc::gettext("Current Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false); font::print(PR_BOR, 10, 10, loc::gettext("Current Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
graphics.bigbprint( 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false, 2); font::print(PR_2X | PR_BOR | PR_FONT_8X8, 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
tempstring = help.timestring(game.swnrecord); tempstring = help.timestring(game.swnrecord);
if (int(game.deathseq / 5) % 2 == 1) if (int(game.deathseq / 5) % 2 == 1)
{ {
const char* besttimelabel = loc::gettext("Best Time"); font::print(PR_BOR | PR_RIGHT, 320-8, 10, loc::gettext("Best Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
graphics.bprint( 320-graphics.len(besttimelabel)-8, 10, besttimelabel, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false); font::print(PR_2X | PR_BOR | PR_FONT_8X8 | PR_RIGHT, 300, 24, tempstring, 128 - (help.glow), 220 - (help.glow), 128 - (help.glow / 2));
graphics.bigbrprint( 300, 24, tempstring, 128 - (help.glow), 220 - (help.glow), 128 - (help.glow / 2), false, 2);
graphics.bigbprint( -1, 200, loc::gettext("New Record!"), 128 - (help.glow), 220 - (help.glow), 128 - (help.glow / 2), true, 2); font::print(PR_2X | PR_BOR | PR_CEN, -1, 200, loc::gettext("New Record!"), 128 - (help.glow), 220 - (help.glow), 128 - (help.glow / 2));
} }
} }
else if (game.swnmessage >= 2) else if (game.swnmessage >= 2)
@ -2063,20 +2063,19 @@ void gamerender(void)
game.swnmessage--; game.swnmessage--;
if (game.swnmessage == 2) game.swnmessage = 0; if (game.swnmessage == 2) game.swnmessage = 0;
std::string tempstring = help.timestring(game.swntimer); std::string tempstring = help.timestring(game.swntimer);
graphics.bprint( 10, 10, loc::gettext("Current Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false); font::print(PR_BOR, 10, 10, loc::gettext("Current Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
graphics.bigbprint( 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false, 2); font::print(PR_2X | PR_BOR | PR_FONT_8X8, 25, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
tempstring = help.timestring(game.swnrecord); tempstring = help.timestring(game.swnrecord);
const char* besttimelabel = loc::gettext("Best Time"); font::print(PR_BOR | PR_RIGHT, 320-8, 10, loc::gettext("Best Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
graphics.bprint( 320-graphics.len(besttimelabel)-8, 10, besttimelabel, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false); font::print(PR_2X | PR_BOR | PR_FONT_8X8 | PR_RIGHT, 300, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
graphics.bigbrprint( 300, 24, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), false, 2);
if (int(game.swnmessage / 5) % 2 == 1) if (int(game.swnmessage / 5) % 2 == 1)
{ {
graphics.bigbprint( -1, 200, loc::gettext("New Trophy!"), 220 - (help.glow), 128 - (help.glow), 128 - (help.glow / 2), true, 2); font::print(PR_2X | PR_BOR | PR_CEN, -1, 200, loc::gettext("New Trophy!"), 220 - (help.glow), 128 - (help.glow), 128 - (help.glow / 2));
} }
} }
graphics.bprint( 20, 228, loc::gettext("[Press ENTER to stop]"), 160 - (help.glow/2), 160 - (help.glow/2), 160 - (help.glow/2), true); font::print(PR_BOR | PR_CEN, -1, 228, loc::gettext("[Press ENTER to stop]"), 160 - (help.glow/2), 160 - (help.glow/2), 160 - (help.glow/2));
} }
else if(game.swngame==2) else if(game.swngame==2)
{ {
@ -2123,19 +2122,22 @@ void gamerender(void)
{ {
if (game.timetrialcountdown < 30) if (game.timetrialcountdown < 30)
{ {
if (int(game.timetrialcountdown / 4) % 2 == 0) graphics.bigbprint( -1, 100, loc::gettext("Go!"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 4); if (int(game.timetrialcountdown / 4) % 2 == 0)
{
font::print(PR_4X | PR_CEN | PR_BOR, -1, 100, loc::gettext("Go!"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
}
} }
else if (game.timetrialcountdown < 60) else if (game.timetrialcountdown < 60)
{ {
graphics.bigbprint( -1, 100, "1", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 4); font::print(PR_4X | PR_CEN | PR_BOR, -1, 100, "1", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
} }
else if (game.timetrialcountdown < 90) else if (game.timetrialcountdown < 90)
{ {
graphics.bigbprint( -1, 100, "2", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 4); font::print(PR_4X | PR_CEN | PR_BOR, -1, 100, "2", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
} }
else if (game.timetrialcountdown < 120) else if (game.timetrialcountdown < 120)
{ {
graphics.bigbprint( -1, 100, "3", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 4); font::print(PR_4X | PR_CEN | PR_BOR, -1, 100, "3", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
} }
} }
else if (!roomname_translator::is_pausing() && !game.translator_exploring) else if (!roomname_translator::is_pausing() && !game.translator_exploring)
@ -2145,30 +2147,30 @@ void gamerender(void)
//Draw OSD stuff //Draw OSD stuff
const char* tempstring = loc::gettext("TIME:"); const char* tempstring = loc::gettext("TIME:");
int label_len = graphics.len(tempstring); int label_len = font::len(0, tempstring);
graphics.bprint(6, 18, tempstring, 255,255,255); font::print(PR_BOR, 6, 18, tempstring, 255,255,255);
tempstring = loc::gettext("DEATH:"); tempstring = loc::gettext("DEATH:");
label_len = SDL_max(label_len, graphics.len(tempstring)); label_len = SDL_max(label_len, font::len(0, tempstring));
graphics.bprint(6, 30, tempstring, 255, 255, 255); font::print(PR_BOR, 6, 30, tempstring, 255,255,255);
tempstring = loc::gettext("SHINY:"); tempstring = loc::gettext("SHINY:");
label_len = SDL_max(label_len, graphics.len(tempstring)); label_len = SDL_max(label_len, font::len(0, tempstring));
graphics.bprint(6, 42, tempstring, 255,255,255); font::print(PR_BOR, 6, 42, tempstring, 255,255,255);
if(game.timetrialparlost) if(game.timetrialparlost)
{ {
graphics.bprint(8+label_len, 18, buffer, 196, 80, 80); font::print(PR_BOR, 8+label_len, 18, buffer, 196, 80, 80);
} }
else else
{ {
graphics.bprint(8+label_len, 18, buffer, 196, 196, 196); font::print(PR_BOR, 8+label_len, 18, buffer, 196, 196, 196);
} }
if(game.deathcounts>0) if(game.deathcounts>0)
{ {
graphics.bprint(8+label_len, 30,help.String(game.deathcounts), 196, 80, 80); font::print(PR_BOR, 8+label_len, 30,help.String(game.deathcounts), 196, 80, 80);
} }
else else
{ {
graphics.bprint(8+label_len, 30,help.String(game.deathcounts), 196, 196, 196); font::print(PR_BOR, 8+label_len, 30,help.String(game.deathcounts), 196, 196, 196);
} }
vformat_buf( vformat_buf(
buffer, sizeof(buffer), buffer, sizeof(buffer),
@ -2178,24 +2180,24 @@ void gamerender(void)
); );
if(game.trinkets()<game.timetrialshinytarget) if(game.trinkets()<game.timetrialshinytarget)
{ {
graphics.bprint(8+label_len, 42, buffer, 196, 80, 80); font::print(PR_BOR, 8+label_len, 42, buffer, 196, 80, 80);
} }
else else
{ {
graphics.bprint(8+label_len, 42, buffer, 196, 196, 196); font::print(PR_BOR, 8+label_len, 42, buffer, 196, 196, 196);
} }
tempstring = loc::gettext("PAR TIME:"); std::string time = game.timetstring(game.timetrialpar);
label_len = graphics.len(tempstring)+8; label_len = font::len(0, time);
if(game.timetrialparlost) if(game.timetrialparlost)
{ {
graphics.bprint(275-label_len, 214, tempstring, 80, 80, 80); font::print(PR_BOR | PR_RIGHT, 307-label_len-8, 214, loc::gettext("PAR TIME:"), 80, 80, 80);
graphics.bprint(275, 214, game.timetstring(game.timetrialpar), 80, 80, 80); font::print(PR_BOR, 307-label_len, 214, time, 80, 80, 80);
} }
else else
{ {
graphics.bprint(275-label_len, 214, tempstring, 255, 255, 255); font::print(PR_BOR | PR_RIGHT, 307-label_len-8, 214, loc::gettext("PAR TIME:"), 255, 255, 255);
graphics.bprint(275, 214, game.timetstring(game.timetrialpar), 196, 196, 196); font::print(PR_BOR, 307-label_len, 214, time, 196, 196, 196);
} }
} }
} }
@ -2521,25 +2523,25 @@ void maprender(void)
switch(game.swnbestrank) switch(game.swnbestrank)
{ {
case 0: case 0:
graphics.PrintWrap( -1, 40, loc::gettext("Next Trophy at 5 seconds"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 5 seconds"), 196, 196, 255 - help.glow);
break; break;
case 1: case 1:
graphics.PrintWrap( -1, 40, loc::gettext("Next Trophy at 10 seconds"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 10 seconds"), 196, 196, 255 - help.glow);
break; break;
case 2: case 2:
graphics.PrintWrap( -1, 40, loc::gettext("Next Trophy at 15 seconds"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 15 seconds"), 196, 196, 255 - help.glow);
break; break;
case 3: case 3:
graphics.PrintWrap( -1, 40, loc::gettext("Next Trophy at 20 seconds"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 20 seconds"), 196, 196, 255 - help.glow);
break; break;
case 4: case 4:
graphics.PrintWrap( -1, 40, loc::gettext("Next Trophy at 30 seconds"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 30 seconds"), 196, 196, 255 - help.glow);
break; break;
case 5: case 5:
graphics.PrintWrap( -1, 40, loc::gettext("Next Trophy at 1 minute"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 40, loc::gettext("Next Trophy at 1 minute"), 196, 196, 255 - help.glow);
break; break;
case 6: case 6:
graphics.PrintWrap( -1, 40, loc::gettext("All Trophies collected!"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 40, loc::gettext("All Trophies collected!"), 196, 196, 255 - help.glow);
break; break;
} }
} }
@ -2554,25 +2556,25 @@ void maprender(void)
switch(game.swnbestrank) switch(game.swnbestrank)
{ {
case 0: case 0:
graphics.PrintWrap( -1, 174, loc::gettext("Next Trophy at 5 seconds"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 5 seconds"), 196, 196, 255 - help.glow);
break; break;
case 1: case 1:
graphics.PrintWrap( -1, 174, loc::gettext("Next Trophy at 10 seconds"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 10 seconds"), 196, 196, 255 - help.glow);
break; break;
case 2: case 2:
graphics.PrintWrap( -1, 174, loc::gettext("Next Trophy at 15 seconds"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 15 seconds"), 196, 196, 255 - help.glow);
break; break;
case 3: case 3:
graphics.PrintWrap( -1, 174, loc::gettext("Next Trophy at 20 seconds"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 20 seconds"), 196, 196, 255 - help.glow);
break; break;
case 4: case 4:
graphics.PrintWrap( -1, 174, loc::gettext("Next Trophy at 30 seconds"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 30 seconds"), 196, 196, 255 - help.glow);
break; break;
case 5: case 5:
graphics.PrintWrap( -1, 174, loc::gettext("Next Trophy at 1 minute"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 174, loc::gettext("Next Trophy at 1 minute"), 196, 196, 255 - help.glow);
break; break;
case 6: case 6:
graphics.PrintWrap( -1, 174, loc::gettext("All Trophies collected!"), 196, 196, 255 - help.glow, true); font::print_wrap(PR_CEN, -1, 174, loc::gettext("All Trophies collected!"), 196, 196, 255 - help.glow);
break; break;
} }
} }
@ -2781,7 +2783,7 @@ void maprender(void)
"savebox_n_trinkets:int", "savebox_n_trinkets:int",
game.savetrinkets game.savetrinkets
); );
graphics.Print(262 - graphics.len(buffer), FLIP(132, 8), buffer, 255 - help.glow/2, 255 - help.glow/2, 255 - help.glow/2); font::print(PR_RIGHT, 262, FLIP(132, 8), buffer, 255 - help.glow/2, 255 - help.glow/2, 255 - help.glow/2);
graphics.draw_sprite(34, FLIP(126, 17), 50, graphics.col_clock); graphics.draw_sprite(34, FLIP(126, 17), 50, graphics.col_clock);
graphics.draw_sprite(270, FLIP(126, 17), 22, graphics.col_trinket); graphics.draw_sprite(270, FLIP(126, 17), 22, graphics.col_trinket);