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

Jeck - Added option to disable screen transitions.

Browse Source
This commit is contained in:
wagic.jeck
2010-02-10 02:38:41 +00:00
parent f962297d6b
commit 7fd2956399
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/include/GameOptions.h
View File

@@ -43,6 +43,7 @@ public:
DISABLECARDS, DISABLECARDS,
MAX_GRADE, MAX_GRADE,
ECON_DIFFICULTY, ECON_DIFFICULTY,
TRANSITIONS,
INTERRUPT_SECONDS, INTERRUPT_SECONDS,
//My interrupts //My interrupts
INTERRUPTMYSPELLS, INTERRUPTMYSPELLS,
@@ -161,7 +162,6 @@ private:
OptionManaDisplay(); OptionManaDisplay();
static OptionManaDisplay mDef; static OptionManaDisplay mDef;
}; };
class OptionMaxGrade: public EnumDefinition { class OptionMaxGrade: public EnumDefinition {
public: public:
static EnumDefinition * getInstance() {return &mDef;}; static EnumDefinition * getInstance() {return &mDef;};

6
projects/mtg/src/GameApp.cpp
View File

@@ -362,6 +362,12 @@ void GameApp::Resume(){
void GameApp::DoTransition(int trans, int tostate, float dur, bool animonly){ void GameApp::DoTransition(int trans, int tostate, float dur, bool animonly){
TransitionBase * tb = NULL; TransitionBase * tb = NULL;
GameState * toState = NULL; GameState * toState = NULL;
if(options[Options::TRANSITIONS].number != 0){
if(tostate != GAME_STATE_NONE)
SetNextState(tostate);
return;
}
if(tostate > GAME_STATE_NONE && tostate < GAME_STATE_MAX) if(tostate > GAME_STATE_NONE && tostate < GAME_STATE_MAX)
toState = mGameStates[tostate]; toState = mGameStates[tostate];

1
projects/mtg/src/GameOptions.cpp
View File

@@ -29,6 +29,7 @@ const char * Options::optionNames[] = {
"disable_cards", "disable_cards",
"maxGrade", "maxGrade",
"economic_difficulty", "economic_difficulty",
"transitions",
"interruptSeconds", "interruptSeconds",
"interruptMySpells", "interruptMySpells",
"interruptMyAbilities", "interruptMyAbilities",

2
projects/mtg/src/GameStateDuel.cpp
View File

@@ -375,7 +375,7 @@ void GameStateDuel::Update(float dt)
playerdata->taskList->save(); playerdata->taskList->save();
SAFE_DELETE(playerdata); SAFE_DELETE(playerdata);
SAFE_DELETE(menu); SAFE_DELETE(menu);
mParent->DoTransition(TRANSITION_FADE,GAME_STATE_MENU,1); mParent->DoTransition(TRANSITION_FADE,GAME_STATE_MENU);
} }
} }
break; break;

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

@@ -51,7 +51,8 @@ void GameStateOptions::Start()
optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::HANDDIRECTION,"Hand direction",1,1,0))); optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::HANDDIRECTION,"Hand direction",1,1,0)));
optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::MANADISPLAY,"Mana display",2,1,0))); optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::MANADISPLAY,"Mana display",2,1,0)));
optionsList->Add(NEW OptionInteger(Options::REVERSETRIGGERS, "Reverse left and right triggers")); optionsList->Add(NEW OptionInteger(Options::REVERSETRIGGERS, "Reverse left and right triggers"));
optionsList->Add(NEW OptionInteger(Options::DISABLECARDS,"Disable card image loading")); optionsList->Add(NEW OptionInteger(Options::DISABLECARDS,"Disable card images"));
optionsList->Add(NEW OptionInteger(Options::TRANSITIONS,"Disable screen transitions"));
optionsTabs->Add(optionsList); optionsTabs->Add(optionsList);
optionsList = NEW WGuiList("User"); optionsList = NEW WGuiList("User");