mm7: Actor.cpp comparison

comparison Actor.cpp @ 322:ce39b96acf5c

Killing friendly peasants subs

author	Nomad
date	Wed, 20 Feb 2013 04:36:14 +0200
parents	15decc249a94
children	d720a13e2273

comparison

equal deleted inserted replaced

-:15decc249a94
+:ce39b96acf5c
+#include <assert.h>
 #include "Actor.h"
 #include "LayingItem.h"
 #include "Math.h"
 #include "Party.h"
 #include "Outdoor.h"
 }
 }
 //----- (0043ABB0) --------------------------------------------------------
-bool Actor::_43ABB0(Actor *a1, Actor *a2)
+bool Actor::ArePeasantsOfSameFaction(Actor *a1, Actor *a2)
 {
 unsigned int v2; // esi@1
 unsigned int v3; // edi@1
 bool result; // eax@9
 result = v2 == v3;
 return result;
 }
 //----- (0043AC45) --------------------------------------------------------
-void Actor::_43AC45(unsigned int uActorID, int a2)
+void Actor::AggroSurroundingPeasants(unsigned int uActorID, int a2)
 {
-Actor *v2; // esi@1
-Actor *v3; // edi@4
 int v4; // ebx@8
 int v5; // ST1C_4@8
 int v6; // eax@8
-int v7; // [sp+4h] [bp-10h]@1
-unsigned int uActorID_; // [sp+Ch] [bp-8h]@1
+auto victim = pActors + uActorID;
-signed int v9; // [sp+10h] [bp-4h]@3
-uActorID_ = uActorID;
-v2 = &pActors[uActorID];
-v7 = a2;
 if ( a2 == 1 )
-BYTE2(v2->uAttributes) |= 8u;
+BYTE2(victim->uAttributes) |= 8u;
-v9 = 0;
-if ( (signed int)uNumActors > 0 )
+for (uint i = 0; i < uNumActors; ++i)
 {
-v3 = pActors;
+auto actor = pActors + i;
-do
+if (!actor->CanAct() || i == uActorID)
-{
+continue;
-if ( v3->CanAct() )
-{
+if (Actor::ArePeasantsOfSameFaction(victim, actor))
-if ( v9 != uActorID_ )
+{
-{
+v4 = abs(actor->vPosition.x - victim->vPosition.x);
-if ( Actor::_43ABB0(v2, v3) )
+v5 = abs(actor->vPosition.y - victim->vPosition.y);
-{
+v6 = abs(actor->vPosition.z - victim->vPosition.z);
-			v4 = abs(v3->vPosition.x - v2->vPosition.x);
+if (int_get_vector_length(v4, v5, v6) < 4096)
-			v5 = abs(v3->vPosition.y - v2->vPosition.y);
+{
-			v6 = abs(v3->vPosition.z - v2->vPosition.z);
+actor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Long;
-if ( (double)sub_4621DA(v4, v5, v6) < 4096.0 )
+if ( a2 == 1 )
-{
+BYTE2(actor->uAttributes) |= 8u;
-				v3->pMonsterInfo.uHostilityType = (MonsterInfo::HostilityRadius)4;
+}
-if ( v7 == 1 )
+}
-				  BYTE2(v3->uAttributes) |= 8u;
-}
-}
-}
-}
-++v9;
-++v3;
-}
-while ( v9 < (signed int)uNumActors );
 }
 }
 //----- (00404874) --------------------------------------------------------
 return result;
 }
 //----- (00404030) --------------------------------------------------------
-unsigned int __fastcall Actor::FaceObject(unsigned int uActorID, unsigned int uObjID, int _48, AIDirection *a4)
+void Actor::FaceObject(unsigned int uActorID, unsigned int uObjID, int _48, AIDirection *a4)
 {
 unsigned int v4; // edi@1
 unsigned int v5; // esi@1
-unsigned int result; // eax@2
+//unsigned int result; // eax@2
 AIDirection *v7; // eax@3
 unsigned int v8; // ecx@3
 Actor *v9; // ebx@3
 AIDirection *v10; // esi@4
 unsigned __int16 v11; // ax@5
 v9->vVelocity.y = v8;
 v9->vVelocity.x = v8;
 v9->uPitchAngle = v11;
 v9->uCurrentActionLength = 256;
 v9->uAIState = Interacting;
-result = v9->UpdateAnimation();
+v9->UpdateAnimation();
 }
 else
