Merge remote-tracking branch 'upstream/miami' into miami

2020-05-05 20:22:17 +03:00
parent 918d6dbf56 7428590457
commit f45ea0a1cf
45 changed files with 112 additions and 2023 deletions
--- a/src/core/Game.h
+++ b/src/core/Game.h
@@ -35,9 +35,7 @@ class CGame
 {
 public:
 	static eLevelName currLevel;
-#ifdef MIAMI
 	static int32 currArea;
-#endif
 	static bool bDemoMode;
 	static bool nastyGame;
 	static bool frenchGame;