mm7: Actor.cpp comparison

comparison Actor.cpp @ 781:d170f23f70d1

tidy, code moving

author	zipi
date	Sun, 24 Mar 2013 01:27:34 +0000
parents	7f1487b74571
children	c232f160e6f3

comparison

equal deleted inserted replaced

-:93c6b78abf35
+:d170f23f70d1
 #include "LOD.h"
 #include "Party.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
 Actor pActors[500];
 int uNumActors;
 stru319 stru_50C198; // idb
+//----- (00448A40) --------------------------------------------------------
+void Actor::ToggleFlag(signed int uActorID, unsigned int uFlag, int bToggle)
+{
+if ( uActorID >= 0 && uActorID <= (signed int)(uNumActors - 1) )
+{
+if ( bToggle )
+{
+pActors[uActorID].uAttributes |= uFlag;
+}
+else
+{
+if ( uFlag == 0x10000 )
+{
+if (pActors[uActorID].uAIState == Disabled )
+pActors[uActorID].uAIState = Standing;
+}
+pActors[uActorID].uAttributes &= ~uFlag;
+}
+}
+}
 //----- (00448518) --------------------------------------------------------
 void __fastcall sub_448518_npc_set_item(int npc, unsigned int item, int a3)
 {
 signed int v3; // eax@1
 v6->Reset();
 }
 }
 }
 }
 //----- (00445D4A) --------------------------------------------------------
 void Actor::InitializeDialogue(int bPlayerSaysHello)
 {
 Actor *v2; // esi@1
 pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodEvening, 0);
 else
 pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodDay, 0);
 }
 }
 //----- (0040894B) --------------------------------------------------------
 bool Actor::CanAct()
 {
 signed int v1; // esi@1
 v22 = (SoundID)word_4EE088_sound_ids[93];
 goto LABEL_202;
 }
 }
 //----- (0043ABB0) --------------------------------------------------------
 bool Actor::ArePeasantsOfSameFaction(Actor *a1, Actor *a2)
 {
 unsigned int v2; // esi@1
 unsigned int v3; // edi@1
 BYTE2(actor->uAttributes) |= 8u;
 }
 }
 }
 }
 //----- (00404874) --------------------------------------------------------
 char __fastcall Actor::_404874(unsigned int uActorID, AIDirection *a2, int a3, char a4)
 {
 AIDirection *v4; // edi@1
 result = pOut;
 memcpy(pOut, &v41, 0x1Cu);
 return result;
 }
 //----- (00404030) --------------------------------------------------------
 void Actor::FaceObject(unsigned int uActorID, unsigned int uObjID, int _48, AIDirection *a4)
 {
 unsigned int v4; // edi@1
 unsigned int v5; // esi@1
 if (rand() % 2)
 AI_Bored(uActorID, uObjID, a4);
 else
 AI_Stand(uActorID, uObjID, uActionLength, a4);
 }
 //----- (00403EB6) --------------------------------------------------------
 void Actor::AI_Stand(unsigned int uActorID, unsigned int object_to_face_pid, unsigned int uActionLength, AIDirection *a4)
 {
 assert(uActorID < uNumActors);
 actor->vVelocity.z = 0;
 actor->vVelocity.y = 0;
 actor->vVelocity.x = 0;
 actor->UpdateAnimation();
 }
 //----- (00403E61) --------------------------------------------------------
 void __fastcall Actor::StandAwhile(unsigned int uActorID)
 {
 Actor *v1; // esi@1
 }
 else
 Actor::_402AD7(v24, a2, rand() % 2, 64, arg0);
 }
 //----- (00438CF3) --------------------------------------------------------
 void Actor::ApplyFineForKillingPeasant(unsigned int uActorID)
 {
 unsigned int v1; // esi@1
 unsigned int v2; // edi@2
 ++ppPlayers;
 }
 while ( (signed int)ppPlayers <= (signed int)&pPlayers[4] );
 }
 }
 //----- (0043AE80) --------------------------------------------------------
 void Actor::AddBloodsplatOnDamageOverlay(unsigned int uActorID, int a2, signed int a3)
 {
 int result; // eax@1
 return;
 }
 return;
 }
 //----- (0043B3E0) --------------------------------------------------------
 int Actor::_43B3E0_CalcDamage(Actor *a1, signed int a2)
 {
 signed int v2; // ebp@1
 int v3; // eax@9
 pTurnEngine->_40471C();
 result = 1;
 }
 return result;
 }
 //----- (00403A60) --------------------------------------------------------
 void Actor::_403A60(unsigned int uActorID, signed int edx0, AIDirection *pDir)
 {
 Actor *v3; // ebx@1
 }
 else
 Actor::_402AD7(v22, a2, v22, 64, pDir);
 }
 //----- (00403854) --------------------------------------------------------
 void Actor::_403854(unsigned int uActorID, signed int edx0, AIDirection *pDir)
 {
 Actor *v3; // ebx@1
 AIDirection *v4; // esi@3
 }
 else
 Actor::_402AD7(v22, a2, v22, 64, pDir);
 }
 //----- (0040368B) --------------------------------------------------------
 void Actor::_40368B(unsigned int uActorID, signed int edx0, AIDirection *pDir)
 {
 Actor *v3; // ebx@1
 AIDirection *v4; // esi@3
 v3->UpdateAnimation();
 }
 else
 Actor::_402AD7(v21, a2, v21, 64, pDir);
 }
 //----- (00403476) --------------------------------------------------------
 void Actor::_403476(unsigned int uActorID, signed int edx0, AIDirection *pDir)
 {
 Actor *v3; // ebx@1
 if ( rand() % 100 < 2 )
 Actor::PlaySound(uActorID, 3u);
 v5->UpdateAnimation();
 }
 //----- (004031C1) --------------------------------------------------------
 char __fastcall Actor::_4031C1_update_job(unsigned int uActorID, signed int a2, int a3)
 {
 unsigned int v3; // edi@1
 Actor *v4; // esi@1
 }
 }
 }
 return (char)v5;
 }
 //----- (004030AD) --------------------------------------------------------
 void Actor::_4030AD(unsigned int uActorID, signed int edx0, int arg0)
 {
 unsigned int v3; // edi@1
 pActor->uCurrentActionLength = 8 * v2[v3].uAnimLength;
 pActor->sCurrentHP = LOWORD(pActor->pMonsterInfo.uHP);
 Actor::PlaySound(uActorID, 1u);
 pActor->UpdateAnimation();
 }
 //----- (00402D6E) --------------------------------------------------------
 void Actor::Die(unsigned int uActorID)
 {
 auto actor = &pActors[uActorID];
 v5->UpdateAnimation();
 }
 }
 }
 //----- (0040281C) --------------------------------------------------------
 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
 v7->uCurrentActionTime = 0;
 v7->uPitchAngle = v14;
 v7->uAIState = Pursuing;
 v7->UpdateAnimation();
 }
 //----- (00402686) --------------------------------------------------------
 void Actor::_402686(unsigned int uActorID, unsigned int a2, signed int uActionLength, AIDirection *a4)
 {
 unsigned int v4; // edi@1
 return 0;
 }
 return 0;
 }
 //----- (0045976D) --------------------------------------------------------
 void Actor::UpdateAnimation()
 {
 //AIState state; // edx@1
 //unsigned int result; // eax@1
 for (int i=0;i<4;++i )
 pSoundSampleIDs[i]=v3->pSoundSampleIDs[i];
 }
 }
 //----- (00459667) --------------------------------------------------------
 void Actor::Remove()
 {
 this->uAIState = Removed;
 }
 //----- (0044FD29) --------------------------------------------------------
 int Actor::_44FD29(int a2)
 {
 Actor *v2; // edi@1

Mercurial > mm7

comparison Actor.cpp @ 781:d170f23f70d1