Mercurial > mm7

comparison Actor.cpp @ 1458:934074e7fcc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ModalWindow __thiscall and __cdecl removed Some random renames & refactors
author Nomad
date Wed, 21 Aug 2013 14:26:36 +0200
parents 5c95f2246c2a
children 845907a747d3
comparison
equal deleted inserted replaced
1457:9dc33590f93e 1458:934074e7fcc1
2417 * -2.133333333333333); 2417 * -2.133333333333333);
2418 v16 = v3->pMonsterInfo.uSpell2ID; 2418 v16 = v3->pMonsterInfo.uSpell2ID;
2419 v3->vVelocity.z = v10; 2419 v3->vVelocity.z = v10;
2420 v3->vVelocity.y = v10; 2420 v3->vVelocity.y = v10;
2421 v3->vVelocity.x = v10; 2421 v3->vVelocity.x = v10;
2422 if ( sub_42FB5C(v16) ) 2422 if ( _42FB5C_check_spell(v16) )
2423 { 2423 {
2424 v3->uCurrentActionLength = 64; 2424 v3->uCurrentActionLength = 64;
2425 v3->uCurrentActionTime = v10; 2425 v3->uCurrentActionTime = v10;
2426 v3->uAIState = Fidgeting; 2426 v3->uAIState = Fidgeting;
2427 v3->UpdateAnimation(); 2427 v3->UpdateAnimation();
2523 * -2.133333333333333); 2523 * -2.133333333333333);
2524 v16 = v3->pMonsterInfo.uSpell1ID; 2524 v16 = v3->pMonsterInfo.uSpell1ID;
2525 v3->vVelocity.z = v10; 2525 v3->vVelocity.z = v10;
2526 v3->vVelocity.y = v10; 2526 v3->vVelocity.y = v10;
2527 v3->vVelocity.x = v10; 2527 v3->vVelocity.x = v10;
2528 if ( sub_42FB5C(v16) ) 2528 if ( _42FB5C_check_spell(v16) )
2529 { 2529 {
2530 v3->uCurrentActionLength = 64; 2530 v3->uCurrentActionLength = 64;
2531 v3->uCurrentActionTime = v10; 2531 v3->uCurrentActionTime = v10;
2532 v3->uAIState = Fidgeting; 2532 v3->uAIState = Fidgeting;
2533 v3->UpdateAnimation(); 2533 v3->UpdateAnimation();
3995 result = 1; 3995 result = 1;
3996 } 3996 }
3997 return result; 3997 return result;
3998 } 3998 }
3999 //----- (00401A91) -------------------------------------------------------- 3999 //----- (00401A91) --------------------------------------------------------
4000 void __cdecl UpdateActorAI() 4000 void UpdateActorAI()
4001 { 4001 {
4002 //unsigned int v0; // esi@4 4002 //unsigned int v0; // esi@4
4003 int v1; // eax@7 4003 int v1; // eax@7
4004 //int v2; // ecx@7 4004 //int v2; // ecx@7
4005 //int v3; // eax@7 4005 //int v3; // eax@7
4745 else 4745 else
4746 LOBYTE(v5) = uTotalActors == uAliveActors; 4746 LOBYTE(v5) = uTotalActors == uAliveActors;
4747 return v5; 4747 return v5;
4748 } 4748 }
4749 //----- (00408B54) -------------------------------------------------------- 4749 //----- (00408B54) --------------------------------------------------------
4750 unsigned int __fastcall SearchActorByID(unsigned int *pTotalActors, unsigned int a2) 4750 unsigned int SearchActorByID(unsigned int *pTotalActors, unsigned int a2)
4751 { 4751 {
4752 unsigned int v2; // edi@1 4752 unsigned int v2; // edi@1
4753 unsigned int *v3; // esi@1 4753 unsigned int *v3; // esi@1
4754 int v4; // eax@1 4754 int v4; // eax@1
4755 unsigned int v5; // ebx@1 4755 unsigned int v5; // ebx@1
4768 v5 = 1; 4768 v5 = 1;
4769 } 4769 }
4770 return v5; 4770 return v5;
4771 } 4771 }
4772 //----- (00408AE7) -------------------------------------------------------- 4772 //----- (00408AE7) --------------------------------------------------------
4773 unsigned int __fastcall SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup) 4773 unsigned int SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup)
4774 { 4774 {
4775 unsigned int *v2; // esi@1 4775 unsigned int *v2; // esi@1
4776 signed int v3; // ebx@1 4776 signed int v3; // ebx@1
4777 Actor *v4; // edi@2 4777 Actor *v4; // edi@2
4778 int v5; // eax@3 4778 int v5; // eax@3
4807 while ( v3 < (signed int)uNumActors ); 4807 while ( v3 < (signed int)uNumActors );
4808 } 4808 }
4809 return v9; 4809 return v9;
4810 } 4810 }
4811 //----- (00408A7E) -------------------------------------------------------- 4811 //----- (00408A7E) --------------------------------------------------------
4812 unsigned int __fastcall SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID) 4812 unsigned int SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID)
4813 { 4813 {
4814 unsigned int *v2; // esi@1 4814 unsigned int *v2; // esi@1
4815 signed int v3; // ebx@1 4815 signed int v3; // ebx@1
4816 Actor *v4; // edi@2 4816 Actor *v4; // edi@2
4817 int v5; // eax@3 4817 int v5; // eax@3
4846 while ( v3 < (signed int)uNumActors ); 4846 while ( v3 < (signed int)uNumActors );
4847 } 4847 }
4848 return v9; 4848 return v9;
4849 } 4849 }
4850 //----- (00408A27) -------------------------------------------------------- 4850 //----- (00408A27) --------------------------------------------------------
4851 unsigned int __thiscall SearchAliveActors(unsigned int *pTotalActors) 4851 unsigned int SearchAliveActors(unsigned int *pTotalActors)
4852 { 4852 {
4853 unsigned int *v1; // esi@1 4853 unsigned int *v1; // esi@1
4854 int v2; // eax@1 4854 int v2; // eax@1
4855 unsigned int v3; // ebp@1 4855 unsigned int v3; // ebp@1
4856 signed int v4; // ebx@1 4856 signed int v4; // ebx@1