Mercurial > mm7

diff Indoor.cpp @ 2064:74f06d8a8017

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Mon, 02 Dec 2013 20:43:28 +0600
parents b2a434d65344
children 259df09dfb50 24033aa2e1f8 52abdea20b9e
line wrap: on
line diff
--- a/Indoor.cpp	Mon Dec 02 20:42:46 2013 +0600
+++ b/Indoor.cpp	Mon Dec 02 20:43:28 2013 +0600
@@ -2138,8 +2138,8 @@
     }
   }
 
-  if (dword_6BE364_game_settings_1 & 0x2000 )
-    _i = 29030400;
+  if (dword_6BE364_game_settings_1 & GAME_SETTINGS_2000 )
+    _i = 0x1BAF800;
   bool _a = false;
   if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName, "d29.dlv") )
     _a = true;
@@ -3697,12 +3697,12 @@
     Error("Attempt to open new level before clearing old");
   if ( v6 == 1 )
     Error("Out of memory loading indoor level");
-  if ( !(dword_6BE364_game_settings_1 & 0x2000) )
+  if ( !(dword_6BE364_game_settings_1 & GAME_SETTINGS_2000) )
   {
     InitializeActors();
     InitializeSpriteObjects();
   }
-  BYTE1(dword_6BE364_game_settings_1) &= 0xDFu;
+  dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_2000;
   if ( !v39 )
     pDest = 0;
   if ( pDest == 1 )