mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-11-17 16:39:42 +01:00
Code Issues Releases Wiki Activity

Completely remove Graphics::bigbprint, bigrprint and bigbrprint

Browse source 
I migrated all of them to font::print, so they can now be removed.
Six deprecated print functions left! (Of which some are used a whole
lot, it's simpler if the lesser-used ones are gone first.)
This commit is contained in:
Dav999-v 2023-01-17 05:19:17 +01:00 committed by Misa Elizabeth Kai
parent c82e1f2902
commit 9749858365
3 changed files with 9 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
desktop_version/src/Graphics.cpp
View file

@ -383,16 +383,6 @@ void Graphics::bigprint( int x, int y, const std::string& text, int r, int g, i
font::print(PR_scX, x, y, text, r, g, b); font::print(PR_scX, x, y, text, r, g, b);
} }
void Graphics::bigbprint(int x, int y, const std::string& text, int r, int g, int b, bool cen, int sc)
{
// DEPRECATED. Also, use PR_2X/PR_3X/etc directly
int PR_scX = (sc-1);
if (cen)
font::print(PR_scX | PR_CEN | PR_BOR, -1, y, text, r, g, b);
else
font::print(PR_scX | PR_BOR, x, y, text, r, g, b);
}
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)
@ -3288,26 +3278,6 @@ void Graphics::renderfixedpost(void)
} }
} }
void Graphics::bigrprint(int x, int y, const std::string& text, int r, int g, int b, bool cen, int sc)
{
// DEPRECATED. Also, use PR_2X/PR_3X/etc directly
int PR_scX = (sc-1);
if (cen)
font::print(PR_scX | PR_CEN, -1, y, text, r, g, b);
else
font::print(PR_scX | PR_RIGHT, x, y, text, r, g, b);
}
void Graphics::bigbrprint(int x, int y, const std::string& text, int r, int g, int b, bool cen, int sc)
{
// DEPRECATED. Also, use PR_2X/PR_3X/etc directly
int PR_scX = (sc-1);
if (cen)
font::print(PR_scX | PR_CEN | PR_BOR, -1, y, text, r, g, b);
else
font::print(PR_scX | PR_RIGHT | PR_BOR, x, y, text, r, g, b);
}
void Graphics::drawtele(int x, int y, int t, const SDL_Color color) void Graphics::drawtele(int x, int y, int t, const SDL_Color color)
{ {
SDL_Rect telerect; SDL_Rect telerect;

5
desktop_version/src/Graphics.h
View file

@ -213,7 +213,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);
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 drawspritesetcol(int x, int y, int t, int c); void drawspritesetcol(int x, int y, int t, int c);
@ -237,10 +236,6 @@ public:
void drawtrophytext(void); void drawtrophytext(void);
void bigrprint(int x, int y, const std::string& t, int r, int g, int b, bool cen = false, int sc = 2);
void bigbrprint(int x, int y, const std::string& t, int r, int g, int b, bool cen = false, int sc = 2);
void drawtele(int x, int y, int t, SDL_Color c); void drawtele(int x, int y, int t, SDL_Color c);
SDL_Color getRGBA(Uint8 r, Uint8 g, Uint8 b, Uint8 a); SDL_Color getRGBA(Uint8 r, Uint8 g, Uint8 b, Uint8 a);

16
desktop_version/src/Render.cpp
View file

@ -2006,7 +2006,7 @@ void gamerender(void)
if (game.swngame == 0) if (game.swngame == 0)
{ {
std::string tempstring = help.timestring(game.swntimer); std::string tempstring = help.timestring(game.swntimer);
graphics.bigbprint( -1, 20, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 2); font::print(PR_2X | PR_CEN | PR_BOR, -1, 20, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
} }
else if (game.swngame == 1) else if (game.swngame == 1)
{ {
@ -2101,16 +2101,16 @@ void gamerender(void)
{ {
if (game.swndelay >= 60) if (game.swndelay >= 60)
{ {
graphics.bigbprint( -1, 20, loc::gettext("SUPER GRAVITRON"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 2); font::print(PR_2X | PR_BOR | PR_CEN, -1, 20, loc::gettext("SUPER GRAVITRON"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
std::string tempstring = help.timestring(game.swnrecord); std::string tempstring = help.timestring(game.swnrecord);
graphics.bprint( 240, 190, loc::gettext("Best Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true); font::print(PR_BOR | PR_CEN, -1, 190, loc::gettext("Best Time"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
graphics.bigbrprint( 300, 205, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 2); font::print(PR_2X | PR_BOR | PR_CEN, -1, 205, tempstring, 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
} }
else if (int(game.swndelay / 10) % 2 == 1) else if (int(game.swndelay / 10) % 2 == 1)
{ {
graphics.bigbprint( -1, 20, loc::gettext("SUPER GRAVITRON"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 2); font::print(PR_2X | PR_BOR | PR_CEN, -1, 20, loc::gettext("SUPER GRAVITRON"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
graphics.bigbprint( -1, 200, loc::gettext("GO!"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 3); font::print(PR_3X | PR_BOR | PR_CEN, -1, 200, loc::gettext("GO!"), 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2));
} }
} }
} }
@ -2518,7 +2518,7 @@ void maprender(void)
std::string tempstring = help.timestring(game.swnrecord); std::string tempstring = help.timestring(game.swnrecord);
graphics.Print( 240, 124, loc::gettext("Best Time"), 196, 196, 255 - help.glow, true); graphics.Print( 240, 124, loc::gettext("Best Time"), 196, 196, 255 - help.glow, true);
graphics.bigrprint( 300, 94, tempstring, 196, 196, 255 - help.glow, true, 2); font::print(PR_2X | PR_CEN, -1, 102, tempstring, 196, 196, 255 - help.glow);
switch(game.swnbestrank) switch(game.swnbestrank)
{ {
@ -2551,7 +2551,7 @@ void maprender(void)
std::string tempstring = help.timestring(game.swnrecord); std::string tempstring = help.timestring(game.swnrecord);
graphics.Print( 240, 90, loc::gettext("Best Time"), 196, 196, 255 - help.glow, true); graphics.Print( 240, 90, loc::gettext("Best Time"), 196, 196, 255 - help.glow, true);
graphics.bigrprint( 300, 104, tempstring, 196, 196, 255 - help.glow, true, 2); font::print(PR_2X | PR_CEN, -1, 104, tempstring, 196, 196, 255 - help.glow);
switch(game.swnbestrank) switch(game.swnbestrank)
{ {