mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Refactor warp dir switching to separate function

Browse source 
This is so the same code can be used to go in reverse instead of
copy-pasting it.
This commit is contained in:
Misa 2021-08-22 20:51:21 -07:00
parent 0489293885
commit d2153aee87
2 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
desktop_version/src/editor.cpp
View file

@ -1748,6 +1748,44 @@ void editorclass::switch_enemy(const bool reversed)
notedelay = 45;
}
void editorclass::switch_warpdir(const bool reversed)
{
static const int modulus = 4;
const edlevelclass* const room = getroomprop(levx, levy);
int warpdir = room->warpdir;
if (reversed)
{
--warpdir;
}
else
{
++warpdir;
}
warpdir = (warpdir % modulus + modulus) % modulus;
setroomwarpdir(levx, levy, warpdir);
switch (warpdir)
{
default:
note = "Room warping disabled";
break;
case 1:
note = "Room warps horizontally";
break;
case 2:
note = "Room warps vertically";
break;
case 3:
note = "Room warps in all directions";
break;
}
notedelay = 45;
}
bool editorclass::load(std::string& _path)
{
tinyxml2::XMLDocument doc;
@ -4791,31 +4829,8 @@ void editorinput(void)
if(key.keymap[SDLK_w])
{
ed.setroomwarpdir(ed.levx, ed.levy, (ed.getroomprop(ed.levx, ed.levy)->warpdir+1)%4);
if(ed.getroomprop(ed.levx, ed.levy)->warpdir==0)
{
ed.note="Room warping disabled";
ed.notedelay=45;
ed.switch_warpdir(false);
graphics.backgrounddrawn = false;
}
else if(ed.getroomprop(ed.levx, ed.levy)->warpdir==1)
{
ed.note="Room warps horizontally";
ed.notedelay=45;
graphics.backgrounddrawn=false;
}
else if(ed.getroomprop(ed.levx, ed.levy)->warpdir==2)
{
ed.note="Room warps vertically";
ed.notedelay=45;
graphics.backgrounddrawn=false;
}
else if(ed.getroomprop(ed.levx, ed.levy)->warpdir==3)
{
ed.note="Room warps in all directions";
ed.notedelay=45;
graphics.backgrounddrawn=false;
}
ed.keydelay = 6;
}
if(key.keymap[SDLK_e])

1
desktop_version/src/editor.h
View file

@ -190,6 +190,7 @@ class editorclass{
void switch_tilecol(const bool reversed);
void clamp_tilecol(const int rx, const int ry, const bool wrap);
void switch_enemy(const bool reversed);
void switch_warpdir(const bool reversed);
bool load(std::string& _path);
bool save(std::string& _path);