Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-31 10:14:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove hardcoded textbox colours

Browse Source 
We have a custom textbox colour system, why not use it? This also moves
the map of colours from CustomLevels to Script.
This commit is contained in:
AllyTally
2023-03-18 18:48:20 -03:00
committed by Misa Elizabeth Kai
parent c3e251fea9
commit bd34af32de
5 changed files with 40 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
desktop_version/src/BlockV.cpp
View File

@@ -2,7 +2,7 @@
#include <SDL_stdinc.h>
#include "CustomLevels.h"
#include "Script.h"
#include "Font.h"
blockclass::blockclass(void)
@@ -48,80 +48,9 @@ void blockclass::rectset(const int xi, const int yi, const int wi, const int hi)
void blockclass::setblockcolour(const char* col)
{
#ifndef NO_CUSTOM_LEVELS
if (cl.customcolours.count(col) != 0)
{
r = cl.customcolours[col].r;
g = cl.customcolours[col].g;
b = cl.customcolours[col].b;
}
else // Turn the if into an else if so we don't run the default colour processing
#endif
if (SDL_strcmp(col, "cyan") == 0)
{
r = 164;
g = 164;
b = 255;
}
else if (SDL_strcmp(col, "red") == 0)
{
r = 255;
g = 60;
b = 60;
}
else if (SDL_strcmp(col, "green") == 0)
{
r = 144;
g = 255;
b = 144;
}
else if (SDL_strcmp(col, "yellow") == 0)
{
r = 255;
g = 255;
b = 134;
}
else if (SDL_strcmp(col, "blue") == 0)
{
r = 95;
g = 95;
b = 255;
}
else if (SDL_strcmp(col, "purple") == 0)
{
r = 255;
g = 134;
b = 255;
}
else if (SDL_strcmp(col, "white") == 0)
{
r = 244;
g = 244;
b = 244;
}
else if (SDL_strcmp(col, "gray") == 0)
{
r = 174;
g = 174;
b = 174;
}
else if (SDL_strcmp(col, "orange") == 0)
{
r = 255;
g = 130;
b = 20;
}
else if (SDL_strcmp(col, "transparent") == 0)
{
r = 0;
g = 0;
b = 0;
}
else
{
//use a gray
r = 174;
g = 174;
b = 174;
}
bool exists = ::script.textbox_colours.count(col) != 0;
r = ::script.textbox_colours[exists ? col : "gray"].r;
g = ::script.textbox_colours[exists ? col : "gray"].g;
b = ::script.textbox_colours[exists ? col : "gray"].b;
}