Mercurial > mm7

comparison Indoor.cpp @ 1178:f7ad7bd0a806

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 04 Jun 2013 09:44:53 +0600
parents 29a8defbad9e
children 15ad868d972f
comparison
equal deleted inserted replaced
1177:ce5ff6d32200 1178:f7ad7bd0a806
1 #ifdef _MSC_VER
2 #define _CRT_SECURE_NO_WARNINGS
3 #endif
4
1 #include <assert.h> 5 #include <assert.h>
2 6
3 #include "LightmapBuilder.h" 7 #include "LightmapBuilder.h"
4 #include "DecalBuilder.h" 8 #include "DecalBuilder.h"
5 #include "ParticleEngine.h" 9 #include "ParticleEngine.h"
1720 { 1724 {
1721 const char *v1; // edi@1 1725 const char *v1; // edi@1
1722 signed int v2; // esi@1 1726 signed int v2; // esi@1
1723 1727
1724 for (uint i = 0; i < 11; ++i) 1728 for (uint i = 0; i < 11; ++i)
1725 if (!strcmpi(Str1, _4E6BDC_loc_names[i])) 1729 if (!_stricmp(Str1, _4E6BDC_loc_names[i]))
1726 return i + 1; 1730 return i + 1;
1727 return 0; 1731 return 0;
1728 } 1732 }
1729 1733
1730 1734
2779 } 2783 }
2780 2784
2781 if (dword_6BE364_game_settings_1 & 0x2000 ) 2785 if (dword_6BE364_game_settings_1 & 0x2000 )
2782 _i = 29030400; 2786 _i = 29030400;
2783 bool _a = false; 2787 bool _a = false;
2784 if ( a3 - dlv.uLastRepawnDay >= _i && strcmpi(pCurrentMapName, "d29.dlv") ) 2788 if ( a3 - dlv.uLastRepawnDay >= _i && _stricmp(pCurrentMapName, "d29.dlv") )
2785 _a = true; 2789 _a = true;
2786 2790
2787 //v154 = 875; 2791 //v154 = 875;
2788 if (_v244) 2792 if (_v244)
2789 { 2793 {