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

Simplify inits/resets in entityclass/mapclass

Browse Source 
Instead of using somewhat-obtuse for-loops to initialize or reset these
vectors, it takes up less lines of code and is clearer if we use
std::vector::resize() and std::vector::clear() instead.
This commit is contained in:
Misa
2020-05-19 16:41:29 -07:00
committed by Ethan Lee
parent de82918efd
commit e795fbb511
3 changed files with 22 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
desktop_version/src/Script.cpp
View File

@@ -3536,15 +3536,12 @@ void scriptclass::hardreset()
map.scrolldir = 0;
map.customshowmm=true;
for (j = 0; j < 20; j++)
{
for (i = 0; i < 20; i++)
{
map.roomdeaths[i + (j * 20)] = 0;
map.roomdeathsfinal[i + (j * 20)] = 0;
map.explored[i + (j * 20)] = 0;
}
}
map.roomdeaths.clear();
map.roomdeaths.resize(20 * 20);
map.roomdeathsfinal.clear();
map.roomdeathsfinal.resize(20 * 20);
map.explored.clear();
map.explored.resize(20 * 20);
//entityclass
obj.nearelephant = false;
obj.upsetmode = false;
@@ -3554,20 +3551,18 @@ void scriptclass::hardreset()
obj.trophytype = 0;
obj.altstates = 0;
for (i = 0; i < 100; i++)
{
obj.flags[i] = false;
}
obj.flags.clear();
obj.flags.resize(100);
for (i = 0; i < 6; i++){
obj.customcrewmoods[i]=1;
}
for (i = 0; i < 100; i++)
{
obj.collect[i] = false;
obj.customcollect[i] = false;
}
obj.collect.clear();
obj.collect.resize(100);
obj.customcollect.clear();
obj.customcollect.resize(100);
i = 100; //previously a for-loop iterating over collect/customcollect set this to 100
if (obj.getplayer() > -1){
obj.entities[obj.getplayer()].tile = 0;