summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-19 15:47:30 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-19 15:47:30 +0200
commit9d4140734f5b49d743d3312971e8e1b8c81d9453 (patch)
treeb4be1ee16e6dd0524372eb7d885ec6e470fcdd16 /src/core
parentMerge pull request #250 from Nick007J/master (diff)
downloadre3-9d4140734f5b49d743d3312971e8e1b8c81d9453.tar
re3-9d4140734f5b49d743d3312971e8e1b8c81d9453.tar.gz
re3-9d4140734f5b49d743d3312971e8e1b8c81d9453.tar.bz2
re3-9d4140734f5b49d743d3312971e8e1b8c81d9453.tar.lz
re3-9d4140734f5b49d743d3312971e8e1b8c81d9453.tar.xz
re3-9d4140734f5b49d743d3312971e8e1b8c81d9453.tar.zst
re3-9d4140734f5b49d743d3312971e8e1b8c81d9453.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/CutsceneMgr.cpp3
-rw-r--r--src/core/CutsceneMgr.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp
index b446cd5d..95abfcc9 100644
--- a/src/core/CutsceneMgr.cpp
+++ b/src/core/CutsceneMgr.cpp
@@ -107,8 +107,7 @@ const struct {
int
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))
return musicNameIdAssoc[i].iTrackId;
}
diff --git a/src/core/CutsceneMgr.h b/src/core/CutsceneMgr.h
index 7215a123..8c4a918b 100644
--- a/src/core/CutsceneMgr.h
+++ b/src/core/CutsceneMgr.h
@@ -21,10 +21,10 @@ class CCutsceneMgr
static CAnimBlendAssocGroup &ms_cutsceneAssociations;
static CVector &ms_cutsceneOffset;
static float &ms_cutsceneTimer;
+ static bool &ms_cutsceneProcessing;
public:
static CDirectory *&ms_pCutsceneDir;
static uint32 &ms_cutsceneLoadStatus;
- static bool &ms_cutsceneProcessing;
static bool IsRunning(void) { return ms_running; }
static bool IsCutsceneProcessing(void) { return ms_cutsceneProcessing; }