G! controls are default now

Try · Jul 14, 2023 · 0039c27 · 0039c27
1 parent adc9dd0
commit 0039c27
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/game/game/playercontrol.cpp b/game/game/playercontrol.cpp
@@ -21,7 +21,11 @@ PlayerControl::~PlayerControl() {
   }
 
 void PlayerControl::setupSettings() {
-  g2Ctrl = Gothic::inst().settingsGetI("GAME","USEGOTHIC1CONTROLS")==0;
+  if(Gothic::inst().version().game==2) {
+    g2Ctrl = Gothic::inst().settingsGetI("GAME","USEGOTHIC1CONTROLS")==0;
+    } else {
+    g2Ctrl = false;
+    }
   }
 
 void PlayerControl::setTarget(Npc *other) {

diff --git a/game/gothic.cpp b/game/gothic.cpp
@@ -63,7 +63,7 @@ Gothic::Gothic() {
   defaults->set("GAME", "invCatOrder",         "COMBAT,POTION,FOOD,ARMOR,MAGIC,RUNE,DOCS,OTHER,NONE");
   defaults->set("GAME", "invMaxColumns",       5);
   defaults->set("GAME", "animatedWindows",     1);
-  defaults->set("GAME", "useGothic1Controls",  0);
+  defaults->set("GAME", "useGothic1Controls",  1);
   defaults->set("GAME", "highlightMeleeFocus", 0);
 
   defaults->set("SKY_OUTDOOR", "zSunName",   "unsun5.tga");