-{
+Actor::_402F87(v5, v4, a4);
-result = Actor::_402F87(v5, v4, a4);
-}
-return result;
 }
 //----- (00403F58) --------------------------------------------------------
-unsigned int __fastcall Actor::_403F58(unsigned int uActorID, signed int uObjID, int uActionLength, AIDirection *a4)
+void Actor::_403F58(unsigned int uActorID, signed int uObjID, int uActionLength, AIDirection *a4)
 {
 unsigned int v4; // esi@1
-unsigned int result; // eax@2
+//unsigned int result; // eax@2
 AIDirection *v6; // eax@3
 unsigned int v7; // edi@3
 Actor *v8; // ebx@3
 AIDirection *v9; // esi@4
 AIDirection a3; // [sp+4h] [bp-3Ch]@4
 a2 = uObjID;
 v4 = uActorID;
 if ( rand() % 2 )
 {
-result = Actor::_402F87(v4, a2, a4);
+Actor::_402F87(v4, a2, a4);
-}
+return;
-else
+}
-{
 v6 = a4;
 v7 = 0;
 v8 = &pActors[v4];
 if ( !a4 )
 {
 v8->uCurrentActionTime = v7;
 v8->uAIState = Standing;
 v8->vVelocity.z = v7;
 v8->vVelocity.y = v7;
 v8->vVelocity.x = v7;
-result = v8->UpdateAnimation();
+v8->UpdateAnimation();
-}
-return result;
 }
 //----- (00403EB6) --------------------------------------------------------
-unsigned int __fastcall Actor::_403EB6(unsigned int uActorID, unsigned int a2, unsigned int uActionLength, AIDirection *a4)
+void Actor::_403EB6(unsigned int uActorID, unsigned int a2, unsigned int uActionLength, AIDirection *a4)
 {
 AIDirection *v4; // eax@1
 unsigned int v5; // esi@1
 Actor *v6; // ebx@1
 AIDirection *v7; // esi@2
 v6->uCurrentActionTime = v5;
 v6->uAIState = Standing;
 v6->vVelocity.z = v5;
 v6->vVelocity.y = v5;
 v6->vVelocity.x = v5;
-return v6->UpdateAnimation();
+v6->UpdateAnimation();
 }
 //----- (00403E61) --------------------------------------------------------
 void __fastcall Actor::StandAwhile(unsigned int uActorID)
 v1->vVelocity.x = 0;
 v1->UpdateAnimation();
 }
 //----- (00403C6C) --------------------------------------------------------
-unsigned int __fastcall Actor::_403C6C(unsigned int uActorID, signed int edx0, struct AIDirection *arg0)
+void Actor::_403C6C(unsigned int uActorID, signed int edx0, struct AIDirection *arg0)
 {
 Actor *v3; // ebx@1
 char v4; // zf@1
-unsigned int result; // eax@3
+//unsigned int result; // eax@3
 AIDirection *v6; // esi@6
 AIDirection *v7; // edi@6
 signed int v8; // eax@7
 double v9; // st7@9
 Vec3_int_ v10; // ST04_12@9
-int v11; // eax@10
+//int v11; // eax@10
 AIDirection *v12; // eax@11
 unsigned int v13; // esi@11
 AIDirection *v14; // esi@12
 SpriteFrame *v15; // ecx@13
 __int16 v16; // ax@13
 a2 = edx0;
 v4 = v3->pMonsterInfo.uMovementType == 5;
 v24 = uActorID;
 if ( v4 && v3->pMonsterInfo.uAIType == 1 )
 {
-result = Actor::_403EB6(uActorID, edx0, 0, arg0);
+Actor::_403EB6(uActorID, edx0, 0, arg0);
-}
+return;
-else
+}
-{
 if ( (edx0 & 7) == OBJECT_Actor)
 {
 v8 = edx0 >> 3;
 v6 = (AIDirection *)pActors[v8].vPosition.x;
 v7 = (AIDirection *)pActors[v8].vPosition.y;
 v23 = (signed __int64)((double)pActors[v8].uActorHeight * 0.75 + (double)pActors[v8].vPosition.z);
 v18 = (signed __int64)(flt_6BE3A8_debug_recmod2 * (double)(signed int)v25 * 2.133333333333333);
 v3->pMonsterInfo.uRecoveryTime = v18;
 v3->vVelocity.z = v13;
 v3->vVelocity.y = v13;
 v3->vVelocity.x = v13;
-result = v3->UpdateAnimation();
+v3->UpdateAnimation();
 }
 else
-{
+Actor::_402AD7(v24, a2, rand() % 2, 64, arg0);
-v11 = rand();
-result = Actor::_402AD7(v24, a2, v11 % 2, 64, arg0);
-}
-}
-return result;
 }
 //----- (00438CF3) --------------------------------------------------------
