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.contents into a plain array

Browse Source 
map.contents always has 1200 tiles in it, there's no reason it should be
a vector.

This is a big commit because it requires changing all the level classes
to return a pointer to an array instead of returning a vector. Which
took a while for me to figure out, but eventually I did it. I tested to
make sure and there's no problems.
This commit is contained in:
Misa
2020-07-03 02:06:46 -07:00
committed by Ethan Lee
parent a1d4523177
commit 9dcda17978
14 changed files with 472 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop_version/src/editor.cpp
View File

@@ -522,7 +522,7 @@ void editorclass::getlin(const enum textmode mode, const std::string& prompt, st
ed.oldenttext = key.keybuffer;
}
std::vector<int> editorclass::loadlevel( int rxi, int ryi )
const int* editorclass::loadlevel( int rxi, int ryi )
{
//Set up our buffer array to be picked up by mapclass
rxi -= 100;
@@ -532,13 +532,13 @@ std::vector<int> editorclass::loadlevel( int rxi, int ryi )
if(rxi>=mapwidth)rxi-=mapwidth;
if(ryi>=mapheight)ryi-=mapheight;
std::vector<int> result;
static int result[1200];
for (int j = 0; j < 30; j++)
{
for (int i = 0; i < 40; i++)
{
result.push_back(contents[i+(rxi*40)+vmult[j+(ryi*30)]]);
result[i + j*40] = contents[i+(rxi*40)+vmult[j+(ryi*30)]];
}
}