From 262d6f2a92a74c081dd07bfea4ab2db82fe63ebe Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 20 Jul 2018 00:07:30 +0200
Subject: [PATCH] mode changes moved to config.cpp

---
 commandline.cpp | 10 ----------
 config.cpp      | 11 +++++++++++
 hyper.h         |  1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/commandline.cpp b/commandline.cpp
index 240e73a5..b6ffcc8d 100644
--- a/commandline.cpp
+++ b/commandline.cpp
@@ -91,16 +91,6 @@ int arg::readCommon() {
   else if(argis("-font")) { PHASE(1); shift(); fontpath = args(); }
 #endif
 
-// mode changes:
-
-  TOGGLE('o', vid.usingGL, switchGL())
-  TOGGLE('C', chaosmode, stop_game_and_switch_mode(rg::chaos))
-  TOGGLE('f', vid.full, switchFullscreen())
-  TOGGLE('S', shmup::on, stop_game_and_switch_mode(rg::shmup))
-  TOGGLE('H', hardcore, switchHardcore())
-  TOGGLE('R', randomPatternsMode, stop_game_and_switch_mode(rg::randpattern))
-  TOGGLE('i', inv::on, stop_game_and_switch_mode(rg::inv))
-  
   else if(argis("-test")) 
     callhooks(hooks_tests);
   else if(argis("-offline")) {
diff --git a/config.cpp b/config.cpp
index 59f3fda2..4a905bac 100644
--- a/config.cpp
+++ b/config.cpp
@@ -1445,6 +1445,17 @@ int read_config_args() {
   else if(argis("-els")) {
     shift(); conformal::extra_line_steps = argf();
     }
+
+// mode changes:
+
+  TOGGLE('o', vid.usingGL, switchGL())
+  TOGGLE('C', chaosmode, stop_game_and_switch_mode(rg::chaos))
+  TOGGLE('f', vid.full, switchFullscreen())
+  TOGGLE('S', shmup::on, stop_game_and_switch_mode(rg::shmup))
+  TOGGLE('H', hardcore, switchHardcore())
+  TOGGLE('R', randomPatternsMode, stop_game_and_switch_mode(rg::randpattern))
+  TOGGLE('i', inv::on, stop_game_and_switch_mode(rg::inv))
+  
   else return 1;
   return 0;
   }
diff --git a/hyper.h b/hyper.h
index 7f965c1e..c96ece64 100644
--- a/hyper.h
+++ b/hyper.h
@@ -3712,4 +3712,5 @@ extern bool need_reset_geometry;
 extern ld hexshift;
 
 extern bool noshadow, bright, nohelp, dont_face_pc;
+extern void switchHardcore();
 }