ZoneCommon: Change name of global variable for the T6 Game instance

This commit is contained in:
Jan 2019-12-29 16:39:29 +01:00
parent c488e4c714
commit a0d4e87b8e
4 changed files with 4 additions and 4 deletions

View File

@ -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)

View File

@ -3,7 +3,7 @@
using namespace T6;
GameT6 game_t6;
GameT6 g_GameT6;
void GameT6::AddZone(Zone* zone)
{

View File

@ -11,4 +11,4 @@ public:
std::vector<Zone*> GetZones() override;
};
extern GameT6 game_t6;
extern GameT6 g_GameT6;

View File

@ -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.