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

Refactor Game::savestats() to not use a default argument

Browse Source 
In order to be able to fix the bug #556, I'm planning on adding
ScreenSettings* to the settings.vvv write function. However, that
entails adding another argument to Game::savesettings(), which is going
to be really messy given the default argument of Game::savestats().
That, combined with the fact that the code comment at the site of the
implementation of Game::savestats() being wrong (!!!), leads me to
believe that using default function arguments here isn't worth it.

Instead, what I've done is made it so callers are explicit about whether
or not they're calling savestats(), savesettings(), or both at the same
time. If they are calling both at the same time, then they will be using
a new function named savestatsandsettings().

In short, these are the interface changes:
 * bool Game::savestats(bool) has been removed
 * bool Game::savestatsandsettings() has been added
 * void Game::savestats_menu() has been renamed to
   void Game::savestatsandsettings_menu()
 * All previous callers of bool Game::savestats() are now using bool
   Game::savestatsandsettings()
 * The one caller of bool Game::savestats(bool) is now using bool
   Game::savestats()
This commit is contained in:
Misa
2020-12-21 16:03:19 -08:00
committed by Ethan Lee
parent 98effeee58
commit b62908f0f4
6 changed files with 61 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
desktop_version/src/Input.cpp
View File

@@ -390,12 +390,12 @@ void menuactionpress()
game.createmenu(game.currentmenuname, true);
game.currentmenuoption = 0;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 1:
music.playef(11);
graphics.screenbuffer->toggleStretchMode();
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 2:
// resize to nearest multiple
@@ -403,7 +403,7 @@ void menuactionpress()
{
music.playef(11);
graphics.screenbuffer->ResizeToNearestMultiple();
game.savestats_menu();
game.savestatsandsettings_menu();
}
else
{
@@ -413,19 +413,19 @@ void menuactionpress()
case 3:
music.playef(11);
graphics.screenbuffer->toggleLinearFilter();
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 4:
//change smoothing
music.playef(11);
graphics.screenbuffer->badSignalEffect= !graphics.screenbuffer->badSignalEffect;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 5:
//toggle 30+ fps
music.playef(11);
game.over30mode = !game.over30mode;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 6:
//toggle vsync
@@ -433,7 +433,7 @@ void menuactionpress()
#ifndef __HAIKU__ // FIXME: Remove after SDL VSync bug is fixed! -flibit
graphics.screenbuffer->vsync = !graphics.screenbuffer->vsync;
graphics.screenbuffer->resetRendererWorkaround();
game.savestats_menu();
game.savestatsandsettings_menu();
#endif
break;
default:
@@ -480,7 +480,7 @@ void menuactionpress()
music.playef(11);
game.returnmenu();
map.nexttowercolour();
game.savestats_menu();
game.savestatsandsettings_menu();
break;
}
break;
@@ -494,7 +494,7 @@ void menuactionpress()
game.returnmenu();
game.currentmenuoption = 4;
map.nexttowercolour();
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 1:
game.slowdown = 24;
@@ -502,7 +502,7 @@ void menuactionpress()
game.returnmenu();
game.currentmenuoption = 4;
map.nexttowercolour();
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 2:
game.slowdown = 18;
@@ -510,7 +510,7 @@ void menuactionpress()
game.returnmenu();
game.currentmenuoption = 4;
map.nexttowercolour();
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 3:
game.slowdown = 12;
@@ -518,7 +518,7 @@ void menuactionpress()
game.returnmenu();
game.currentmenuoption = 4;
map.nexttowercolour();
game.savestats_menu();
game.savestatsandsettings_menu();
break;
}
break;
@@ -536,31 +536,31 @@ void menuactionpress()
SDL_ShowCursor(SDL_ENABLE);
graphics.showmousecursor = true;
}
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 1:
// toggle unfocus pause
game.disablepause = !game.disablepause;
game.savestats_menu();
game.savestatsandsettings_menu();
music.playef(11);
break;
case 2:
// toggle fake load screen
game.skipfakeload = !game.skipfakeload;
game.savestats_menu();
game.savestatsandsettings_menu();
music.playef(11);
break;
case 3:
// toggle translucent roomname BG
graphics.translucentroomname = !graphics.translucentroomname;
game.savestats_menu();
game.savestatsandsettings_menu();
music.playef(11);
break;
case 4:
// Glitchrunner mode
music.playef(11);
game.glitchrunnermode = !game.glitchrunnermode;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 5:
//back
@@ -576,7 +576,7 @@ void menuactionpress()
case 0:
//disable animated backgrounds
game.colourblindmode = !game.colourblindmode;
game.savestats_menu();
game.savestatsandsettings_menu();
graphics.towerbg.tdrawback = true;
graphics.titlebg.tdrawback = true;
music.playef(11);
@@ -584,7 +584,7 @@ void menuactionpress()
case 1:
//disable screeneffects
game.noflashingmode = !game.noflashingmode;
game.savestats_menu();
game.savestatsandsettings_menu();
if (!game.noflashingmode)
{
music.playef(18);
@@ -597,7 +597,7 @@ void menuactionpress()
case 2:
//disable text outline
graphics.notextoutline = !graphics.notextoutline;
game.savestats_menu();
game.savestatsandsettings_menu();
music.playef(11);
break;
case 3:
@@ -612,7 +612,7 @@ void menuactionpress()
else
{
map.invincibility = !map.invincibility;
game.savestats_menu();
game.savestatsandsettings_menu();
}
music.playef(11);
}
@@ -754,7 +754,7 @@ void menuactionpress()
music.usingmmmmmm = !music.usingmmmmmm;
music.playef(11);
music.play(music.currentsong);
game.savestats();
game.savestatsandsettings();
}
offset += mmmmmm_offset;
@@ -784,7 +784,7 @@ void menuactionpress()
music.playef(11);
game.createmenu(Menu::unlockmenutrials, true);
game.currentmenuoption = 0;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 1: //unlock 2
game.unlock[10] = true;
@@ -792,7 +792,7 @@ void menuactionpress()
music.playef(11);
game.createmenu(Menu::unlockmenutrials, true);
game.currentmenuoption = 1;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 2: //unlock 3
game.unlock[11] = true;
@@ -800,7 +800,7 @@ void menuactionpress()
music.playef(11);
game.createmenu(Menu::unlockmenutrials, true);
game.currentmenuoption = 2;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 3: //unlock 4
game.unlock[12] = true;
@@ -808,7 +808,7 @@ void menuactionpress()
music.playef(11);
game.createmenu(Menu::unlockmenutrials, true);
game.currentmenuoption = 3;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 4: //unlock 5
game.unlock[13] = true;
@@ -816,7 +816,7 @@ void menuactionpress()
music.playef(11);
game.createmenu(Menu::unlockmenutrials, true);
game.currentmenuoption = 4;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 5: //unlock 6
game.unlock[14] = true;
@@ -824,7 +824,7 @@ void menuactionpress()
music.playef(11);
game.createmenu(Menu::unlockmenutrials, true);
game.currentmenuoption = 5;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 6: //back
//back
@@ -852,7 +852,7 @@ void menuactionpress()
game.unlock[7] = true;
game.createmenu(Menu::unlockmenu, true);
game.currentmenuoption = 1;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 2:
//unlock no death mode
@@ -861,7 +861,7 @@ void menuactionpress()
game.unlocknotify[17] = true;
game.createmenu(Menu::unlockmenu, true);
game.currentmenuoption = 2;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 3:
//unlock flip mode
@@ -870,7 +870,7 @@ void menuactionpress()
game.unlocknotify[18] = true;
game.createmenu(Menu::unlockmenu, true);
game.currentmenuoption = 3;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 4:
//unlock jukebox
@@ -878,7 +878,7 @@ void menuactionpress()
game.stat_trinkets = 20;
game.createmenu(Menu::unlockmenu, true);
game.currentmenuoption = 4;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 5:
//unlock secret lab
@@ -887,7 +887,7 @@ void menuactionpress()
game.unlocknotify[8] = true;
game.createmenu(Menu::unlockmenu, true);
game.currentmenuoption = 5;
game.savestats_menu();
game.savestatsandsettings_menu();
break;
default:
//back
@@ -1251,7 +1251,7 @@ void menuactionpress()
{
key.sensitivity = 0;
}
game.savestats_menu();
game.savestatsandsettings_menu();
break;
case 5: