Mercurial > mm7

comparison mm7_4.cpp @ 2451:0eb0826e18b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 25 Jul 2014 14:19:14 +0600
parents 7948957d9178
children 0f17a30149ec
comparison
equal deleted inserted replaced
2450:90349b8048a5 2451:0eb0826e18b3
211 { 211 {
212 int current_time; // edi@1 212 int current_time; // edi@1
213 int last_reg_time; // qax@1 213 int last_reg_time; // qax@1
214 int v4; // eax@2 214 int v4; // eax@2
215 int v5; // edi@5 215 int v5; // edi@5
216 bool cursed_flag; // ecx@5 216 long long *v6; // ecx@5
217 char v7; // sf@5 217 char v7; // sf@5
218 int *v8; // ecx@10 218 int *v8; // ecx@10
219 int v9; // edi@15 219 int v9; // edi@15
220 signed int v10; // eax@15 220 signed int v10; // eax@15
221 // __int16 *v11; // edx@16 221 // __int16 *v11; // edx@16
256 if ( pParty->bFlying ) 256 if ( pParty->bFlying )
257 { 257 {
258 if ( !(pParty->pPartyBuffs[PARTY_BUFF_FLY].uFlags & 1) ) 258 if ( !(pParty->pPartyBuffs[PARTY_BUFF_FLY].uFlags & 1) )
259 { 259 {
260 v5 = v4 * pParty->pPartyBuffs[PARTY_BUFF_FLY].uPower; 260 v5 = v4 * pParty->pPartyBuffs[PARTY_BUFF_FLY].uPower;
261 cursed_flag = pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_FLY].uCaster - 1].pConditions[Condition_Cursed];//cursed 261 //cursed_flag = pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_FLY].uCaster - 1].pConditions[Condition_Cursed];//cursed
262 v7 = cursed_flag < v5; 262 //v7 = cursed_flag < v5;
263 //cursed_flag -= v5; 263 //cursed_flag -= v5;
264 if ( !v7 ) 264
265 v6 = &pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_FLY].uCaster - 1].pConditions[Condition_Cursed];
266
267 if ( *v6 < v5 )
265 { 268 {
269 v6 = 0;
266 pParty->uFlags &= 0xFFFFFFBFu; 270 pParty->uFlags &= 0xFFFFFFBFu;
267 pParty->bFlying = false; 271 pParty->bFlying = false;
268 redraw_flag = true; 272 redraw_flag = true;
269 } 273 }
270 } 274 }