mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-08 18:09:45 +01:00
Code Issues Releases Wiki Activity

Remove textrect attribute from textboxclass

Browse source 
Instead of duplicating the same variables over and over again,
Graphics::drawgui() can just make its own SDL_Rect. It's not that hard.

As far as I can tell, textrect was always being properly kept up to date
by the time Graphics::drawgui() got around to rendering
(textboxclass::resize() keeps being called a LOT), so this shouldn't be
a noticeable change from the user perspective.
This commit is contained in:
Misa 2021-03-19 19:47:37 -07:00 committed by Ethan Lee
parent 334302c800
commit 2ac13815e4
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop_version/src/Graphics.cpp
View file

@ -855,8 +855,9 @@ void Graphics::drawgui(void)
}
else
{
SDL_Rect textrect = {textbox[i].xp, textbox[i].yp, textbox[i].w, textbox[i].h};
FillRect(backBuffer,textbox[i].textrect, textbox[i].r/6, textbox[i].g/6, textbox[i].b / 6 );
FillRect(backBuffer, textrect, textbox[i].r/6, textbox[i].g/6, textbox[i].b / 6 );
drawcoloredtile(textbox[i].xp, textbox[i].yp, 40, textbox[i].r, textbox[i].g, textbox[i].b);
drawcoloredtile(textbox[i].xp+textbox[i].w-8, textbox[i].yp, 42, textbox[i].r, textbox[i].g, textbox[i].b);

8
desktop_version/src/Textbox.cpp
View file

@ -21,10 +21,6 @@ textboxclass::textboxclass(void)
tg = 0;
tb = 0;
max = 0;
textrect.x = 0;
textrect.y = 0;
textrect.w = 0;
textrect.h = 0;
}
void textboxclass::centerx(void)
@ -121,10 +117,6 @@ void textboxclass::resize(void)
lw = max;
w = (max +2) * 8;
h = (line.size() + 2) * 8;
textrect.x = xp;
textrect.y = yp;
textrect.w = w;
textrect.h = h;
}
void textboxclass::addline(std::string t)

1
desktop_version/src/Textbox.h
View file

@ -35,7 +35,6 @@ public:
int xp, yp, lw, w, h;
int r,g,b;
int tr,tg,tb;
SDL_Rect textrect;
int timer;
float tl;