zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-21 00:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ObjWriting/Game/T6/ZoneDumperT6.cpp
View File

@ -11,7 +11,7 @@
bool ZoneDumperT6::CanHandleZone(Zone* zone) 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) bool ZoneDumperT6::DumpZone(Zone* zone, const std::string& basePath)

2
src/ZoneCommon/Game/T6/GameT6.cpp
View File

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

2
src/ZoneCommon/Game/T6/GameT6.h
View File

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

2
src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
View File

@ -290,7 +290,7 @@ public:
return nullptr; return nullptr;
// Create new zone // 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); zone->m_language = GetZoneLanguage(fileName);
// File is supported. Now setup all required steps for loading this file. // File is supported. Now setup all required steps for loading this file.