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

Turn obj.flags into an array instead of a vector

Browse Source 
Since it's always fixed-size, there's no reason for it to be a vector.
This commit is contained in:
Misa
2020-07-02 18:22:19 -07:00
committed by Ethan Lee
parent 1258eb7bf4
commit 62203efb2c
4 changed files with 14 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
desktop_version/src/Game.cpp
View File

@@ -5365,19 +5365,7 @@ void Game::loadquick()
}
}
if (pKey == "flags")
{
std::string TextString = (pText);
if(TextString.length())
{
std::vector<std::string> values = split(TextString,',');
obj.flags.clear();
for(size_t i = 0; i < values.size(); i++)
{
obj.flags.push_back((bool) atoi(values[i].c_str()));
}
}
}
LOAD_ARRAY_RENAME(flags, obj.flags)
LOAD_ARRAY(crewstats)
@@ -5580,19 +5568,7 @@ void Game::customloadquick(std::string savfile)
}
}
if (pKey == "flags")
{
std::string TextString = (pText);
if(TextString.length())
{
std::vector<std::string> values = split(TextString,',');
obj.flags.clear();
for(size_t i = 0; i < values.size(); i++)
{
obj.flags.push_back((bool) atoi(values[i].c_str()));
}
}
}
LOAD_ARRAY_RENAME(flags, obj.flags)
LOAD_ARRAY_RENAME(moods, obj.customcrewmoods)
@@ -5971,7 +5947,7 @@ void Game::savetele()
msgs->LinkEndChild( msg );
std::string flags;
for(size_t i = 0; i < obj.flags.size(); i++ )
for(size_t i = 0; i < SDL_arraysize(obj.flags); i++ )
{
flags += help.String((int) obj.flags[i]) + ",";
}
@@ -6167,7 +6143,7 @@ void Game::savequick()
msgs->LinkEndChild( msg );
std::string flags;
for(size_t i = 0; i < obj.flags.size(); i++ )
for(size_t i = 0; i < SDL_arraysize(obj.flags); i++ )
{
flags += help.String((int) obj.flags[i]) + ",";
}
@@ -6356,7 +6332,7 @@ void Game::customsavequick(std::string savfile)
msgs->LinkEndChild( msg );
std::string flags;
for(size_t i = 0; i < obj.flags.size(); i++ )
for(size_t i = 0; i < SDL_arraysize(obj.flags); i++ )
{
flags += help.String((int) obj.flags[i]) + ",";
}
@@ -6582,19 +6558,7 @@ void Game::loadtele()
}
}
if (pKey == "flags")
{
std::string TextString = (pText);
if(TextString.length())
{
std::vector<std::string> values = split(TextString,',');
obj.flags.clear();
for(size_t i = 0; i < values.size(); i++)
{
obj.flags.push_back((bool) atoi(values[i].c_str()));
}
}
}
LOAD_ARRAY_RENAME(flags, obj.flags)
LOAD_ARRAY(crewstats)