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

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

36
desktop_version/src/Map.cpp
View File

@@ -59,32 +59,16 @@ mapclass::mapclass()
vmult.push_back(int(i * 40));
}
//We create a blank map
for (int j = 0; j < 30; j++)
{
for (int i = 0; i < 40; i++)
{
contents.push_back(0);
}
}
contents.resize(40 * 30);
for (int j = 0; j < 20; j++)
{
for (int i = 0; i < 20; i++)
{
areamap.push_back(0);
roomdeaths.push_back(0);
roomdeathsfinal.push_back(0);
explored.push_back(0);
}
}
roomdeaths.resize(20 * 20);
roomdeathsfinal.resize(20 * 20);
explored.resize(20 * 20);
tileset = 0;
initmapdata();
for (int i = 0; i < 8; i++)
{
specialnames.push_back(std::string());
}
specialnames.resize(8);
resetnames();
//Areamap starts at 100,100 and extends 20x20
@@ -110,7 +94,6 @@ mapclass::mapclass()
2,2,2,2,2,0,0,2,0,3,0,0,0,0,0,0,0,0,0,0,
2,2,2,2,2,0,0,2,0,3,0,0,0,0,0,0,0,0,0,0,
};
areamap.clear();
areamap.insert(areamap.end(), tmap, tmap+400);
}
@@ -143,13 +126,8 @@ void mapclass::settrinket(int x, int y)
void mapclass::resetmap()
{
//clear the explored area of the map
for (int j = 0; j < 20; j++)
{
for (int i = 0; i < 20; i++)
{
explored[i + (j * 20)] = 0;
}
}
explored.clear();
explored.resize(20 * 20);
}
void mapclass::resetnames()