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

Change ExecuteScript and ExecuteString to return void and throw a TENScriptException on error. Remove my old comments which didn't really add info. Implement SetSettings.

Browse source
This commit is contained in:
hispidence 2021-08-03 15:12:24 +01:00
parent efc91a8e34
commit 58a424e52f
4 changed files with 26 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

41
TR5Main/Scripting/GameFlowScript.cpp
View file

@ -54,7 +54,6 @@ Add a level to the gameflow.
*/
m_lua->set_function("SetAudioTracks", &GameFlow::SetAudioTracks, this);
/***
@function SetStrings
@tparam table table array-style table with strings
@ -66,6 +65,12 @@ Add a level to the gameflow.
@tparam table table array-style table with TODO EXTRA INFO HERE
*/
m_lua->set_function("SetLanguageNames", &GameFlow::SetLanguageNames, this);
/***
@function SetSettings
@tparam table table array-style table with TODO EXTRA INFO HERE
*/
m_lua->set_function("SetSettings", &GameFlow::SetSettings, this);
}
GameFlow::~GameFlow()
@ -86,6 +91,11 @@ void GameFlow::SetStrings(sol::nested<std::unordered_map<std::string, std::vecto
m_translationsMap = std::move(src);
}
void GameFlow::SetSettings(GameScriptSettings const & src)
{
m_settings = src;
}
void GameFlow::AddLevel(GameScriptLevel const& level)
{
Levels.push_back(new GameScriptLevel{ level });
@ -108,30 +118,13 @@ void GameFlow::SetAudioTracks(sol::as_table_t<std::vector<GameScriptAudioTrack>>
}
}
bool GameFlow::LoadGameFlowScript()
void GameFlow::LoadGameFlowScript()
{
// Load the enums file
std::string err;
if (!ExecuteScript("Scripts/Enums.lua", err)) {
std::cout << err << "\n";
}
// Load the new audio tracks file
if (!ExecuteScript("Scripts/Tracks.lua", err)) {
std::cout << err << "\n";
}
// Load the new script file
if (!ExecuteScript("Scripts/Gameflow.lua", err)) {
std::cout << err << "\n";
}
// Populate strings
if (!ExecuteScript("Scripts/Strings.lua", err)) {
std::cout << err << "\n";
}
return true;
ExecuteScript("Scripts/Enums.lua");
ExecuteScript("Scripts/Tracks.lua");
ExecuteScript("Scripts/Gameflow.lua");
ExecuteScript("Scripts/Strings.lua");
ExecuteScript("Scripts/Settings.lua");
}
char const * GameFlow::GetString(const char* id)