Mercurial > mm7
diff mm7_2.cpp @ 1225:42b41aaecd87
Слияние
author | Ritor1 |
---|---|
date | Wed, 05 Jun 2013 21:00:45 +0600 |
parents | 15ad868d972f |
children | 2b950844f2d6 0dbf6c4dd029 |
line wrap: on
line diff
--- a/mm7_2.cpp Wed Jun 05 21:00:11 2013 +0600 +++ b/mm7_2.cpp Wed Jun 05 21:00:45 2013 +0600 @@ -1,3 +1,7 @@ +#ifdef _MSC_VER +#define _CRT_SECURE_NO_WARNINGS +#endif + #include <io.h> #include <direct.h> #include <assert.h> @@ -145,8 +149,8 @@ return 0; } v20 = pOtherOverlayList->_4418B1(10005, 201, 0, 65536); - pParty->pPartyBuffs[18].Apply(pParty->uTimePlayed + 46080, 3u, 0, v20, 0); - pParty->pPartyBuffs[18].uFlags |= 1u; + pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].Apply(pParty->uTimePlayed + 46080, 3u, 0, v20, 0); + pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uFlags |= 1u; v31 = 0; v29 = 0; v27 = 0; @@ -176,8 +180,8 @@ else { v19 = pOtherOverlayList->_4418B1(10008, 203, 0, 65536); - pParty->pPartyBuffs[7].Apply(pParty->uTimePlayed + 30720, 3u, 1u, v19, 0); - pParty->pPartyBuffs[7].uFlags |= 1u; + pParty->pPartyBuffs[PARTY_BUFF_FLY].Apply(pParty->uTimePlayed + 30720, 3u, 1u, v19, 0); + pParty->pPartyBuffs[PARTY_BUFF_FLY].uFlags |= 1u; v31 = 0; v29 = 0; v27 = 0; @@ -4257,7 +4261,7 @@ assert(uNumMaps >= 2); for (uint i = 1; i < uNumMaps; ++i) - if (!strcmpi(pInfos[i].pFilename, Str2)) + if (!_stricmp(pInfos[i].pFilename, Str2)) return (MAP_TYPE)i; assert(false && "Map not found!"); @@ -5670,7 +5674,7 @@ struct tagPAINTSTRUCT Paint; // [sp+24h] [bp-48h]@13 int pXY[2]; // [sp+64h] [bp-8h]@261 int a2; // [sp+7Ch] [bp+10h]@50 - + switch (Msg) { case WM_SETTEXT: return DefWindowProcW(hWnd, Msg, wParam, lParam); @@ -7099,7 +7103,7 @@ wchar_t pMagicPath[1024]; - swprintf(pMagicPath, L"%C:\\anims\\magic7.vid", c); + swprintf(pMagicPath, wcslen(L"%C:\\anims\\magic7.vid"), L"%C:\\anims\\magic7.vid", c); if (GetFileAttributesW(pMagicPath) == -1) return false;