Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-30 00:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into renderer_refactor

Browse source 
# Conflicts:
#	TR5Main/TombEngine.vcxproj
This commit is contained in:
MontyTRC89 2021-12-08 06:52:49 +01:00
commit 71e4403ac5
66 changed files with 3224 additions and 1594 deletions
Download patch file Download diff file Expand all files Collapse all files

11
TR5Main/Scripting/GameFlowScript.cpp
View file

@ -27,6 +27,7 @@ GameFlow::GameFlow(sol::state* lua) : LuaHandler{ lua }
GameScriptMirror::Register(m_lua);
GameScriptInventoryObject::Register(m_lua);
GameScriptSettings::Register(m_lua);
GameScriptAnimations::Register(m_lua);
GameScriptAudioTrack::Register(m_lua);
GameScriptColor::Register(m_lua);
GameScriptRotation::Register(m_lua);
@ -78,6 +79,11 @@ settings.lua shouldn't be bundled with any finished levels/games.
@tparam Settings settings a settings object
*/
m_lua->set_function("SetSettings", &GameFlow::SetSettings, this);
/***
@function SetSettings
@tparam Settings settings a settings object
*/
m_lua->set_function("SetAnimations", &GameFlow::SetAnimations, this);
/*** tracks.lua.
__TODO CONFIRM PROPER BEHAVIOUR__
@ -140,6 +146,11 @@ void GameFlow::SetSettings(GameScriptSettings const & src)
m_settings = src;
}
void GameFlow::SetAnimations(GameScriptAnimations const& src)
{
Animations = src;
}
void GameFlow::AddLevel(GameScriptLevel const& level)
{
Levels.push_back(new GameScriptLevel{ level });