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

Remove unused globals and move others from control.cpp to needed source files

Browse source
This commit is contained in:
Lwmte 2021-09-15 21:09:09 +03:00
parent 1195e2077c
commit 42bb372f63
23 changed files with 111 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TR5Main/Scripting/GameFlowScript.cpp
View file

@ -22,7 +22,7 @@ using std::string;
using std::vector;
using std::unordered_map;
extern unordered_map<string, AudioTrack> g_AudioTracks;
extern unordered_map<string, AudioTrack> SoundTracks;
GameFlow::GameFlow(sol::state* lua) : LuaHandler{ lua }
{
@ -182,7 +182,7 @@ void GameFlow::SetAudioTracks(sol::as_table_t<std::vector<GameScriptAudioTrack>>
track.Name = t.trackName;
track.Mask = 0;
track.looped = t.looped;
g_AudioTracks.insert_or_assign(track.Name, track);
SoundTracks.insert_or_assign(track.Name, track);
}
}
@ -238,7 +238,7 @@ bool GameFlow::DoGameflow()
// First we need to fill some legacy variables in PCTomb5.exe
GameScriptLevel* level = Levels[CurrentLevel];
CurrentAtmosphere = level->AmbientTrack;
CurrentLoopedSoundTrack = level->AmbientTrack;
GAME_STATUS status;
@ -268,7 +268,7 @@ bool GameFlow::DoGameflow()
}
}
status = DoLevel(CurrentLevel, CurrentAtmosphere, loadFromSavegame);
status = DoLevel(CurrentLevel, CurrentLoopedSoundTrack, loadFromSavegame);
loadFromSavegame = false;
}