-void Actor::_438CF3(unsigned int uActorID)
+void Actor::ApplyFineForKillingPeasant(unsigned int uActorID)
 {
 unsigned int v1; // esi@1
 unsigned int v2; // edi@2
 char v3; // bl@3
-char *v4; // ecx@16
+//char *v4; // ecx@16
-signed int v5; // eax@18
+//signed int v5; // eax@18
 Player **ppPlayers; // esi@20
 v1 = uLevelMapStatsID;
-if ( !uLevelMapStatsID || (v2 = uActorID, !pActors[uActorID]._438B9B()) )
+if ( !uLevelMapStatsID || !pActors[uActorID].IsPeasant())
 return;
+v2 = uActorID;
 v3 = 1;
 if ( v1 != 5 )
 {
 if ( v1 == 6 || v1 == 7 )
 {
 if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 100) )
 v3 = 1;
 if ( v3 )
 {
 LABEL_12:
-pParty->uFine += 100
+pParty->uFine += 100 * (pMapStats->pInfos[uLevelMapStatsID]._steal_perm + pActors[v2].pMonsterInfo.uLevel + GetPartyReputation());
-* (pMapStats->pInfos[uLevelMapStatsID]._steal_perm
-+ pActors[v2].pMonsterInfo.uLevel
-+ GetPartyReputation());
 if ( pParty->uFine < 0 )
 pParty->uFine = 0;
 if ( pParty->uFine > 4000000 )
 pParty->uFine = 4000000;
-v4 = (char *)&pOutdoor->ddm;
-if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
+if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
-v4 = (char *)&pIndoor->dlv;
+{
-v5 = *((int *)v4 + 2);
+if (pOutdoor->ddm.uReputation < 10000)
-if ( v5 < 10000 )
+pOutdoor->ddm.uReputation++;
-*((int *)v4 + 2) = v5 + 1;
+}
+else if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
+{
+if (pIndoor->dlv.uReputation < 10000)
+pIndoor->dlv.uReputation++;
+}
+else assert(false);
 ppPlayers = &pPlayers[1];
 do
 {
 if ( pParty->uFine )
 {
 }
 }
 //----- (0043AE80) --------------------------------------------------------
-int Actor::AddBloodsplatOnDamageOverlay(unsigned int uActorID, int a2, signed int a3)
+void Actor::AddBloodsplatOnDamageOverlay(unsigned int uActorID, int a2, signed int a3)
 {
 int result; // eax@1
 unsigned int v4; // esi@1
 int v5; // [sp-14h] [bp-18h]@3
 unsigned int v6; // [sp-10h] [bp-14h]@3
 v7 = 0;
 LOWORD(v6) = v4;
 v5 = 904;
 goto LABEL_16;
 }
-return result;
+return;
 case 2:
 if ( a3 )
 {
 v9 = 0;
 v8 = (signed __int64)(sub_43AE12(a3) * 65536.0);
 v7 = 0;
 LOWORD(v6) = v4;
 v5 = 905;
 goto LABEL_16;
 }
-return result;
+return;
 case 3:
 if ( a3 )
 {
 v9 = 0;
 v8 = (signed __int64)(sub_43AE12(a3) * 65536.0);
 v7 = 0;
 LOWORD(v6) = v4;
 v5 = 906;
 goto LABEL_16;
 }
-return result;
+return;
 case 4:
 if ( a3 )
 {
 v9 = 0;
 v8 = (signed __int64)(sub_43AE12(a3) * 65536.0);
 v7 = 0;
 LOWORD(v6) = v4;
 v5 = 907;
 goto LABEL_16;
 }
-return result;
+return;
 case 5:
 v9 = 4;
 v8 = 65536;
 v7 = 0;
 v6 = 8 * uActorID | 3;
 v5 = 908;
 LABEL_16:
 result = pOtherOverlayList->_4418B6(v5, v6, v7, v8, v9);
 break;
 default:
-return result;
+return;
 }
-return result;
+return;
 }
 //----- (0043B3E0) --------------------------------------------------------
 int Actor::_43B3E0_CalcDamage(Actor *a1, signed int a2)
 }
 return v11 + v5 + v2;
 }
 //----- (00438B9B) --------------------------------------------------------
