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

Change obj.collect into a vector of bools

Browse Source 
It's already treated like a bunch of bools anyway, so might as well just
formalize it.
This commit is contained in:
Misa
2020-04-08 23:56:36 -07:00
committed by Ethan Lee
parent 7493129044
commit 8507bdc65d
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
desktop_version/src/Game.cpp
View File

@@ -5010,7 +5010,7 @@ void Game::loadquick()
obj.collect.clear();
for(size_t i = 0; i < values.size(); i++)
{
obj.collect.push_back(atoi(values[i].c_str()));
obj.collect.push_back((bool) atoi(values[i].c_str()));
}
}
}
@@ -5250,7 +5250,7 @@ void Game::customloadquick(std::string savfile)
obj.collect.clear();
for(size_t i = 0; i < values.size(); i++)
{
obj.collect.push_back(atoi(values[i].c_str()));
obj.collect.push_back((bool) atoi(values[i].c_str()));
}
}
}
@@ -5660,7 +5660,7 @@ void Game::savetele()
std::string collect;
for(size_t i = 0; i < obj.collect.size(); i++ )
{
collect += help.String(obj.collect[i]) + ",";
collect += help.String((int) obj.collect[i]) + ",";
}
msg = new TiXmlElement( "collect" );
msg->LinkEndChild( new TiXmlText( collect.c_str() ));
@@ -5857,7 +5857,7 @@ void Game::savequick()
std::string collect;
for(size_t i = 0; i < obj.collect.size(); i++ )
{
collect += help.String(obj.collect[i]) + ",";
collect += help.String((int) obj.collect[i]) + ",";
}
msg = new TiXmlElement( "collect" );
msg->LinkEndChild( new TiXmlText( collect.c_str() ));
@@ -6056,7 +6056,7 @@ void Game::customsavequick(std::string savfile)
std::string collect;
for(size_t i = 0; i < obj.collect.size(); i++ )
{
collect += help.String(obj.collect[i]) + ",";
collect += help.String((int) obj.collect[i]) + ",";
}
msg = new TiXmlElement( "collect" );
msg->LinkEndChild( new TiXmlText( collect.c_str() ));
@@ -6290,7 +6290,7 @@ void Game::loadtele()
obj.collect.clear();
for(size_t i = 0; i < values.size(); i++)
{
obj.collect.push_back(atoi(values[i].c_str()));
obj.collect.push_back((bool) atoi(values[i].c_str()));
}
}
}
@@ -7633,7 +7633,7 @@ void Game::resetgameclock()
int Game::trinkets()
{
return std::count(obj.collect.begin(), obj.collect.end(), 1);
return std::count(obj.collect.begin(), obj.collect.end(), true);
}
int Game::crewmates()