Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +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

11
desktop_version/src/Script.cpp
View File

@@ -183,8 +183,8 @@ void scriptclass::run()
}
else if (words[0] == "customifflag")
{
int flag = ss_toi(words[1]);
if (flag >= 0 && flag < (int) obj.flags.size() && obj.flags[flag])
size_t flag = ss_toi(words[1]);
if (flag < SDL_arraysize(obj.flags) && obj.flags[flag])
{
load("custom_"+words[2]);
position--;
@@ -1357,8 +1357,8 @@ void scriptclass::run()
}
else if (words[0] == "ifflag")
{
int flag = ss_toi(words[1]);
if (flag >= 0 && flag < (int) obj.flags.size() && obj.flags[flag])
size_t flag = ss_toi(words[1]);
if (flag < SDL_arraysize(obj.flags) && obj.flags[flag])
{
load(words[2]);
position--;
@@ -3701,8 +3701,7 @@ void scriptclass::hardreset()
obj.trophytype = 0;
obj.altstates = 0;
obj.flags.clear();
obj.flags.resize(100);
obj.resetallflags();
for (i = 0; i < (int) SDL_arraysize(obj.customcrewmoods); i++){
obj.customcrewmoods[i]=true;