Mercurial > mm7
comparison mm7_6.cpp @ 57:8af333180755
Слияние
author | Ritor1 |
---|---|
date | Mon, 21 Jan 2013 20:22:10 +0600 |
parents | 2bcc7b24c831 |
children | 6ad816231528 |
comparison
equal
deleted
inserted
replaced
56:7082a3f95e7c | 57:8af333180755 |
---|---|
7854 int v33; // [sp+34h] [bp-8h]@7 | 7854 int v33; // [sp+34h] [bp-8h]@7 |
7855 int v34; // [sp+38h] [bp-4h]@17 | 7855 int v34; // [sp+38h] [bp-4h]@17 |
7856 | 7856 |
7857 v0 = uActiveCharacter; | 7857 v0 = uActiveCharacter; |
7858 v27 = 6972 * uActiveCharacter; | 7858 v27 = 6972 * uActiveCharacter; |
7859 v1 = (Player *)&stru_AA1058[3].pSounds[6972 * uActiveCharacter + 40552]; | 7859 v1 = &pParty->pPlayers[uActiveCharacter-1];//(Player *)&stru_AA1058[3].pSounds[6972 * uActiveCharacter + 40552]; |
7860 result = ((Player *)&stru_AA1058[3].pSounds[6972 * uActiveCharacter + 40552])->CanAct(); | 7860 result = pParty->pPlayers[uActiveCharacter-1].CanAct();//((Player *)&stru_AA1058[3].pSounds[6972 * uActiveCharacter + 40552])->CanAct(); |
7861 if ( result ) | 7861 if ( result ) |
7862 { | 7862 { |
7863 pStru277->_427D48(v0); | 7863 pStru277->_427D48(v0); |
7864 v3 = 0; | 7864 v3 = 0; |
7865 if ( (signed __int64)pParty->pPartyBuffs[11].uExpireTime > 0 ) | 7865 if ( (signed __int64)pParty->pPartyBuffs[11].uExpireTime > 0 ) |