mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

custom textbox colors

Browse source 
Co-authored-by: Misa Elizabeth Kai <infoteddy@infoteddy.info>
This commit is contained in:
AllyTally 2022-11-21 15:02:38 -04:00 committed by Misa Elizabeth Kai
parent de43005676
commit 3d5ba95b96
4 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
desktop_version/src/BlockV.cpp
View file

@ -2,6 +2,7 @@
#include <SDL_stdinc.h>
#include "CustomLevels.h"
#include "Font.h"
blockclass::blockclass(void)
@ -48,6 +49,15 @@ 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;

31
desktop_version/src/CustomLevels.cpp
View file

@ -389,6 +389,8 @@ void customlevelclass::reset(void)
script.clearcustom();
onewaycol_override = false;
customcolours.clear();
}
const int* customlevelclass::loadlevel( int rxi, int ryi )
@ -1285,6 +1287,35 @@ next:
script.customscripts.push_back(script_);
}
}
if (SDL_strcmp(pKey, "TextboxColours") == 0)
{
for (tinyxml2::XMLElement* textColourElement = pElem->FirstChildElement(); textColourElement; textColourElement = textColourElement->NextSiblingElement())
{
if (SDL_strcmp(textColourElement->Value(), "colour") == 0)
{
int r = 255;
int g = 255;
int b = 255;
textColourElement->QueryIntAttribute("r", &r);
textColourElement->QueryIntAttribute("g", &g);
textColourElement->QueryIntAttribute("b", &b);
const char* name = textColourElement->Attribute("name");
if (name != NULL)
{
SDL_Colour colour;
colour.r = r;
colour.g = g;
colour.b = b;
customcolours[name] = colour;
}
}
}
}
}
if (mapwidth < maxwidth)

3
desktop_version/src/CustomLevels.h
View file

@ -6,6 +6,7 @@
#include <SDL.h>
#include <string>
#include <vector>
#include <map>
class CustomEntity
{
@ -169,6 +170,8 @@ public:
SDL_Color getonewaycol(int rx, int ry);
SDL_Color getonewaycol(void);
bool onewaycol_override;
std::map<std::string, SDL_Color> customcolours;
};
std::string translate_title(const std::string& title, bool* is_gettext);

9
desktop_version/src/Script.cpp
View file

@ -442,6 +442,15 @@ void scriptclass::run(void)
{
//oh boy
//first word is the colour.
#ifndef NO_CUSTOM_LEVELS
if (cl.customcolours.count(words[1]) != 0)
{
r = cl.customcolours[words[1]].r;
g = cl.customcolours[words[1]].g;
b = cl.customcolours[words[1]].b;
}
else // Turn the if into an else if so we don't run the default colour processing
#endif
if (words[1] == "cyan")
{
r = 164;