-char Actor::_438B9B()
+bool Actor::IsPeasant()
 {
 unsigned int v1; // eax@1
 v1 = this->uAlly;
 if ( !v1 )
 return result;
 }
 //----- (00403A60) --------------------------------------------------------
-unsigned int __fastcall Actor::_403A60(unsigned int uActorID, signed int edx0, AIDirection *pDir)
+void Actor::_403A60(unsigned int uActorID, signed int edx0, AIDirection *pDir)
 {
 Actor *v3; // ebx@1
 AIDirection *v4; // esi@3
 AIDirection *v5; // edi@3
 signed int v6; // eax@4
 Vec3_int_ v7; // ST04_12@6
-unsigned int result; // eax@7
+//unsigned int result; // eax@7
 AIDirection *v9; // eax@8
 unsigned int v10; // esi@8
 AIDirection *v11; // esi@9
 SpriteFrame *v12; // ecx@10
 __int16 v13; // ax@10
 if ( sub_42FB5C(v16) )
 {
 v3->uCurrentActionLength = 64;
 v3->uCurrentActionTime = v10;
 v3->uAIState = Fidgeting;
-result = v3->UpdateAnimation();
+v3->UpdateAnimation();
 v3->uAIState = AttackingRanged4;
 }
 else
-{
+v3->UpdateAnimation();
-result = v3->UpdateAnimation();
-}
 }
 else
-{
+Actor::_402AD7(v22, a2, v22, 64, pDir);
-result = Actor::_402AD7(v22, a2, v22, 64, pDir);
-}
-return result;
 }
 //----- (00403854) --------------------------------------------------------
-unsigned int __fastcall Actor::_403854(unsigned int uActorID, signed int edx0, AIDirection *pDir)
+void Actor::_403854(unsigned int uActorID, signed int edx0, AIDirection *pDir)
 {
 Actor *v3; // ebx@1
 AIDirection *v4; // esi@3
 AIDirection *v5; // edi@3
 signed int v6; // eax@4
 Vec3_int_ v7; // ST04_12@6
-unsigned int result; // eax@7
+//unsigned int result; // eax@7
 AIDirection *v9; // eax@8
 unsigned int v10; // esi@8
 AIDirection *v11; // esi@9
 SpriteFrame *v12; // ecx@10
 __int16 v13; // ax@10
 if ( sub_42FB5C(v16) )
 {
 v3->uCurrentActionLength = 64;
 v3->uCurrentActionTime = v10;
 v3->uAIState = Fidgeting;
-result = v3->UpdateAnimation();
+v3->UpdateAnimation();
 v3->uAIState = AttackingRanged3;
 }
 else
-{
+v3->UpdateAnimation();
-result = v3->UpdateAnimation();
-}
 }
 else
-{
+Actor::_402AD7(v22, a2, v22, 64, pDir);
-result = Actor::_402AD7(v22, a2, v22, 64, pDir);
-}
-return result;
 }
 //----- (0040368B) --------------------------------------------------------
-unsigned int __fastcall Actor::_40368B(unsigned int uActorID, signed int edx0, AIDirection *pDir)
+void Actor::_40368B(unsigned int uActorID, signed int edx0, AIDirection *pDir)
 {
 Actor *v3; // ebx@1
 AIDirection *v4; // esi@3
 AIDirection *v5; // edi@3
 signed int v6; // eax@4
 Vec3_int_ v7; // ST04_12@6
-unsigned int result; // eax@7
+//unsigned int result; // eax@7
 AIDirection *v9; // eax@8
 unsigned int v10; // esi@8
 AIDirection *v11; // esi@9
 SpriteFrame *v12; // ecx@10
 __int16 v13; // ax@10
 v15 = (signed __int64)(flt_6BE3A8_debug_recmod2 * (double)(signed int)pDira * 2.133333333333333);
 v3->pMonsterInfo.uRecoveryTime = v15;
 v3->vVelocity.z = v10;
 v3->vVelocity.y = v10;
 v3->vVelocity.x = v10;
-result = v3->UpdateAnimation();
+v3->UpdateAnimation();
 }
 else
