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

Turn map.explored, map.roomdeaths(final) into plain arrays

Browse Source 
They're always fixed-size anyways, there's no need for them to be
vectors.

Also used the new INBOUNDS_ARR() macro for the map.explored bounds
checks in Script.cpp, and made map.explored a proper bool array instead
of an int array.
This commit is contained in:
Misa
2020-07-02 21:01:09 -07:00
committed by Ethan Lee
parent 118008d824
commit cb3afa295a
4 changed files with 22 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
desktop_version/src/Script.cpp
View File

@@ -1333,7 +1333,7 @@ void scriptclass::run()
else if (words[0] == "ifexplored")
{
int room = ss_toi(words[1]) + (20 * ss_toi(words[2]));
if (room >= 0 && room < (int) map.explored.size() && map.explored[room] == 1)
if (INBOUNDS_ARR(room, map.explored) && map.explored[room] == 1)
{
load(words[3]);
position--;
@@ -1392,17 +1392,17 @@ void scriptclass::run()
else if (words[0] == "hidecoordinates")
{
int room = ss_toi(words[1]) + (20 * ss_toi(words[2]));
if (room >= 0 && room < (int) map.explored.size())
if (INBOUNDS_ARR(room, map.explored))
{
map.explored[room] = 0;
map.explored[room] = false;
}
}
else if (words[0] == "showcoordinates")
{
int room = ss_toi(words[1]) + (20 * ss_toi(words[2]));
if (room >= 0 && room < (int) map.explored.size())
if (INBOUNDS_ARR(room, map.explored))
{
map.explored[room] = 1;
map.explored[room] = true;
}
}
else if (words[0] == "hideship")
@@ -3686,12 +3686,9 @@ void scriptclass::hardreset()
map.scrolldir = 0;
map.customshowmm=true;
map.roomdeaths.clear();
map.roomdeaths.resize(20 * 20);
map.roomdeathsfinal.clear();
map.roomdeathsfinal.resize(20 * 20);
map.explored.clear();
map.explored.resize(20 * 20);
SDL_memset(map.roomdeaths, 0, sizeof(map.roomdeaths));
SDL_memset(map.roomdeathsfinal, 0, sizeof(map.roomdeathsfinal));
map.resetmap();
//entityclass
obj.nearelephant = false;
obj.upsetmode = false;