Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Unhardcode textbox colors in textbox arguments

Browse Source 
There's a few places where textboxes are constructed through code, but
they pass in the color's RGB values in manually. This commit
unhardcodes most of them them, replacing them with a color lookup.

The ones that weren't changed are special cases, like `175, 174, 174`.
This commit is contained in:
AllyTally
2023-03-18 19:11:49 -03:00
committed by Misa Elizabeth Kai
parent bd34af32de
commit efa1bad449
7 changed files with 101 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
desktop_version/src/Graphics.cpp
View File

@@ -18,6 +18,7 @@
#include "Music.h"
#include "RoomnameTranslator.h"
#include "Screen.h"
#include "Script.h"
#include "UtilityClass.h"
#include "VFormat.h"
#include "Vlogging.h"
@@ -929,7 +930,8 @@ void Graphics::drawgui(void)
{
y = 240 - y - 8*sc;
}
font::print((sc==2 ? PR_2X : PR_1X) | PR_CEN, -1, y, translation, 164, 164, 255);
SDL_Color color = TEXT_COLOUR("cyan");
font::print((sc==2 ? PR_2X : PR_1X) | PR_CEN, -1, y, translation, color.r, color.g, color.b);
}
else
{
@@ -1420,11 +1422,8 @@ void Graphics::textboxadjust(void)
void Graphics::createtextboxreal(
const std::string& t,
int xp,
int yp,
int r,
int g,
int b,
int xp, int yp,
int r, int g, int b,
bool flipme
) {
m = textboxes.size();
@@ -1445,22 +1444,32 @@ void Graphics::createtextboxreal(
void Graphics::createtextbox(
const std::string& t,
int xp,
int yp,
int r,
int g,
int b
int xp, int yp,
SDL_Color color
) {
createtextboxreal(t, xp, yp, color.r, color.g, color.b, false);
}
void Graphics::createtextbox(
const std::string& t,
int xp, int yp,
int r, int g, int b
) {
createtextboxreal(t, xp, yp, r, g, b, false);
}
void Graphics::createtextboxflipme(
const std::string& t,
int xp,
int yp,
int r,
int g,
int b
int xp, int yp,
SDL_Color color
) {
createtextboxreal(t, xp, yp, color.r, color.g, color.b, true);
}
void Graphics::createtextboxflipme(
const std::string& t,
int xp, int yp,
int r, int g, int b
) {
createtextboxreal(t, xp, yp, r, g, b, true);
}