-{
+Actor::_402AD7(v21, a2, v21, 64, pDir);
-result = Actor::_402AD7(v21, a2, v21, 64, pDir);
-}
-return result;
 }
 //----- (00403476) --------------------------------------------------------
-unsigned int __fastcall Actor::_403476(unsigned int uActorID, signed int edx0, AIDirection *pDir)
+void Actor::_403476(unsigned int uActorID, signed int edx0, AIDirection *pDir)
 {
 Actor *v3; // ebx@1
 int v4; // esi@3
 int v5; // edi@3
 signed int v6; // eax@4
 Vec3_int_ v7; // ST04_12@6
 unsigned char v8[12]; // ST04_12@7
-unsigned int result; // eax@8
+//unsigned int result; // eax@8
 AIDirection *v10; // eax@9
 unsigned int v11; // esi@9
 AIDirection *v12; // esi@10
 SpriteFrame *v13; // ecx@11
 __int16 v14; // ax@11
 * (double)(signed int)pDira
 * -2.133333333333333);
 v3->vVelocity.z = v11;
 v3->vVelocity.y = v11;
 v3->vVelocity.x = v11;
-result = v3->UpdateAnimation();
+v3->UpdateAnimation();
 }
 else
-{
+Actor::_402AD7(v21, a2, v21, 64, pDir);
-result = Actor::_402AD7(v21, a2, v21, 64, pDir);
-}
-return result;
 }
 //----- (004032B2) --------------------------------------------------------
-void __fastcall Actor::_4032B2(unsigned int a1, unsigned int a2, int a3, int uActionLength)
+void Actor::_4032B2(unsigned int a1, unsigned int a2, int a3, int uActionLength)
 {
 unsigned int v4; // edi@1
 Actor *v5; // esi@1
 int v6; // ebx@1
 int v7; // ST08_4@1
 return (char)v5;
 }
 //----- (004030AD) --------------------------------------------------------
-__int16 __fastcall Actor::_4030AD(unsigned int uActorID, signed int edx0, int arg0)
+void Actor::_4030AD(unsigned int uActorID, signed int edx0, int arg0)
 {
 unsigned int v3; // edi@1
 Actor *v4; // ebx@1
-__int16 result; // ax@10
+//__int16 result; // ax@10
 SpriteFrame *v6; // ecx@16
 __int16 v7; // ax@16
 unsigned int v8; // ecx@16
 AIDirection a3; // [sp+Ch] [bp-40h]@16
 AIDirection v10; // [sp+28h] [bp-24h]@16
 if ( (signed __int64)v4->pActorBuffs[1].uExpireTime > 0 )
 v4->pActorBuffs[1].Reset();
 if ( (signed __int64)v4->pActorBuffs[4].uExpireTime > 0 )
 v4->pActorBuffs[4].Reset();
 if ( arg0
-|| (result = v4->uAIState, result != 8)
+|| (v4->uAIState != 8
-&& result != 3
+&& v4->uAIState != 3
-&& result != 12
+&& v4->uAIState != 12
-&& result != 13
+&& v4->uAIState != 13
-&& result != 18
+&& v4->uAIState != 18
-&& result != 2 )
+&& v4->uAIState != 2))
 {
 memcpy(&v10, Actor::GetDirectionInfo(8 * v3 | 3, a2, &a3, 0), sizeof(v10));
 v6 = pSpriteFrameTable->pSpriteSFrames;
 v4->uYawAngle = LOWORD(v10.uYawAngle);
 v7 = v6[v4->pSpriteIDs[ANIM_GotHit]].uAnimLength;
 v8 = v11;
 v4->uCurrentActionTime = 0;
 v4->uAIState = Stunned;
 v4->uCurrentActionLength = 8 * v7;
 Actor::PlaySound(v8, 2u);
-result = v4->UpdateAnimation();
+v4->UpdateAnimation();
 }
-return result;
 }
 //----- (00402F87) --------------------------------------------------------
