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

Rename SetErrorMode to SetScriptErrorMode to avoid VS getting confused by some MS function with the same name. Add GetScriptErrorMode.

Browse source
This commit is contained in:
hispidence 2021-08-21 00:13:44 +01:00
parent 2981c75827
commit 8d84ee6f3f
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TR5Main/Scripting/ScriptAssert.cpp
View file

@ -34,7 +34,14 @@ bool ScriptAssert(bool cond, std::string const& msg, std::optional<ERROR_MODE> f
return cond; return cond;
} }
void SetErrorMode(ERROR_MODE mode)
void SetScriptErrorMode(ERROR_MODE mode)
{ {
ScriptErrorMode = mode; ScriptErrorMode = mode;
} }
ERROR_MODE GetScriptErrorMode()
{
return ScriptErrorMode;
}

4
TR5Main/Scripting/ScriptAssert.h
View file

@ -9,8 +9,10 @@ enum class ERROR_MODE
WARN, WARN,
TERMINATE TERMINATE
}; };
void SetScriptErrorMode(ERROR_MODE mode);
ERROR_MODE GetScriptErrorMode();
void ScriptWarn(std::string const& msg); void ScriptWarn(std::string const& msg);
bool ScriptAssert(bool cond, std::string const& msg, std::optional<ERROR_MODE> forceMode = std::nullopt); bool ScriptAssert(bool cond, std::string const& msg, std::optional<ERROR_MODE> forceMode = std::nullopt);
void SetErrorMode(ERROR_MODE mode);