Jeck - unsigned/signed fix, options fixes

* Abstracted out option calls to "f3" behind Constants::OPTION_FONT * Added option to disable card image loading.
2009-09-24 23:26:32 +00:00
parent 6d9b488878
commit 2020dce4fd
7 changed files with 28 additions and 16 deletions
@@ -20,6 +20,8 @@ const char * Options::optionNames[] = {
  "displayOSD",
  "closed_hand",
  "hand_direction",
+  "reverse_triggers",
+  "disable_cards",
  "interruptSeconds",
  "interruptMySpells",
  "interruptMyAbilities",
@@ -457,13 +459,20 @@ GameOption& GameSettings::operator[](int optionID){
  }

  if(option_name.size() > 2){
-   if(option_name[0] == '_' && option_name[1] == 't')
-    return (*themeOptions)[optionID];
-   else if(option_name[0] == '_' && option_name[1] == 'g')
-    return (*globalOptions)[optionID];
+   if(option_name[0] == '_' && option_name[1] == 't'){
+     if(themeOptions)
+      return (*themeOptions)[optionID];
+    }
+   else if(option_name[0] == '_' && option_name[1] == 'g'){
+    if(globalOptions)
+      return (*globalOptions)[optionID];
+   }
  }

-  return (*profileOptions)[optionID];
+  if(profileOptions)
+    return (*profileOptions)[optionID];
+
+  return invalid_option;
 }