mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-07 14:50:21 +00:00
Code Issues Releases Wiki Activity

Regression: Fix optionsOnly not being remembered

Browse source
This commit is contained in:
fgenesis 2016-07-09 15:23:30 +02:00
parent 8472718fb7
commit 4b0f45df73
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Aquaria/InGameMenu.cpp
View file

@ -1168,7 +1168,7 @@ void InGameMenu::show(bool ignoreInput, bool optionsOnly, MenuPage menuPage)
game->clearControlHint(); game->clearControlHint();
selectedTreasureFlag = -1; selectedTreasureFlag = -1;
optionsOnly = optionsOnly; this->optionsOnly = optionsOnly;
core->sound->playSfx("Menu-Open"); core->sound->playSfx("Menu-Open");
dropIngrNames.clear(); dropIngrNames.clear();
@ -1216,10 +1216,7 @@ void InGameMenu::show(bool ignoreInput, bool optionsOnly, MenuPage menuPage)
else else
liCrystal->alphaMod = 0; liCrystal->alphaMod = 0;
int i = 0; for (int i = 0; i < songSlots.size(); i++)
for (i = 0; i < songSlots.size(); i++)
{ {
if (dsq->continuity.hasSong(dsq->continuity.getSongTypeBySlot(i))) if (dsq->continuity.hasSong(dsq->continuity.getSongTypeBySlot(i)))
songSlots[i]->alpha.interpolateTo(1, t); songSlots[i]->alpha.interpolateTo(1, t);
@ -1325,7 +1322,7 @@ void InGameMenu::show(bool ignoreInput, bool optionsOnly, MenuPage menuPage)
toggleMainMenu(true); toggleMainMenu(true);
songBubbles->alpha.interpolateTo(1, t); songBubbles->alpha.interpolateTo(1, t);
for (i = 0; i < menu.size(); i++) for (int i = 0; i < menu.size(); i++)
{ {
menu[i]->scale = Vector(0,0); menu[i]->scale = Vector(0,0);
menu[i]->alpha = 0; menu[i]->alpha = 0;
@ -1338,7 +1335,7 @@ void InGameMenu::show(bool ignoreInput, bool optionsOnly, MenuPage menuPage)
if (!optionsOnly) if (!optionsOnly)
{ {
for (i = 0; i < menu.size(); i++) for (int i = 0; i < menu.size(); i++)
{ {
menu[i]->scale.interpolateTo(Vector(1, 1), 0.15); menu[i]->scale.interpolateTo(Vector(1, 1), 0.15);