-int __fastcall Actor::_402F87(unsigned int uActorID, unsigned int uObjID, AIDirection *a4)
+void Actor::_402F87(unsigned int uActorID, unsigned int uObjID, AIDirection *a4)
 {
 int v3; // edi@1
 AIDirection *v4; // esi@1
 Actor *v5; // ebx@1
 SpriteFrame *v6; // ecx@3
 unsigned int v7; // eax@3
 int v8; // edx@3
 unsigned int v9; // eax@3
-int result; // eax@4
+//int result; // eax@4
 AIDirection a3; // [sp+Ch] [bp-5Ch]@2
 AIDirection v12; // [sp+28h] [bp-40h]@2
 AIDirection v13; // [sp+44h] [bp-24h]@2
 unsigned int v14; // [sp+60h] [bp-8h]@1
 unsigned int v15; // [sp+64h] [bp-4h]@1
 v7 = stru_5C6E00->Atan2(v5->vPosition.x - pIndoorCamera->pos.x, v5->vPosition.y - pIndoorCamera->pos.y);
 LOWORD(v8) = v5->uYawAngle;
 v9 = stru_5C6E00->uIntegerPi + v8 + ((signed int)stru_5C6E00->uIntegerPi >> 3) - v7;
 if ( BYTE1(v9) & 7 )
 {
-result = Actor::_403EB6(v3, v14, v5->uCurrentActionLength, v4);
+Actor::_403EB6(v3, v14, v5->uCurrentActionLength, v4);
 }
 else
 {
 v5->uAIState = Fidgeting;
 v5->uCurrentActionTime = 0;
 v5->vVelocity.z = 0;
 v5->vVelocity.y = 0;
 v5->vVelocity.x = 0;
 if ( rand() % 100 < 5 )
 Actor::PlaySound(v3, 3u);
-result = v5->UpdateAnimation();
+v5->UpdateAnimation();
 }
-return result;
 }
 //----- (00402F27) --------------------------------------------------------
-unsigned int __fastcall Actor::Resurrect(unsigned int uActorID)
+void Actor::Resurrect(unsigned int uActorID)
 {
 Actor *pActor; // esi@1
 SpriteFrame *v2; // edx@1
 int v3; // eax@1
 pActor->uAIState = Resurrected;
 pActor->uCurrentActionAnimation = ANIM_Dying;
 pActor->uCurrentActionLength = 8 * v2[v3].uAnimLength;
 pActor->sCurrentHP = LOWORD(pActor->pMonsterInfo.uHP);
 Actor::PlaySound(uActorID, 1u);
-return pActor->UpdateAnimation();
+pActor->UpdateAnimation();
 }
 //----- (00402D6E) --------------------------------------------------------
 void Actor::Die(unsigned int uActorID)
 if (actor->pMonsterInfo.uSpecialAbilityType == MONSTER_SPECIAL_ABILITY_EXPLODE)
 Actor::Explode(uActorID);
 }
 //----- (00402CED) --------------------------------------------------------
-void __fastcall Actor::PlaySound(unsigned int uActorID, unsigned int uSoundID)
+void Actor::PlaySound(unsigned int uActorID, unsigned int uSoundID)
 {
 Actor *v2; // eax@1
 unsigned __int16 v3; // dx@1
 int v4; // eax@3
 int v5; // eax@4
 }
 }
 //----- (00402AD7) --------------------------------------------------------
