Mercurial > might-and-magic-trilogy
diff Indoor.cpp @ 105:e633cde38d64
Слияние
author | Ritor1 |
---|---|
date | Fri, 02 Nov 2012 10:04:27 +0600 |
parents | 8c6308bb19b3 |
children | b5e26a133fae 51a5b0dc3f30 |
line wrap: on
line diff
--- a/Indoor.cpp Fri Nov 02 10:04:08 2012 +0600 +++ b/Indoor.cpp Fri Nov 02 10:04:27 2012 +0600 @@ -2026,7 +2026,7 @@ //v5 = 0; //v6 = this; - _6807E0_num_decorations_6807B8 = 0; + pNumSoundDecorations = 0; #pragma region "loading from txt" /*sprintf(FileName, "levels\\%s", pFilename); @@ -4445,9 +4445,9 @@ } if ( !_strcmpi(pCurrentMapName, "out15.odm") || !_strcmpi(pCurrentMapName, "d23.blv") ) bNoNPCHiring = 1; - pPaletteManager->field_267AD3 = 0; - pPaletteManager->field_267AD4 = 0; - pPaletteManager->field_267AD5 = 0; + pPaletteManager->pPalette_tintColor[0] = 0; + pPaletteManager->pPalette_tintColor[1] = 0; + pPaletteManager->pPalette_tintColor[2] = 0; pPaletteManager->RecalculateAll(); if ( qword_A750D8 ) qword_A750D8 = 0i64; @@ -4610,10 +4610,10 @@ pDecorationList->InitializeDecorationSprite(pDecortaion->uDecorationDescID); v15 = pDecorationList->pDecorations[pDecortaion->uDecorationDescID].uSoundID; - if (v15 && _6807E0_num_decorations_6807B8 < 9) + if (v15 && pNumSoundDecorations < 9) { pSoundList->_4A9A67(v15, 0); - v16 = _6807E0_num_decorations_6807B8++; + v16 = pNumSoundDecorations++; _6807B8_level_decorations_ids[v16] = i; }