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

Rename respawncolour to savecolour

Browse source 
Since it's a variable like saverx/savery/savex/savey, it should be
renamed to savecolour and placed with all of them.
This commit is contained in:
Misa 2021-09-06 18:28:28 -07:00
parent 8e61a04937
commit b3f437fe55
4 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
desktop_version/src/Game.cpp
View file

@ -156,6 +156,7 @@ void Game::init(void)
prevroomy = 0; prevroomy = 0;
saverx = 0; saverx = 0;
savery = 0; savery = 0;
savecolour = 0;
mutebutton = 0; mutebutton = 0;
muted = false; muted = false;
@ -363,8 +364,6 @@ void Game::init(void)
disableaudiopause = false; disableaudiopause = false;
disabletemporaryaudiopause = true; disabletemporaryaudiopause = true;
inputdelay = false; inputdelay = false;
respawncolour = 0;
} }
void Game::lifesequence(void) void Game::lifesequence(void)
@ -5124,6 +5123,10 @@ void Game::customloadquick(const std::string& savfile)
{ {
savepoint = help.Int(pText); savepoint = help.Int(pText);
} }
else if (SDL_strcmp(pKey, "savecolour") == 0)
{
savecolour = help.Int(pText);
}
else if (SDL_strcmp(pKey, "companion") == 0) else if (SDL_strcmp(pKey, "companion") == 0)
{ {
companion = help.Int(pText); companion = help.Int(pText);
@ -5200,10 +5203,6 @@ void Game::customloadquick(const std::string& savfile)
{ {
map.showtrinkets = help.Int(pText); map.showtrinkets = help.Int(pText);
} }
else if (SDL_strcmp(pKey, "respawncolour") == 0)
{
respawncolour = help.Int(pText);
}
} }
@ -5632,6 +5631,8 @@ bool Game::customsavequick(const std::string& savfile)
xml::update_tag(msgs, "savepoint", savepoint); xml::update_tag(msgs, "savepoint", savepoint);
xml::update_tag(msgs, "savecolour", savecolour);
xml::update_tag(msgs, "trinkets", trinkets()); xml::update_tag(msgs, "trinkets", trinkets());
xml::update_tag(msgs, "crewmates", crewmates()); xml::update_tag(msgs, "crewmates", crewmates());
@ -5676,8 +5677,6 @@ bool Game::customsavequick(const std::string& savfile)
xml::update_tag(msgs, "showtrinkets", (int) map.showtrinkets); xml::update_tag(msgs, "showtrinkets", (int) map.showtrinkets);
xml::update_tag(msgs, "respawncolour", respawncolour);
std::string summary = savearea + ", " + timestring(); std::string summary = savearea + ", " + timestring();
xml::update_tag(msgs, "summary", summary.c_str()); xml::update_tag(msgs, "summary", summary.c_str());

3
desktop_version/src/Game.h
View file

@ -220,6 +220,7 @@ public:
int savex, savey, saverx, savery; int savex, savey, saverx, savery;
int savegc, savedir; int savegc, savedir;
int savecolour;
//Added for port //Added for port
int edsavex, edsavey, edsaverx, edsavery; int edsavex, edsavey, edsaverx, edsavery;
@ -481,8 +482,6 @@ public:
bool disableaudiopause; bool disableaudiopause;
bool disabletemporaryaudiopause; bool disabletemporaryaudiopause;
bool inputdelay; bool inputdelay;
int respawncolour;
}; };
#ifndef GAME_DEFINITION #ifndef GAME_DEFINITION

2
desktop_version/src/Map.cpp
View file

@ -833,7 +833,7 @@ void mapclass::resetplayer(const bool player_died)
obj.entities[i].newyp = obj.entities[i].yp; obj.entities[i].newyp = obj.entities[i].yp;
obj.entities[i].dir = game.savedir; obj.entities[i].dir = game.savedir;
obj.entities[i].colour = game.respawncolour; obj.entities[i].colour = game.savecolour;
if (player_died) if (player_died)
{ {
game.lifeseq = 10; game.lifeseq = 10;

5
desktop_version/src/Script.cpp
View file

@ -1674,7 +1674,7 @@ void scriptclass::run(void)
} }
else if (words[0] == "changerespawncolour") else if (words[0] == "changerespawncolour")
{ {
game.respawncolour = getcolorfromname(words[1]); game.savecolour = getcolorfromname(words[1]);
} }
else if (words[0] == "altstates") else if (words[0] == "altstates")
{ {
@ -3130,6 +3130,7 @@ void scriptclass::hardreset(void)
game.saverx = 0; game.saverx = 0;
game.savery = 0; game.savery = 0;
} }
game.savecolour = 0;
game.intimetrial = false; game.intimetrial = false;
game.timetrialcountdown = 0; game.timetrialcountdown = 0;
@ -3188,8 +3189,6 @@ void scriptclass::hardreset(void)
game.disabletemporaryaudiopause = true; game.disabletemporaryaudiopause = true;
game.respawncolour = 0;
//dwgraphicsclass //dwgraphicsclass
graphics.backgrounddrawn = false; graphics.backgrounddrawn = false;
graphics.textbox.clear(); graphics.textbox.clear();