Mercurial > mm7

comparison Actor.cpp @ 1890:eafc12a77a92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixing buildability
author Grumpy7
date Sat, 19 Oct 2013 23:08:02 -0700
parents 397059718a9a
children ecab40f41fe8
comparison
equal deleted inserted replaced
1889:397059718a9a 1890:eafc12a77a92
2378 signed int v14; // eax@31 2378 signed int v14; // eax@31
2379 int v15; // edi@43 2379 int v15; // edi@43
2380 int v16; // ebx@45 2380 int v16; // ebx@45
2381 int v17; // eax@45 2381 int v17; // eax@45
2382 //int v18; // eax@51 2382 //int v18; // eax@51
2383 int v12; // [sp+Ch] [bp-24h]@16
2384 //int *v20; // [sp+10h] [bp-20h]@1 2383 //int *v20; // [sp+10h] [bp-20h]@1
2385 signed int v21; // [sp+14h] [bp-1Ch]@1 2384 signed int v21; // [sp+14h] [bp-1Ch]@1
2386 //unsigned int v22; // [sp+18h] [bp-18h]@1 2385 //unsigned int v22; // [sp+18h] [bp-18h]@1
2387 int v23; // [sp+1Ch] [bp-14h]@16 2386 int v23; // [sp+1Ch] [bp-14h]@16
2388 //unsigned int v24; // [sp+20h] [bp-10h]@1 2387 //unsigned int v24; // [sp+20h] [bp-10h]@1
2508 unsigned int v7; // ebp@19 2507 unsigned int v7; // ebp@19
2509 int v8; // eax@22 2508 int v8; // eax@22
2510 unsigned int v9; // edx@25 2509 unsigned int v9; // edx@25
2511 unsigned int v10; // edx@33 2510 unsigned int v10; // edx@33
2512 2511
2513 if ( this )
2514 {
2515 if (this->pActorBuffs[ACTOR_BUFF_BERSERK].uExpireTime > 0)
2516 return 4;
2517 v3 = this->pMonsterInfo.uID;
2518 }
2519 else
2520 {
2521 v3 = 0;
2522 }
2523 if ( otherActPtr )
2524 {
2525 if (otherActPtr->pActorBuffs[ACTOR_BUFF_BERSERK].uExpireTime > 0)
2526 return 4;
2527 v4 = otherActPtr->pMonsterInfo.uID;
2528 }
2529 else
2530 {
2531 v4 = 0;
2532 }
2533 if ( otherActPtr && this) 2512 if ( otherActPtr && this)
2534 { 2513 {
2535 v5 = otherActPtr->uGroup; 2514 v5 = otherActPtr->uGroup;
2536 v6 = this->uGroup; 2515 v6 = this->uGroup;
2537 if ( v5 != 0 && v6 != 0 && v5 == v6 ) 2516 if ( v5 != 0 && v6 != 0 && v5 == v6 )
2538 return 0; 2517 return 0;
2518 }
2519
2520 if ( this )
2521 {
2522 if (this->pActorBuffs[ACTOR_BUFF_BERSERK].uExpireTime > 0)
2523 return 4;
2524 v3 = this->pMonsterInfo.uID;
2525 }
2526 else
2527 {
2528 v3 = 0;
2529 }
2530 if ( otherActPtr )
2531 {
2532 if (otherActPtr->pActorBuffs[ACTOR_BUFF_BERSERK].uExpireTime > 0)
2533 return 4;
2534 v4 = otherActPtr->pMonsterInfo.uID;
2535 }
2536 else
2537 {
2538 v4 = 0;
2539 } 2539 }
2540 if ( v3 ) 2540 if ( v3 )
2541 v7 = (v3 - 1) / 3 + 1; 2541 v7 = (v3 - 1) / 3 + 1;
2542 else 2542 else
2543 v7 = 0; 2543 v7 = 0;