Mercurial > mm7
diff mm7_4.cpp @ 1424:5930342f092b
fall to the water
author | Ritor1 |
---|---|
date | Tue, 30 Jul 2013 15:14:46 +0600 |
parents | 9a1adf08f4ed |
children | dfc9484ed94c |
line wrap: on
line diff
--- a/mm7_4.cpp Tue Jul 30 09:34:14 2013 +0600 +++ b/mm7_4.cpp Tue Jul 30 15:14:46 2013 +0600 @@ -1108,9 +1108,9 @@ //void *v10; // esi@25 unsigned int v11; // ecx@27 signed int v12; // edi@29 - Player *v13; // ecx@30 - Player *v14; // esi@35 - double v15; // st7@35 + //Player *v13; // ecx@30 + //Player *v14; // esi@35 + //double v15; // st7@35 Player **v16; // esi@43 Player *v17; // edi@44 double v18; // st7@44 @@ -1153,7 +1153,7 @@ //unsigned int v55; // [sp-8h] [bp-38h]@18 unsigned int v56; // [sp-8h] [bp-38h]@55 //int v57; // [sp-4h] [bp-34h]@18 - int v58; // [sp-4h] [bp-34h]@33 + //int v58; // [sp-4h] [bp-34h]@33 int v59; // [sp-4h] [bp-34h]@55 //unsigned int v60; // [sp+10h] [bp-20h]@1 unsigned int v61; // [sp+14h] [bp-1Ch]@1 @@ -1223,28 +1223,29 @@ } v11 = LODWORD(pParty->uTimePlayed); - if ( pParty->uFlags & 4 && pParty->field_6FC < (signed __int64)pParty->uTimePlayed ) + if ( pParty->uFlags & 4 && pParty->field_6FC < (signed __int64)pParty->uTimePlayed )//water damage error { - v12 = 1; + //v12 = 1; pParty->field_6FC = LODWORD(pParty->uTimePlayed) + 128; viewparams->bRedrawGameUI = 1; - while ( 1 ) + //while ( 1 ) + for ( v12 = 1; v12 <= 4; ++v12 ) { if ( pPlayers[v12]->WearsItem(ITEM_RELIC_HARECS_LEATHER, EQUIP_ARMOUR) || pPlayers[v12]->HasEnchantedItemEquipped(71) || pPlayers[v12]->pPlayerBuffs[23].uExpireTime > 0 ) { - v58 = 0; - v13->PlayEmotion(CHARACTER_EXPRESSION_37, v58); + //v58 = 0; + pPlayers[v12]->PlayEmotion(CHARACTER_EXPRESSION_37, 0); } else { - v58 = 0; + //v58 = 0; if ( !sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(v12) ) { - v14 = pPlayers[v12]; - v15 = (double)pPlayers[v12]->GetMaxHealth() * 0.1; - v14->ReceiveDamage((signed __int64)v15, DMGT_FIRE); + //v14 = pPlayers[v12]; + //v15 = (double)pPlayers[v12]->GetMaxHealth() * 0.1; + pPlayers[v12]->ReceiveDamage((signed __int64)pPlayers[v12]->GetMaxHealth() * 0.1, DMGT_FIRE); if ( pParty->uFlags & 4 ) { strcpy(GameUI_Footer_TimedString.data(), pGlobalTXT_LocalizationStrings[660]); @@ -1252,18 +1253,16 @@ } } else - { - v13 = pPlayers[v12]; - v13->PlayEmotion(CHARACTER_EXPRESSION_37, v58); - } + pPlayers[v12]->PlayEmotion(CHARACTER_EXPRESSION_37, 0); } - ++v12; - if ( v12 > 4 ) - { - v11 = LODWORD(pParty->uTimePlayed); - break; + //++v12; + //if ( v12 > 4 ) + //{ + //v11 = LODWORD(pParty->uTimePlayed); + //break; } - } + v11 = LODWORD(pParty->uTimePlayed); + //} } if ( pParty->uFlags & 0x200 && pParty->field_6FC < (signed __int64)__PAIR__(HIDWORD(pParty->uTimePlayed), v11) ) {