Mercurial > mm7

comparison mm7_4.cpp @ 1337:c6695ebd8fe6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 04 Jul 2013 09:21:57 +0600
parents 3358b59b8fe8 f0be1fecd642
children 8bfdc44cebfd
comparison
equal deleted inserted replaced
1336:3358b59b8fe8 1337:c6695ebd8fe6
6278 6278
6279 //----- (00405CFF) -------------------------------------------------------- 6279 //----- (00405CFF) --------------------------------------------------------
6280 void stru262_TurnBased::End(bool bPlaySound) 6280 void stru262_TurnBased::End(bool bPlaySound)
6281 { 6281 {
6282 stru262_TurnBased *v2; // edi@1 6282 stru262_TurnBased *v2; // edi@1
6283 int v3; // ebx@1
6284 int v4; // esi@1 6283 int v4; // esi@1
6285 unsigned __int8 v5; // zf@1 6284 unsigned __int8 v5; // zf@1
6286 unsigned __int8 v6; // sf@1 6285 unsigned __int8 v6; // sf@1
6287 TurnBased_QueueElem *v7; // ecx@2 6286 TurnBased_QueueElem *v7; // ecx@2
6288 unsigned __int16 *pAttributes; // ecx@7 6287 unsigned __int16 *pAttributes; // ecx@7
6292 ObjectType objType; // eax@13 6291 ObjectType objType; // eax@13
6293 int objID; // esi@13 6292 int objID; // esi@13
6294 int v14; // [sp+Ch] [bp-4h]@11 6293 int v14; // [sp+Ch] [bp-4h]@11
6295 6294
6296 v2 = this; 6295 v2 = this;
6297 v3 = 0;
6298 v4 = 0; 6296 v4 = 0;
6299 v5 = this->uActorQueueSize == 0; 6297 v5 = this->uActorQueueSize == 0;
6300 v6 = this->uActorQueueSize < 0; 6298 v6 = this->uActorQueueSize < 0;
6301 this->field_4 = 0; 6299 this->field_4 = 0;
6302 if ( !(v6 | v5) ) 6300 if ( !(v6 | v5) )
6309 ++v4; 6307 ++v4;
6310 ++v7; 6308 ++v7;
6311 } 6309 }
6312 while ( v4 < v2->uActorQueueSize ); 6310 while ( v4 < v2->uActorQueueSize );
6313 } 6311 }
6312
6314 if ( (signed int)uNumSpriteObjects > 0 ) 6313 if ( (signed int)uNumSpriteObjects > 0 )
6315 { 6314 {
6316 pAttributes = &pSpriteObjects[0].uAttributes; 6315 pAttributes = &pSpriteObjects[0].uAttributes;
6317 v9 = uNumSpriteObjects; 6316 v9 = uNumSpriteObjects;
6318 do 6317 do
6326 pAttributes += 56; 6325 pAttributes += 56;
6327 --v9; 6326 --v9;
6328 } 6327 }
6329 while ( v9 ); 6328 while ( v9 );
6330 } 6329 }
6330
6331 v14 = 0; 6331 v14 = 0;
6332 if ( v2->uActorQueueSize > 0 ) 6332 if ( v2->uActorQueueSize > 0 )
6333 { 6333 {
6334 v11 = v2->pQueue; 6334 v11 = v2->pQueue;
6335 do 6335 do
6347 } 6347 }
6348 ++v14; 6348 ++v14;
6349 ++v11; 6349 ++v11;
6350 } 6350 }
6351 while ( v14 < v2->uActorQueueSize ); 6351 while ( v14 < v2->uActorQueueSize );
6352 v3 = 0; 6352 }
6353 } 6353
6354 pAudioPlayer->StopChannels(-1, -1); 6354 pAudioPlayer->StopChannels(-1, -1);
6355 if ( bPlaySound != v3 ) 6355 if ( bPlaySound != 0 )
6356 pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|SOUND_EnteringAHouse), v3, v3, -1, v3, v3, v3, v3); 6356 pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|SOUND_EnteringAHouse), 0, 0, -1, 0, 0, 0, 0);
6357 pTurnEngine->field_18 &= 0xFFFFFFFDu; 6357 pTurnEngine->field_18 &= 0xFFFFFFFDu;
6358 pEventTimer->StopGameTime(); 6358 pEventTimer->StopGameTime();
6359 dword_50C994 = v3; 6359 dword_50C994 = 0;
6360 dword_50C998_turnbased_icon_1A = v3; 6360 dword_50C998_turnbased_icon_1A = 0;
6361 } 6361 }
6362 // 50C994: using guessed type int dword_50C994; 6362 // 50C994: using guessed type int dword_50C994;
6363 // 50C998: using guessed type int dword_50C998_turnbased_icon_1A; 6363 // 50C998: using guessed type int dword_50C998_turnbased_icon_1A;
6364 6364
6365 //----- (00405E14) -------------------------------------------------------- 6365 //----- (00405E14) --------------------------------------------------------