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

Remove map.finalx/y and map.customx/y

Browse Source 
These variables basically serve no purpose. map.customx and map.customy
are clearly never used. map.finalx and map.finaly, on the other hand,
are basically always game.roomx and game.roomy respectively if
map.finalmode is on, and if it's off, then they don't matter.

Also, there are some weird and redundant variable assignments going on
with these; most notably in map.gotoroom(), where rx/ry (local
variables) get assigned to finalx/finaly, then finalx/finaly get
assigned to game.roomx/game.roomy, then finalx/finaly get assigned to
rx/ry. If finalx/finaly made a difference, then there'd be no need to
assign finalx/finaly back to rx/ry. So it makes the code clearer to
remove these weird bits of code.
This commit is contained in:
Misa
2021-01-10 19:58:36 -08:00
committed by Ethan Lee
parent b571fa0919
commit 17d06f06be
4 changed files with 6 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
desktop_version/src/Map.cpp
View File

@@ -29,8 +29,6 @@ mapclass::mapclass()
finalmode = false;
finalstretch = false;
finalx = 50;
finaly = 50;
cursorstate = 0;
cursordelay = 0;
@@ -48,7 +46,6 @@ mapclass::mapclass()
custommode=false;
custommodeforreal=false;
customx=0; customy=0;
customwidth=20; customheight=20;
custommmxoff=0; custommmyoff=0; custommmxsize=0; custommmysize=0;
customzoom=0;
@@ -897,18 +894,13 @@ void mapclass::gotoroom(int rx, int ry)
if (finalmode)
{
//Ok, what way are we moving?
finalx = rx;
finaly = ry;
game.roomx = finalx;
game.roomy = finaly;
game.roomx = rx;
game.roomy = ry;
game.roomchange = true;
rx = finalx;
ry = finaly;
if (game.roomy < 10)
{
game.roomy = 11;
finaly = 11;
}
if(game.roomx>=41 && game.roomy>=48 && game.roomx<61 && game.roomy<68 )
@@ -1377,7 +1369,7 @@ void mapclass::loadlevel(int rx, int ry)
}
case 6: //final level
{
const short* tmap = finallevel.loadlevel(finalx, finaly);
const short* tmap = finallevel.loadlevel(rx, ry);
SDL_memcpy(contents, tmap, sizeof(contents));
roomname = finallevel.roomname;
tileset = 1;
@@ -1452,7 +1444,6 @@ void mapclass::loadlevel(int rx, int ry)
obj.entities[i].yp += (71 * 8);
}
game.roomy--;
finaly--;
ypos = (100-29) * 8;
oldypos = ypos;
@@ -1497,7 +1488,6 @@ void mapclass::loadlevel(int rx, int ry)
obj.entities[i].yp += (71 * 8);
}
game.roomy--;
finaly--;
ypos = (100-29) * 8;
oldypos = ypos;