Mercurial > mm7
diff mm7_4.cpp @ 1331:f0be1fecd642
turn_based start fixed
author | Gloval |
---|---|
date | Wed, 03 Jul 2013 23:21:29 +0400 |
parents | ae435824ac4d |
children | 1e35cfed7928 c6695ebd8fe6 |
line wrap: on
line diff
--- a/mm7_4.cpp Wed Jul 03 01:06:41 2013 +0400 +++ b/mm7_4.cpp Wed Jul 03 23:21:29 2013 +0400 @@ -6280,7 +6280,6 @@ void stru262_TurnBased::End(bool bPlaySound) { stru262_TurnBased *v2; // edi@1 - int v3; // ebx@1 int v4; // esi@1 unsigned __int8 v5; // zf@1 unsigned __int8 v6; // sf@1 @@ -6294,7 +6293,6 @@ int v14; // [sp+Ch] [bp-4h]@11 v2 = this; - v3 = 0; v4 = 0; v5 = this->uActorQueueSize == 0; v6 = this->uActorQueueSize < 0; @@ -6311,6 +6309,7 @@ } while ( v4 < v2->uActorQueueSize ); } + if ( (signed int)uNumSpriteObjects > 0 ) { pAttributes = &pSpriteObjects[0].uAttributes; @@ -6328,6 +6327,7 @@ } while ( v9 ); } + v14 = 0; if ( v2->uActorQueueSize > 0 ) { @@ -6349,15 +6349,15 @@ ++v11; } while ( v14 < v2->uActorQueueSize ); - v3 = 0; } + pAudioPlayer->StopChannels(-1, -1); - if ( bPlaySound != v3 ) - pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|SOUND_EnteringAHouse), v3, v3, -1, v3, v3, v3, v3); + if ( bPlaySound != 0 ) + pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|SOUND_EnteringAHouse), 0, 0, -1, 0, 0, 0, 0); pTurnEngine->field_18 &= 0xFFFFFFFDu; pEventTimer->StopGameTime(); - dword_50C994 = v3; - dword_50C998_turnbased_icon_1A = v3; + dword_50C994 = 0; + dword_50C998_turnbased_icon_1A = 0; } // 50C994: using guessed type int dword_50C994; // 50C998: using guessed type int dword_50C998_turnbased_icon_1A;