Merge branch 'master' of github.com:Fire-Head/re3

# Conflicts: # src/control/Replay.h
2019-06-13 03:40:46 +03:00
parent 75bca8e31e 38730080a2
commit 06e48c7059
17 changed files with 404 additions and 58 deletions
--- a/src/CutsceneMgr.h
+++ b/src/CutsceneMgr.h
@@ -2,9 +2,11 @@

 class CCutsceneMgr
 {
+	static bool &ms_running;
 	static bool &ms_cutsceneProcessing;
 	
 public:
+	static bool IsRunning(void) { return ms_running; }
 	static bool IsCutsceneProcessing(void) { return ms_cutsceneProcessing; }
 	
 	static Bool &ms_running;