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

resolving namespace std conflicts

Browse source
This commit is contained in:
Raildex 2020-06-18 15:54:08 +02:00
parent a4e4bd702d
commit 2b4d1ca2e8
25 changed files with 233 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TR5Main/Scripting/GameFlowScript.h
View file

@ -35,7 +35,7 @@ struct GameScriptSettings
bool EnableDynamicShadows;
bool EnableWaterCaustics;
bool Windowed;
string WindowTitle;
std::string WindowTitle;
int DrawingDistance;
bool ShowRendererSteps;
bool ShowDebugInfo;
@ -111,10 +111,10 @@ struct GameScriptMirror
struct GameScriptLevel
{
int NameStringIndex;
string FileName;
string ScriptFileName;
string LoadScreenFileName;
string Background;
std::string FileName;
std::string ScriptFileName;
std::string LoadScreenFileName;
std::string Background;
int Name;
int Soundtrack;
GameScriptSkyLayer Layer1;