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

16
TR5Main/Scripting/GameLogicScript.h
View file

@ -24,8 +24,8 @@
#define LUA_VARIABLE_TYPE_STRING 3
typedef struct LuaFunction {
string Name;
string Code;
std::string Name;
std::string Code;
bool Executed;
};
@ -106,18 +106,18 @@ class LuaVariables
public:
map<string, sol::object> variables;
sol::object GetVariable(string key);
void SetVariable(string key, sol::object value);
sol::object GetVariable(std::string key);
void SetVariable(std::string key, sol::object value);
};
typedef struct LuaVariable
{
bool IsGlobal;
string Name;
std::string Name;
int Type;
float FloatValue;
int IntValue;
string StringValue;
std::string StringValue;
bool BoolValue;
};
@ -139,7 +139,7 @@ public:
void FreeLevelScripts();
void AddTrigger(LuaFunction* function);
void AddLuaId(int luaId, short itemNumber);
void AddLuaName(string luaName, short itemNumber);
void AddLuaName(std::string luaName, short itemNumber);
void AssignItemsAndLara();
void ResetVariables();
@ -156,7 +156,7 @@ public:
void AddOneSecret();
void MakeItemInvisible(short id);
unique_ptr<GameScriptItem> GetItemById(int id);
unique_ptr<GameScriptItem> GetItemByName(string name);
unique_ptr<GameScriptItem> GetItemByName(std::string name);
void PlaySoundEffectAtPosition(short id, int x, int y, int z, int flags);
void PlaySoundEffect(short id, int flags);
GameScriptPosition CreatePosition(float x, float y, float z);