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

Remove default arguments from ed switch_* funcs

Browse source 
I don't like default arguments and if we're going to be moving to C
we'll need to remove them anyway.
This commit is contained in:
Misa 2021-08-22 20:44:18 -07:00
parent 52918ba510
commit 0489293885
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
desktop_version/src/editor.cpp
View file

@ -1630,7 +1630,7 @@ int editorclass::findwarptoken(int t)
return 0; return 0;
} }
void editorclass::switch_tileset(const bool reversed /*= false*/) void editorclass::switch_tileset(const bool reversed)
{ {
const char* tilesets[] = {"Space Station", "Outside", "Lab", "Warp Zone", "Ship"}; const char* tilesets[] = {"Space Station", "Outside", "Lab", "Warp Zone", "Ship"};
@ -1649,7 +1649,7 @@ void editorclass::switch_tileset(const bool reversed /*= false*/)
tiles = (tiles % modulus + modulus) % modulus; tiles = (tiles % modulus + modulus) % modulus;
setroomtileset(levx, levy, tiles); setroomtileset(levx, levy, tiles);
clamp_tilecol(levx, levy); clamp_tilecol(levx, levy, false);
char buffer[64]; char buffer[64];
SDL_snprintf(buffer, sizeof(buffer), "Now using %s Tileset", tilesets[tiles]); SDL_snprintf(buffer, sizeof(buffer), "Now using %s Tileset", tilesets[tiles]);
@ -1659,7 +1659,7 @@ void editorclass::switch_tileset(const bool reversed /*= false*/)
updatetiles = true; updatetiles = true;
} }
void editorclass::switch_tilecol(const bool reversed /*= false*/) void editorclass::switch_tilecol(const bool reversed)
{ {
int tilecol = getroomprop(levx, levy)->tilecol; int tilecol = getroomprop(levx, levy)->tilecol;
@ -1681,7 +1681,7 @@ void editorclass::switch_tilecol(const bool reversed /*= false*/)
updatetiles = true; updatetiles = true;
} }
void editorclass::clamp_tilecol(const int rx, const int ry, const bool wrap /*= false*/) void editorclass::clamp_tilecol(const int rx, const int ry, const bool wrap)
{ {
const edlevelclass* const room = getroomprop(rx, ry); const edlevelclass* const room = getroomprop(rx, ry);
const int tileset = room->tileset; const int tileset = room->tileset;
@ -1725,7 +1725,7 @@ void editorclass::clamp_tilecol(const int rx, const int ry, const bool wrap /*=
setroomtilecol(rx, ry, tilecol); setroomtilecol(rx, ry, tilecol);
} }
void editorclass::switch_enemy(const bool reversed /*= false*/) void editorclass::switch_enemy(const bool reversed)
{ {
const edlevelclass* const room = getroomprop(levx, levy); const edlevelclass* const room = getroomprop(levx, levy);
@ -4726,19 +4726,19 @@ void editorinput(void)
ed.shiftkey=false; ed.shiftkey=false;
if(key.keymap[SDLK_F1]) if(key.keymap[SDLK_F1])
{ {
ed.switch_tileset(); ed.switch_tileset(false);
graphics.backgrounddrawn = false; graphics.backgrounddrawn = false;
ed.keydelay = 6; ed.keydelay = 6;
} }
if(key.keymap[SDLK_F2]) if(key.keymap[SDLK_F2])
{ {
ed.switch_tilecol(); ed.switch_tilecol(false);
graphics.backgrounddrawn = false; graphics.backgrounddrawn = false;
ed.keydelay = 6; ed.keydelay = 6;
} }
if(key.keymap[SDLK_F3]) if(key.keymap[SDLK_F3])
{ {
ed.switch_enemy(); ed.switch_enemy(false);
ed.keydelay=6; ed.keydelay=6;
} }
if(key.keymap[SDLK_F4]) if(key.keymap[SDLK_F4])

8
desktop_version/src/editor.h
View file

@ -186,10 +186,10 @@ class editorclass{
int backmatch(int x, int y); int backmatch(int x, int y);
void switch_tileset(const bool reversed = false); void switch_tileset(const bool reversed);
void switch_tilecol(const bool reversed = false); void switch_tilecol(const bool reversed);
void clamp_tilecol(const int rx, const int ry, const bool wrap = false); void clamp_tilecol(const int rx, const int ry, const bool wrap);
void switch_enemy(const bool reversed = false); void switch_enemy(const bool reversed);
bool load(std::string& _path); bool load(std::string& _path);
bool save(std::string& _path); bool save(std::string& _path);