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/control/Replay.h
+++ b/src/control/Replay.h
@@ -3,7 +3,9 @@
 class CReplay
 {
 public:
-	static void Display(void);
+	enum {
+		MODE_1
+	};

 	static uint8 &Mode;
 	static Bool &bPlayingBackFromFile;