From 7fd2956399c19a2fa75593f189890a447519d383 Mon Sep 17 00:00:00 2001
From: "wagic.jeck" <wagic.jeck@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Wed, 10 Feb 2010 02:38:41 +0000
Subject: [PATCH] Jeck - Added option to disable screen transitions.

---
 projects/mtg/include/GameOptions.h    | 2 +-
 projects/mtg/src/GameApp.cpp          | 6 ++++++
 projects/mtg/src/GameOptions.cpp      | 1 +
 projects/mtg/src/GameStateDuel.cpp    | 2 +-
 projects/mtg/src/GameStateOptions.cpp | 3 ++-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/projects/mtg/include/GameOptions.h b/projects/mtg/include/GameOptions.h
index ce339335b..75f7c8659 100644
--- a/projects/mtg/include/GameOptions.h
+++ b/projects/mtg/include/GameOptions.h
@@ -43,6 +43,7 @@ public:
     DISABLECARDS,
     MAX_GRADE,
     ECON_DIFFICULTY,
+    TRANSITIONS,
     INTERRUPT_SECONDS,
     //My interrupts    
     INTERRUPTMYSPELLS,
@@ -161,7 +162,6 @@ private:
   OptionManaDisplay();
   static OptionManaDisplay mDef;
 };
-
 class OptionMaxGrade: public EnumDefinition {
 public:
   static EnumDefinition * getInstance() {return &mDef;};
diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp
index 680720945..578161e31 100644
--- a/projects/mtg/src/GameApp.cpp
+++ b/projects/mtg/src/GameApp.cpp
@@ -362,6 +362,12 @@ void GameApp::Resume(){
 void GameApp::DoTransition(int trans, int tostate, float dur, bool animonly){
   TransitionBase * tb = 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)
     toState = mGameStates[tostate];
 
diff --git a/projects/mtg/src/GameOptions.cpp b/projects/mtg/src/GameOptions.cpp
index 6954f6383..6740ca54f 100644
--- a/projects/mtg/src/GameOptions.cpp
+++ b/projects/mtg/src/GameOptions.cpp
@@ -29,6 +29,7 @@ const char * Options::optionNames[] = {
   "disable_cards",
   "maxGrade",
   "economic_difficulty",
+  "transitions",
   "interruptSeconds",
   "interruptMySpells",
   "interruptMyAbilities",
diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp
index febc0ac16..9c31f7421 100644
--- a/projects/mtg/src/GameStateDuel.cpp
+++ b/projects/mtg/src/GameStateDuel.cpp
@@ -375,7 +375,7 @@ void GameStateDuel::Update(float dt)
           playerdata->taskList->save();
           SAFE_DELETE(playerdata);
           SAFE_DELETE(menu);
-          mParent->DoTransition(TRANSITION_FADE,GAME_STATE_MENU,1);
+          mParent->DoTransition(TRANSITION_FADE,GAME_STATE_MENU);
         }
       }
       break;
diff --git a/projects/mtg/src/GameStateOptions.cpp b/projects/mtg/src/GameStateOptions.cpp
index 4ed537445..c7530a93d 100644
--- a/projects/mtg/src/GameStateOptions.cpp
+++ b/projects/mtg/src/GameStateOptions.cpp
@@ -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::MANADISPLAY,"Mana display",2,1,0)));
   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);
 
   optionsList = NEW WGuiList("User");