Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Moved CCutsceneMgr::ms_cutsceneProcessing to private

Browse Source
This commit is contained in:
Sergeanur 2019-10-19 16:47:30 +03:00
parent 52cef5b157
commit 9d4140734f
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/control/GameLogic.cpp
View File

@ -67,7 +67,7 @@ CGameLogic::Update()
CVector vecRestartPos; CVector vecRestartPos;
float fRestartFloat; float fRestartFloat;
if (CCutsceneMgr::ms_cutsceneProcessing) return; if (CCutsceneMgr::IsCutsceneProcessing()) return;
CPlayerInfo &pPlayerInfo = CWorld::Players[CWorld::PlayerInFocus]; CPlayerInfo &pPlayerInfo = CWorld::Players[CWorld::PlayerInFocus];
switch (pPlayerInfo.m_WBState) { switch (pPlayerInfo.m_WBState) {

3
src/core/CutsceneMgr.cpp
View File

@ -107,8 +107,7 @@ const struct {
int int
FindCutsceneAudioTrackId(const char *szCutsceneName) FindCutsceneAudioTrackId(const char *szCutsceneName)
{ {
for (int i = 0; musicNameIdAssoc[i].szTrackName; i++) for (int i = 0; musicNameIdAssoc[i].szTrackName; i++) {
{
if (!strcmpi(musicNameIdAssoc[i].szTrackName, szCutsceneName)) if (!strcmpi(musicNameIdAssoc[i].szTrackName, szCutsceneName))
return musicNameIdAssoc[i].iTrackId; return musicNameIdAssoc[i].iTrackId;
} }

2
src/core/CutsceneMgr.h
View File

@ -21,10 +21,10 @@ class CCutsceneMgr
static CAnimBlendAssocGroup &ms_cutsceneAssociations; static CAnimBlendAssocGroup &ms_cutsceneAssociations;
static CVector &ms_cutsceneOffset; static CVector &ms_cutsceneOffset;
static float &ms_cutsceneTimer; static float &ms_cutsceneTimer;
static bool &ms_cutsceneProcessing;
public: public:
static CDirectory *&ms_pCutsceneDir; static CDirectory *&ms_pCutsceneDir;
static uint32 &ms_cutsceneLoadStatus; static uint32 &ms_cutsceneLoadStatus;
static bool &ms_cutsceneProcessing;
static bool IsRunning(void) { return ms_running; } static bool IsRunning(void) { return ms_running; }
static bool IsCutsceneProcessing(void) { return ms_cutsceneProcessing; } static bool IsCutsceneProcessing(void) { return ms_cutsceneProcessing; }