Mercurial > mm7
diff Actor.cpp @ 1890:eafc12a77a92
fixing buildability
author | Grumpy7 |
---|---|
date | Sat, 19 Oct 2013 23:08:02 -0700 |
parents | 397059718a9a |
children | ecab40f41fe8 |
line wrap: on
line diff
--- a/Actor.cpp Sat Oct 19 21:26:31 2013 -0700 +++ b/Actor.cpp Sat Oct 19 23:08:02 2013 -0700 @@ -2380,7 +2380,6 @@ int v16; // ebx@45 int v17; // eax@45 //int v18; // eax@51 - int v12; // [sp+Ch] [bp-24h]@16 //int *v20; // [sp+10h] [bp-20h]@1 signed int v21; // [sp+14h] [bp-1Ch]@1 //unsigned int v22; // [sp+18h] [bp-18h]@1 @@ -2510,6 +2509,14 @@ unsigned int v9; // edx@25 unsigned int v10; // edx@33 + if ( otherActPtr && this) + { + v5 = otherActPtr->uGroup; + v6 = this->uGroup; + if ( v5 != 0 && v6 != 0 && v5 == v6 ) + return 0; + } + if ( this ) { if (this->pActorBuffs[ACTOR_BUFF_BERSERK].uExpireTime > 0) @@ -2530,13 +2537,6 @@ { v4 = 0; } - if ( otherActPtr && this) - { - v5 = otherActPtr->uGroup; - v6 = this->uGroup; - if ( v5 != 0 && v6 != 0 && v5 == v6 ) - return 0; - } if ( v3 ) v7 = (v3 - 1) / 3 + 1; else