Mercurial > mm7

comparison Indoor.cpp @ 2067:2e08496c40c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 03 Dec 2013 09:22:28 +0600
parents b2a434d65344
children 259df09dfb50 24033aa2e1f8 52abdea20b9e
comparison
equal deleted inserted replaced
2066:f7e5b9f236ae 2067:2e08496c40c2
2136 dlv.uNumDecorations != uNumLevelDecorations) 2136 dlv.uNumDecorations != uNumLevelDecorations)
2137 _v244 = true; 2137 _v244 = true;
2138 } 2138 }
2139 } 2139 }
2140 2140
2141 if (dword_6BE364_game_settings_1 & 0x2000 ) 2141 if (dword_6BE364_game_settings_1 & GAME_SETTINGS_2000 )
2142 _i = 29030400; 2142 _i = 0x1BAF800;
2143 bool _a = false; 2143 bool _a = false;
2144 if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName, "d29.dlv") ) 2144 if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName, "d29.dlv") )
2145 _a = true; 2145 _a = true;
2146 2146
2147 //v154 = 875; 2147 //v154 = 875;
3695 v6 = v5 - 1; 3695 v6 = v5 - 1;
3696 if ( !v6 ) 3696 if ( !v6 )
3697 Error("Attempt to open new level before clearing old"); 3697 Error("Attempt to open new level before clearing old");
3698 if ( v6 == 1 ) 3698 if ( v6 == 1 )
3699 Error("Out of memory loading indoor level"); 3699 Error("Out of memory loading indoor level");
3700 if ( !(dword_6BE364_game_settings_1 & 0x2000) ) 3700 if ( !(dword_6BE364_game_settings_1 & GAME_SETTINGS_2000) )
3701 { 3701 {
3702 InitializeActors(); 3702 InitializeActors();
3703 InitializeSpriteObjects(); 3703 InitializeSpriteObjects();
3704 } 3704 }
3705 BYTE1(dword_6BE364_game_settings_1) &= 0xDFu; 3705 dword_6BE364_game_settings_1 &= ~GAME_SETTINGS_2000;
3706 if ( !v39 ) 3706 if ( !v39 )
3707 pDest = 0; 3707 pDest = 0;
3708 if ( pDest == 1 ) 3708 if ( pDest == 1 )
3709 { 3709 {
3710 v7 = 0; 3710 v7 = 0;