Mercurial > mm7
diff mm7_2.cpp @ 220:125354fe1b9f
Слияние
author | Ritor1 |
---|---|
date | Sun, 17 Feb 2013 08:51:02 +0600 |
parents | 0c64754c7fd4 |
children | c879446b4a22 0df4136b6aac |
line wrap: on
line diff
--- a/mm7_2.cpp Sun Feb 17 08:50:45 2013 +0600 +++ b/mm7_2.cpp Sun Feb 17 08:51:02 2013 +0600 @@ -4599,7 +4599,7 @@ memcpy(&v0->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * v25 + 5], v20, 0x24u); goto LABEL_42; } - v0->PlaySound(SPEECH_15, 0); + v0->PlaySound(SPEECH_NoRoom, 0); v54 = 5; LABEL_70: v9 = pGlobalTXT_LocalizationStrings[563]; // "Pack is Full!" @@ -4694,7 +4694,7 @@ v27->PlaySound((PlayerSpeech)v51, v53); return; } - v0->PlaySound(SPEECH_15, 0); + v0->PlaySound(SPEECH_NoRoom, 0); v54 = 2; goto LABEL_70; } @@ -13028,6 +13028,9 @@ } } + + + //----- (004651F4) -------------------------------------------------------- bool MM7_Initialize() { @@ -13047,7 +13050,6 @@ } - srand(GetTickCount()); /*GetDiskFreeSpaceA(0, &SectorsPerCluster, &BytesPerSector, &hdc, &TotalNumberOfClusters); v4 = hdc * BytesPerSector * SectorsPerCluster; @@ -13535,19 +13537,6 @@ sprintf(pTmpBuf, "data\\lloyd%d%d.pcx", i, j); remove(pTmpBuf); } - /*do - { - v11 = 1; - do - { - sprintfex(pTmpBuf, "data\\lloyd%d%d.pcx", v10, v11); - remove(pTmpBuf); - ++v11; - } - while ( v11 < 6 ); - ++v10; - } - while ( v10 < 5 );*/ Initialize_GamesLOD_NewLOD(); dword_576E2C = 512;