Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jeck - Stopgap update fixing WResourceManager slowdown until complete rewrite.

Browse Source
This commit is contained in:
wagic.jeck
2009-08-27 23:24:55 +00:00
parent c5b530bd3b
commit 62e12380a4
7 changed files with 63 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
projects/mtg/src/GameStateOptions.cpp
View File

@@ -29,6 +29,7 @@ void GameStateOptions::Start()
OptionsList * optionsList;
optionsList = NEW OptionsList("Settings");
optionsList->Add(NEW OptionHeader("General Options"));
if (GameApp::HasMusic) optionsList->Add(NEW OptionInteger(Options::MUSICVOLUME, "Music volume", 100, 10));
optionsList->Add(NEW OptionInteger(Options::SFXVOLUME, "SFX volume", 100, 10));
optionsList->Add(NEW OptionInteger(Options::OSD, "Display InGame extra information"));
@@ -86,11 +87,11 @@ void GameStateOptions::Update(float dt)
else if (mState == SHOW_OPTIONS){
switch(optionsTabs->Submode()){
case OPTIONS_SUBMODE_RELOAD:
optionsTabs->acceptSubmode();
optionsTabs->reloadValues();
mState = SHOW_OPTIONS;
break;
// case OPTIONS_SUBMODE_RELOAD:
// optionsTabs->acceptSubmode();
// optionsTabs->reloadValues();
// mState = SHOW_OPTIONS;
// break;
case OPTIONS_SUBMODE_PROFILE:
mState = SHOW_OPTIONS_PROFILE;
break;
@@ -107,8 +108,6 @@ void GameStateOptions::Update(float dt)
}else if(mState == SHOW_OPTIONS_PROFILE){
confirmMenu->Update(dt);
}
}
void GameStateOptions::Render()
@@ -189,13 +188,13 @@ void GameStateOptions::ButtonPressed(int controllerId, int controlId)
switch (controlId){
case 1:
//Load the new profile.
optionsTabs->acceptSubmode();
optionsTabs->reloadValues();
//optionsTabs->acceptSubmode();
//optionsTabs->reloadValues();
//Reset the current settings to those of the profile...
mState = SHOW_OPTIONS;
break;
case 2:
optionsTabs->cancelSubmode();
//optionsTabs->cancelSubmode();
mState = SHOW_OPTIONS;
break;
}