From a0d4e87b8ee603b9bbc8b5b889ea785d79e161f4 Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Sun, 29 Dec 2019 16:39:29 +0100
Subject: [PATCH] ZoneCommon: Change name of global variable for the T6 Game
 instance

---
 src/ObjWriting/Game/T6/ZoneDumperT6.cpp         | 2 +-
 src/ZoneCommon/Game/T6/GameT6.cpp               | 2 +-
 src/ZoneCommon/Game/T6/GameT6.h                 | 2 +-
 src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ObjWriting/Game/T6/ZoneDumperT6.cpp b/src/ObjWriting/Game/T6/ZoneDumperT6.cpp
index 71887efc..82db9b72 100644
--- a/src/ObjWriting/Game/T6/ZoneDumperT6.cpp
+++ b/src/ObjWriting/Game/T6/ZoneDumperT6.cpp
@@ -11,7 +11,7 @@
 
 bool ZoneDumperT6::CanHandleZone(Zone* zone)
 {
-    return zone->m_game == &game_t6;
+    return zone->m_game == &g_GameT6;
 }
 
 bool ZoneDumperT6::DumpZone(Zone* zone, const std::string& basePath)
diff --git a/src/ZoneCommon/Game/T6/GameT6.cpp b/src/ZoneCommon/Game/T6/GameT6.cpp
index da6d3d06..e3f685d0 100644
--- a/src/ZoneCommon/Game/T6/GameT6.cpp
+++ b/src/ZoneCommon/Game/T6/GameT6.cpp
@@ -3,7 +3,7 @@
 
 using namespace T6;
 
-GameT6 game_t6;
+GameT6 g_GameT6;
 
 void GameT6::AddZone(Zone* zone)
 {
diff --git a/src/ZoneCommon/Game/T6/GameT6.h b/src/ZoneCommon/Game/T6/GameT6.h
index 169300c0..695f93d0 100644
--- a/src/ZoneCommon/Game/T6/GameT6.h
+++ b/src/ZoneCommon/Game/T6/GameT6.h
@@ -11,4 +11,4 @@ public:
     std::vector<Zone*> GetZones() override;
 };
 
-extern GameT6 game_t6;
\ No newline at end of file
+extern GameT6 g_GameT6;
\ No newline at end of file
diff --git a/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp b/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
index c4094ef9..a1972f4a 100644
--- a/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
+++ b/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
@@ -290,7 +290,7 @@ public:
             return nullptr;
 
         // Create new zone
-        auto* zone = new Zone(fileName, 0, new GameAssetPoolT6(0), &game_t6);
+        auto* zone = new Zone(fileName, 0, new GameAssetPoolT6(0), &g_GameT6);
         zone->m_language = GetZoneLanguage(fileName);
         
         // File is supported. Now setup all required steps for loading this file.