From 73ef6d54a7a759ac25797ab6a62b95ac5e27e175 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Mon, 26 Jun 2017 00:02:56 +0100
Subject: [PATCH] Move rct2_init and rct2_dispose into Context

---
 src/openrct2/Context.cpp | 42 +++++++++++++++++++++++++++------
 src/openrct2/rct2.c      | 50 ----------------------------------------
 src/openrct2/rct2.h      |  1 -
 3 files changed, 35 insertions(+), 58 deletions(-)

diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
index b92b9ac98d..4527417082 100644
--- a/src/openrct2/Context.cpp
+++ b/src/openrct2/Context.cpp
@@ -45,8 +45,10 @@ extern "C"
 {
     #include "audio/audio.h"
     #include "config/Config.h"
+    #include "drawing/lightfx.h"
     #include "editor.h"
     #include "game.h"
+    #include "input.h"
     #include "interface/chat.h"
     #include "interface/console.h"
     #include "interface/themes.h"
@@ -60,6 +62,7 @@ extern "C"
     #include "rct1.h"
     #include "rct2.h"
     #include "rct2/interop.h"
+    #include "util/util.h"
 }
 
 using namespace OpenRCT2;
@@ -110,7 +113,10 @@ namespace OpenRCT2
             network_close();
             http_dispose();
             language_close_all();
-            rct2_dispose();
+            object_manager_unload_all_objects();
+            gfx_object_check_all_images_freed();
+            gfx_unload_g2();
+            gfx_unload_g1();
             config_release();
 #ifndef DISABLE_NETWORK
             EVP_MD_CTX_destroy(gHashCTX);
@@ -222,26 +228,48 @@ namespace OpenRCT2
             {
                 audio_init();
                 audio_populate_devices();
+                audio_init_ride_sounds_and_info();
             }
 
             http_init();
             network_set_env(_env);
+            chat_init();
             theme_manager_initialise();
+            rct2_copy_original_user_files_over();
 
             rct2_interop_setup_hooks();
 
-            if (!rct2_init())
+            if (!gOpenRCT2NoGraphics)
             {
-                return false;
+                LoadBaseGraphics();
+#ifdef __ENABLE_LIGHTFX__
+                lightfx_init();
+#endif
             }
-
-            chat_init();
-
-            rct2_copy_original_user_files_over();
+            gScenarioTicks = 0;
+            util_srand((uint32)time(0));
+            input_reset_place_obj_modifier();
+            viewport_init_all();
+            game_init_all(150);
             return true;
         }
 
     private:
+        bool LoadBaseGraphics()
+        {
+            if (!gfx_load_g1())
+            {
+                return false;
+            }
+            if (!gfx_load_g2())
+            {
+                return false;
+            }
+            gfx_load_csg();
+            font_sprite_initialise_characters();
+            return true;
+        }
+
         /**
          * Launches the game, after command line arguments have been parsed and processed.
          */
diff --git a/src/openrct2/rct2.c b/src/openrct2/rct2.c
index adb2073a0d..882df72fcf 100644
--- a/src/openrct2/rct2.c
+++ b/src/openrct2/rct2.c
@@ -135,56 +135,6 @@ void rct2_quit()
     window_save_prompt_open();
 }
 
-void rct2_dispose()
-{
-    object_manager_unload_all_objects();
-    gfx_object_check_all_images_freed();
-    gfx_unload_g2();
-    gfx_unload_g1();
-}
-
-bool rct2_init()
-{
-    log_verbose("initialising game");
-
-    gScenarioTicks = 0;
-    util_srand((uint32)time(0));
-
-    input_reset_place_obj_modifier();
-
-    if (!gOpenRCT2NoGraphics) {
-        if (!gfx_load_g1()) {
-            return false;
-        }
-        if (!gfx_load_g2()) {
-            return false;
-        }
-        gfx_load_csg();
-
-        font_sprite_initialise_characters();
-    }
-
-    if (!gOpenRCT2Headless) {
-        // platform_init();
-        audio_init_ride_sounds_and_info();
-    }
-    viewport_init_all();
-
-    game_init_all(150);
-    if (!gOpenRCT2Headless)
-        window_title_menu_open();
-
-    if (!gOpenRCT2NoGraphics) {
-        load_palette();
-#ifdef __ENABLE_LIGHTFX__
-        lightfx_init();
-#endif
-    }
-
-    log_verbose("initialising game finished");
-    return true;
-}
-
 /**
  *
  *  rct2: 0x00683499
diff --git a/src/openrct2/rct2.h b/src/openrct2/rct2.h
index 487d7b72df..2882109d2a 100644
--- a/src/openrct2/rct2.h
+++ b/src/openrct2/rct2.h
@@ -172,7 +172,6 @@ extern char gRCT2AddressTracksPath[];
 bool rct2_init();
 sint32 rct2_init_directories();
 sint32 rct2_startup_checks();
-void rct2_dispose();
 void substitute_path(char *dest, size_t size, const char *path, const char *filename);
 sint32 check_mutex();
 sint32 check_file_paths();