mm7: Actor.cpp comparison

comparison Actor.cpp @ 413:111f25d1cc04

AI_Stand

author	Nomad
date	Sat, 23 Feb 2013 16:39:32 +0200
parents	74205b91647b
children	d8b3056df4e2

comparison

equal deleted inserted replaced

-:bbd8888534dc
+:111f25d1cc04
 }
 //----- (00403F58) --------------------------------------------------------
 void Actor::_403F58(unsigned int uActorID, signed int uObjID, int uActionLength, AIDirection *a4)
 {
-unsigned int v4; // esi@1
+if (rand() % 2)
-//unsigned int result; // eax@2
+{
-AIDirection *v6; // eax@3
+Actor::_402F87(uActorID, uObjID, a4);
-unsigned int v7; // edi@3
-Actor *v8; // ebx@3
-AIDirection *v9; // esi@4
-AIDirection a3; // [sp+4h] [bp-3Ch]@4
-AIDirection v11; // [sp+20h] [bp-20h]@4
-signed int a2; // [sp+3Ch] [bp-4h]@1
-a2 = uObjID;
-v4 = uActorID;
-if ( rand() % 2 )
-{
-Actor::_402F87(v4, a2, a4);
 return;
 }
-v6 = a4;
+assert(uActorID < uNumActors);
-v7 = 0;
+auto actor = &pActors[uActorID];
-v8 = &pActors[v4];
-if ( !a4 )
+AIDirection a3;
-{
+if (!a4)
-v9 = Actor::GetDirectionInfo(8 * v4 | 3, a2, &a3, 0);
+a4 = Actor::GetDirectionInfo(8 * uActorID | OBJECT_Actor, uObjID, &a3, 0);
-v6 = &v11;
-memcpy(&v11, v9, sizeof(v11));
+actor->uAIState = Standing;
-v7 = 0;
+if (!uActionLength)
-}
+actor->uCurrentActionLength = rand() % 256 + 256;
-v8->uYawAngle = LOWORD(v6->uYawAngle);
+else
-v8->uPitchAngle = LOWORD(v6->uPitchAngle);
+actor->uCurrentActionLength = uActionLength;
-if ( uActionLength == v7 )
+actor->uCurrentActionTime = 0;
-v8->uCurrentActionLength = rand() % 256 + 256;
+actor->uYawAngle = a4->uYawAngle;
-else
+actor->uPitchAngle = a4->uPitchAngle;
-v8->uCurrentActionLength = uActionLength;
+actor->vVelocity.z = 0;
-v8->uCurrentActionTime = v7;
+actor->vVelocity.y = 0;
-v8->uAIState = Standing;
+actor->vVelocity.x = 0;
-v8->vVelocity.z = v7;
+actor->UpdateAnimation();
-v8->vVelocity.y = v7;
-v8->vVelocity.x = v7;
-v8->UpdateAnimation();
 }
 //----- (00403EB6) --------------------------------------------------------
-void Actor::_403EB6(unsigned int uActorID, unsigned int a2, unsigned int uActionLength, AIDirection *a4)
+void Actor::AI_Stand(unsigned int uActorID, unsigned int object_to_face_pid, unsigned int uActionLength, AIDirection *a4)
 {
-AIDirection *v4; // eax@1
+assert(uActorID < uNumActors);
-unsigned int v5; // esi@1
+auto actor = pActors + uActorID;
-Actor *v6; // ebx@1
-AIDirection *v7; // esi@2
+AIDirection a3;
-AIDirection a3; // [sp+Ch] [bp-38h]@2
+if (!a4)
-AIDirection v10; // [sp+28h] [bp-1Ch]@2
+a4 = Actor::GetDirectionInfo(8 * uActorID | 3, object_to_face_pid, &a3, 0);
-v4 = a4;
+actor->uAIState = Standing;
-v5 = 0;
+if (!uActionLength)
-v6 = &pActors[uActorID];
+actor->uCurrentActionLength = rand() % 256 + 256;
-if ( !a4 )
-{
-v7 = Actor::GetDirectionInfo(8 * uActorID | 3, a2, &a3, 0);
-v4 = &v10;
-memcpy(&v10, v7, sizeof(v10));
-v5 = 0;
-}
-v6->uYawAngle = LOWORD(v4->uYawAngle);
-if ( uActionLength == v5 )
-v6->uCurrentActionLength = rand() % 256 + 256;
 else
-v6->uCurrentActionLength = uActionLength;
+actor->uCurrentActionLength = uActionLength;
-v6->uCurrentActionTime = v5;
+actor->uCurrentActionTime = 0;
-v6->uAIState = Standing;
+actor->uYawAngle = a4->uYawAngle;
-v6->vVelocity.z = v5;
+actor->uPitchAngle = a4->uPitchAngle;
-v6->vVelocity.y = v5;
+actor->vVelocity.z = 0;
-v6->vVelocity.x = v5;
+actor->vVelocity.y = 0;
-v6->UpdateAnimation();
+actor->vVelocity.x = 0;
+actor->UpdateAnimation();
 }
 //----- (00403E61) --------------------------------------------------------
 void __fastcall Actor::StandAwhile(unsigned int uActorID)
 a2 = edx0;
 v4 = v3->pMonsterInfo.uMovementType == 5;
 v24 = uActorID;
 if ( v4 && v3->pMonsterInfo.uAIType == 1 )
 {
-Actor::_403EB6(uActorID, edx0, 0, arg0);
+Actor::AI_Stand(uActorID, edx0, 0, arg0);
 return;
 }
 if ( (edx0 & 7) == OBJECT_Actor)
 {
 }
 if ( pActors[v4].pMonsterInfo.uMovementType == 3 && v19 < 128 )
 {
 v13 = &v14;
 v12 = 256;
-Actor::_403EB6(uActorID, v16, v12, v13);
+Actor::AI_Stand(uActorID, v16, v12, v13);
 return;
 }
 v15 = (rand() & 0xF) << 12;
 v19 += (unsigned __int64)(v15 * (signed __int64)a3) >> 16;
 v9 = (stru_5C6E00->uIntegerDoublePi - 1) & stru_5C6E00->Atan2(v6, y);
 v10 = v9 + rand() % 256 - 128;
 if ( abs(v10 - v5->uYawAngle) > 256 && !(BYTE2(v5->uAttributes) & 0x20) )
 {
 v13 = &v14;
 v12 = 256;
-Actor::_403EB6(uActorID, v16, v12, v13);
+Actor::AI_Stand(uActorID, v16, v12, v13);
 return;
 }
 v11 = v5->uMovementSpeed;
 v5->uYawAngle = v10;
 if ( v11 )
 v5 = &pActors[uActorID];
 v14 = uObjID;
 v15 = uActorID;
 if ( !a4 )
 {
-memcpy(&v13, Actor::GetDirectionInfo(8 * uActorID | AI_OBJECT_ACTOR, uObjID, &a3, (int)a4), sizeof(v13));
+memcpy(&v13, Actor::GetDirectionInfo(8 * uActorID | OBJECT_Actor, uObjID, &a3, (int)a4), sizeof(v13));
 memcpy(&v12, &v13, sizeof(v12));
 v3 = v15;
 v4 = &v12;
 }
 v6 = pSpriteFrameTable->pSpriteSFrames;
 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 )
 {
-Actor::_403EB6(v3, v14, v5->uCurrentActionLength, v4);
+Actor::AI_Stand(v3, v14, v5->uCurrentActionLength, v4);
 }
 else
 {
 v5->uAIState = Fidgeting;
 v5->uCurrentActionTime = 0;
 }
 if ( (double)(signed int)v10->uDistance < 307.2 )
 {
 if ( !uActionLength )
 uActionLength = 256;
-Actor::_403EB6(v5, v18, uActionLength, v10);
+Actor::AI_Stand(v5, v18, uActionLength, v10);
 return;
 }
 if ( !v7->uMovementSpeed )
 {
-Actor::_403EB6(v5, v18, uActionLength, v10);
+Actor::AI_Stand(v5, v18, uActionLength, v10);
 return;
 }
 v18 = 16;
 if ( arg0 % 2 )
 v18 = -16;

Mercurial > mm7

comparison Actor.cpp @ 413:111f25d1cc04