From 98ddecc63e2bfa41a48623530dc3195def6e3345 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 5 Sep 2019 09:01:47 +0200
Subject: [PATCH] removed init.cpp

---
 basegraph.cpp          |  2 ++
 graph.cpp              |  2 +-
 hprint.cpp             |  4 +++
 hyper.cpp              |  2 +-
 init.cpp => mobile.cpp | 60 ------------------------------------------
 system.cpp             | 54 +++++++++++++++++++++++++++++++++++++
 6 files changed, 62 insertions(+), 62 deletions(-)
 rename init.cpp => mobile.cpp (88%)

diff --git a/basegraph.cpp b/basegraph.cpp
index 1ccbcec6..2199e21d 100644
--- a/basegraph.cpp
+++ b/basegraph.cpp
@@ -7,6 +7,8 @@
 
 namespace hr {
 
+EX int fontscale = 100;
+
 #if HDR
 /** configuration of the current view */
 struct display_data {
diff --git a/graph.cpp b/graph.cpp
index 4bb8f470..d9fb04e7 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -3350,7 +3350,7 @@ EX colortable nestcolors = { 0x800000, 0x008000, 0x000080, 0x404040, 0x700070, 0
 
 color_t floorcolors[landtypes];
 
-void init_floorcolors() {
+EX void init_floorcolors() {
   for(int i=0; i<landtypes; i++)
     floorcolors[i] = linf[i].color;
 
diff --git a/hprint.cpp b/hprint.cpp
index 6907bda8..c9293e68 100644
--- a/hprint.cpp
+++ b/hprint.cpp
@@ -27,6 +27,10 @@ EX FILE *debugfile;
 #define DF_KEYS "imwesxufgbtopl"
 #endif
 
+EX int debugflags = DF_INIT | DF_ERROR | DF_WARN | DF_MSG | DF_TIME | DF_LOG;
+
+EX string s0;
+
 EX string its(int i) { char buf[64]; sprintf(buf, "%d", i); return buf; }
 
 EX string itsh8(int i) {static char buf[16]; sprintf(buf, "%08X", i); return buf; }
diff --git a/hyper.cpp b/hyper.cpp
index 68239ff9..02084a7a 100644
--- a/hyper.cpp
+++ b/hyper.cpp
@@ -19,7 +19,7 @@
  *  \brief the hyper_main function
  */
 
-#include "init.cpp"
+#include "compileunits.h"
 
 #if CU_HYPER
 
diff --git a/init.cpp b/mobile.cpp
similarity index 88%
rename from init.cpp
rename to mobile.cpp
index 7d94f738..d627ce7f 100644
--- a/init.cpp
+++ b/mobile.cpp
@@ -5,69 +5,9 @@
  *  \brief initialization, and stuff related to mobiles
  */
 
-#include "compileunits.h"
-
 namespace hr {
 
 #if CU_INIT
-EX int fontscale = 100;
-
-EX int debugflags = DF_INIT | DF_ERROR | DF_WARN | DF_MSG | DF_TIME | DF_LOG;
-
-EX string s0;
-
-EX bool fixseed = false;
-EX int startseed = 0;
-
-EX eLand firstland0;
-
-EX void initAll() {
-  init_floorcolors();
-  showstartmenu = true;
-  ca::init();
-#if CAP_COMMANDLINE
-  arg::read(1);
-#endif
-  srand(time(NULL));
-  shrand(fixseed ? startseed : time(NULL));
-
-  achievement_init(); // not in ANDROID
-
-  firstland0 = firstland;
-  
-  // initlanguage();
-  initgraph();
-#if CAP_SAVE
-  loadsave();
-  if(IRREGULAR) irr::auto_creator();
-#endif
-  start_game();
-  
-  if(!shmup::on) {
-    restoreGolems(items[itOrbLife], moGolem); items[itOrbLife] = 0;
-    restoreGolems(items[itOrbFriend], moTameBomberbird); items[itOrbFriend] = 0;
-    restoreGolems(kills[moPrincessMoved], moPrincess, princess::saveHP); kills[moPrincessMoved] = 0;
-    restoreGolems(kills[moPrincessArmedMoved], moPrincessArmed, princess::saveArmedHP); kills[moPrincessArmedMoved] = 0;
-    }
-  
-  firstland = firstland0;
-  polygonal::solve();
-  }
-
-EX void finishAll() {
-  achievement_final(!items[itOrbSafety]);
-  
-#if CAP_SAVE
-  saveStats();
-#endif
-  offscreen.clear();
-  clearMemory();
-#if ISMOBILE==0
-  cleargraph();
-#endif
-  
-  achievement_close();  
-  }
 
 #if ISANDROID
 string buildScoreDescription() {
diff --git a/system.cpp b/system.cpp
index 77e412aa..b6836fe6 100644
--- a/system.cpp
+++ b/system.cpp
@@ -1417,6 +1417,60 @@ EX void clearMemory() {
   callhooks(clearmemory);
   }
 
+EX bool fixseed = false;
+EX int startseed = 0;
+
+EX eLand firstland0;
+
+EX void initAll() {
+  init_floorcolors();
+  showstartmenu = true;
+  ca::init();
+#if CAP_COMMANDLINE
+  arg::read(1);
+#endif
+  srand(time(NULL));
+  shrand(fixseed ? startseed : time(NULL));
+
+  achievement_init(); // not in ANDROID
+
+  firstland0 = firstland;
+  
+  // initlanguage();
+  initgraph();
+#if CAP_SAVE
+  loadsave();
+  if(IRREGULAR) irr::auto_creator();
+#endif
+  start_game();
+  
+  if(!shmup::on) {
+    restoreGolems(items[itOrbLife], moGolem); items[itOrbLife] = 0;
+    restoreGolems(items[itOrbFriend], moTameBomberbird); items[itOrbFriend] = 0;
+    restoreGolems(kills[moPrincessMoved], moPrincess, princess::saveHP); kills[moPrincessMoved] = 0;
+    restoreGolems(kills[moPrincessArmedMoved], moPrincessArmed, princess::saveArmedHP); kills[moPrincessArmedMoved] = 0;
+    }
+  
+  firstland = firstland0;
+  polygonal::solve();
+  }
+
+EX void finishAll() {
+  achievement_final(!items[itOrbSafety]);
+  
+#if CAP_SAVE
+  saveStats();
+#endif
+  offscreen.clear();
+  clearMemory();
+#if ISMOBILE==0
+  cleargraph();
+#endif
+  
+  achievement_close();  
+  }
+
+
 auto cgm = addHook(clearmemory, 40, [] () {
   pathq.clear();
   dcal.clear();