Rename respawncolour to savecolour

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

View File

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