Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-10 12:36:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed std namespace collisions

Browse source 
Refactored ChunkID/ChunkReader/Writer
This commit is contained in:
Nils Gaitzsch 2020-06-20 23:39:08 +02:00
parent 0498c261da
commit c860919616
47 changed files with 589 additions and 498 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TR5Main/Scripting/GameFlowScript.h
View file

@ -163,8 +163,8 @@ private:
sol::state* m_lua;
GameScriptSettings m_settings;
string loadScriptFromFile(char* luaFilename);
map<short, short> m_itemsMap;
std::string loadScriptFromFile(char* luaFilename);
std::map<short, short> m_itemsMap;
public:
Vector3 SkyColorLayer1;
@ -188,8 +188,8 @@ public:
// Selected language set
LanguageScript* CurrentStrings;
vector<LanguageScript*> Strings;
vector<GameScriptLevel*> Levels;
std::vector<LanguageScript*> Strings;
std::vector<GameScriptLevel*> Levels;
GameFlow(sol::state* lua);
~GameFlow();