-unsigned int __fastcall Actor::_402AD7(unsigned int uActorID, unsigned int a2, signed int arg0, signed int uActionLength, AIDirection *pDir)
+void Actor::_402AD7(unsigned int uActorID, unsigned int a2, signed int arg0, signed int uActionLength, AIDirection *pDir)
 {
 unsigned int v5; // edi@1
 int v6; // eax@1
 Actor *v7; // ebx@1
 unsigned int v8; // ecx@1
 }
 if ( MonsterStats::BelongsToSupertype(v7->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
 {
 if ( !uActionLength )
 uActionLength = 256;
-return Actor::_403F58(v5, 4, uActionLength, v10);
+Actor::_403F58(v5, 4, uActionLength, v10);
+return;
 }
 if ( (double)(signed int)v10->uDistance < 307.2 )
 {
 if ( !uActionLength )
 uActionLength = 256;
-return Actor::_403EB6(v5, v18, uActionLength, v10);
+Actor::_403EB6(v5, v18, uActionLength, v10);
+return;
 }
 if ( !v7->uMovementSpeed )
-return Actor::_403EB6(v5, v18, uActionLength, v10);
+{
+Actor::_403EB6(v5, v18, uActionLength, v10);
+return;
+}
 v18 = 16;
 if ( arg0 % 2 )
 v18 = -16;
 v12 = ((unsigned __int64)(stru_5C6E00->SinCos(v18 + stru_5C6E00->uIntegerPi + v10->uYawAngle)
 * (signed __int64)v10->uDistanceXZ) >> 16)
 v7->uCurrentActionLength = uActionLength;
 else
 v7->uCurrentActionLength = 128;
 v7->uPitchAngle = LOWORD(v10->uPitchAngle);
 v7->uAIState = Pursuing;
-return v7->UpdateAnimation();
+v7->UpdateAnimation();
 }
 //----- (00402968) --------------------------------------------------------
-unsigned int __fastcall Actor::_402968(unsigned int uActorID, signed int edx0, int uActionLength, AIDirection *a4)
+void Actor::_402968(unsigned int uActorID, signed int edx0, int uActionLength, AIDirection *a4)
 {
 unsigned int v4; // esi@1
 Actor *v5; // ebx@1
-unsigned int result; // eax@1
+//unsigned int result; // eax@1
 int v7; // ecx@2
 signed __int16 v8; // cx@10
 unsigned __int16 v9; // ax@15
 AIDirection v10; // [sp+8h] [bp-7Ch]@4
 AIDirection a3; // [sp+24h] [bp-60h]@3
 v4 = uActorID;
 a2 = edx0;
 v15 = uActorID;
 v5 = &pActors[uActorID];
-result = pActors[uActorID].CanAct();
+//result = pActors[uActorID].CanAct();
-if ( result )
+if ( pActors[uActorID].CanAct() )
 {
 v7 = 8 * v4 | 3;
 a1 = 8 * v4 | 3;
 if ( !a4 )
 {
 if ( MonsterStats::BelongsToSupertype(v5->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT)
 || (a2 & 7) == OBJECT_Actor && (double)(signed int)v13.uDistance < 307.2 )
 {
 if ( !uActionLength )
 uActionLength = 256;
-result = Actor::_403F58(v15, 4, uActionLength, &v13);
+Actor::_403F58(v15, 4, uActionLength, &v13);
 }
 else
 {
 v8 = v5->uMovementSpeed;
 if ( v8 )
 v5->uYawAngle = LOWORD(stru_5C6E00->uDoublePiMask) & (v5->uYawAngle + rand() % (signed int)stru_5C6E00->uIntegerPi);
 v9 = LOWORD(a4->uPitchAngle);
 v5->uCurrentActionTime = 0;
 v5->uPitchAngle = v9;
 v5->uAIState = Fleeing;
-result = v5->UpdateAnimation();
+v5->UpdateAnimation();
 }
 }
-return result;
 }
 //----- (0040281C) --------------------------------------------------------
-int __fastcall Actor::_40281C(unsigned int uActorID, unsigned int a2, signed int uActionLength, AIDirection *pDir, int a5)
+void Actor::_40281C(unsigned int uActorID, unsigned int a2, signed int uActionLength, AIDirection *pDir, int a5)
 {
 unsigned int v5; // edi@1
 int v6; // eax@1
 Actor *v7; // ebx@1
 unsigned int v8; // ecx@1
 if ( !uActionLength )
 uActionLength = 256;
 v16 = v10;
 v15 = uActionLength;
 v11 = 4;
-return Actor::_403F58(v5, v11, v15, v16);
+Actor::_403F58(v5, v11, v15, v16);
+return;
 }
 if ( (signed int)v10->uDistance < a5 )
 {
 if ( !uActionLength )
 uActionLength = 256;
 v11 = v19;
 v16 = v10;
 v15 = uActionLength;
-return Actor::_403F58(v5, v11, v15, v16);
+Actor::_403F58(v5, v11, v15, v16);
+return;
 }
 if ( uActionLength )
 {
 v7->uCurrentActionLength = uActionLength;
 }
 v7->uYawAngle = LOWORD(v10->uYawAngle);
 v14 = LOWORD(v10->uPitchAngle);
 v7->uCurrentActionTime = 0;
 v7->uPitchAngle = v14;
 v7->uAIState = Pursuing;
-return v7->UpdateAnimation();
+v7->UpdateAnimation();
 }
 //----- (00402686) --------------------------------------------------------
-unsigned int __fastcall Actor::_402686(unsigned int uActorID, unsigned int a2, signed int uActionLength, AIDirection *a4)
+void Actor::_402686(unsigned int uActorID, unsigned int a2, signed int uActionLength, AIDirection *a4)
 {
 unsigned int v4; // edi@1
 int v5; // eax@1
 Actor *v6; // ebx@1
 int v7; // ecx@1
 v6->uCurrentActionTime = 0;
 v6->uPitchAngle = v16;
 v6->uAIState = Pursuing;
 if ( rand() % 100 < 2 )
 Actor::PlaySound(v4, 2u);
-return v6->UpdateAnimation();
+v6->UpdateAnimation();
 }
 //----- (00401221) --------------------------------------------------------
-void __fastcall Actor::_401221(unsigned int uActorID, int *a2, unsigned int a3)
+void Actor::_401221(unsigned int uActorID, int *a2, unsigned int a3)
 {
 Actor *v3; // esi@1
 unsigned int v4; // ebx@1
 int v5; // ecx@1
 unsigned int v6; // eax@1
 return 0;
 }
 //----- (0045976D) --------------------------------------------------------
-unsigned int Actor::UpdateAnimation()
+void Actor::UpdateAnimation()
 {
-AIState state; // edx@1
+//AIState state; // edx@1
-unsigned int result; // eax@1
+//unsigned int result; // eax@1
-state = (AIState)this->uAIState;
+//state = (AIState)this->;
-BYTE2(this->uAttributes) &= 0xDFu;
+uAttributes &= 0xFFDFFFFF;
-result = this->uAttributes;
+//result = this->uAttributes;
-switch ( state )
+switch (uAIState)
 {
 case Tethered:
-this->uCurrentActionAnimation = ANIM_Walking;
+uCurrentActionAnimation = ANIM_Walking;
-return result;
+break;
 case AttackingMelee:
-this->uCurrentActionAnimation = ANIM_AtkMelee;
+uCurrentActionAnimation = ANIM_AtkMelee;
-goto LABEL_10;
+uAttributes |= 0x200000u;
+break;
 case AttackingRanged1:
 case AttackingRanged2:
 case AttackingRanged3:
 case AttackingRanged4:
-this->uCurrentActionAnimation = ANIM_AtkRanged;
+uCurrentActionAnimation = ANIM_AtkRanged;
-goto LABEL_10;
+uAttributes |= 0x200000u;
+break;
 case Dying:
 case Resurrected:
-this->uCurrentActionAnimation = ANIM_Dying;
+uCurrentActionAnimation = ANIM_Dying;
-goto LABEL_10;
+uAttributes |= 0x200000u;
+break;
 case Pursuing:
 case Fleeing:
-this->uCurrentActionAnimation = ANIM_Walking;
+uCurrentActionAnimation = ANIM_Walking;
-goto LABEL_10;
+uAttributes |= 0x200000u;
+break;
 case Stunned:
-this->uCurrentActionAnimation = ANIM_GotHit;
+uCurrentActionAnimation = ANIM_GotHit;
-goto LABEL_10;
+uAttributes |= 0x200000u;
+break;
 case Fidgeting:
-this->uCurrentActionAnimation = ANIM_Bored;
+uCurrentActionAnimation = ANIM_Bored;
-goto LABEL_10;
+uAttributes |= 0x200000u;
+break;
 case Standing:
 case Interacting:
 case Summoned:
-this->uCurrentActionAnimation = ANIM_Standing;
+uCurrentActionAnimation = ANIM_Standing;
-LABEL_10:
+uAttributes |= 0x200000u;
-result |= 0x200000u;
+break;
-this->uAttributes = result;
-break;
 case Dead:
-result = 60 * this->pSpriteIDs[ANIM_Dead];
+if (pSpriteFrameTable->pSpriteSFrames[pSpriteIDs[ANIM_Dead]].pHwSpriteIDs[0] <= 0)
-if ( *(__int16 *)((char *)pSpriteFrameTable->pSpriteSFrames->pHwSpriteIDs + result) <= 0 )
+uAIState = Removed;
-this->uAIState = Removed;
 else
-this->uCurrentActionAnimation = ANIM_Dead;
+uCurrentActionAnimation = ANIM_Dead;
 break;
 default:
-return result;
+assert(false);
 }
-return result;
 }
 //----- (00459671) --------------------------------------------------------
 void Actor::Reset()
 {

Mercurial > mm7

comparison Actor.cpp @ 322:ce39b96acf5c