Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/Actor.cpp	Wed Aug 14 00:40:51 2013 +0400
+++ b/Actor.cpp	Wed Aug 21 14:26:36 2013 +0200
@@ -2419,7 +2419,7 @@
     v3->vVelocity.z = v10;
     v3->vVelocity.y = v10;
     v3->vVelocity.x = v10;
-    if ( sub_42FB5C(v16) )
+    if ( _42FB5C_check_spell(v16) )
     {
       v3->uCurrentActionLength = 64;
       v3->uCurrentActionTime = v10;
@@ -2525,7 +2525,7 @@
     v3->vVelocity.z = v10;
     v3->vVelocity.y = v10;
     v3->vVelocity.x = v10;
-    if ( sub_42FB5C(v16) )
+    if ( _42FB5C_check_spell(v16) )
     {
       v3->uCurrentActionLength = 64;
       v3->uCurrentActionTime = v10;
@@ -3997,7 +3997,7 @@
   return result;
 }
 //----- (00401A91) --------------------------------------------------------
-void __cdecl UpdateActorAI()
+void  UpdateActorAI()
 {
 	//unsigned int v0; // esi@4
 	int v1; // eax@7
@@ -4747,7 +4747,7 @@
   return v5;
 }
 //----- (00408B54) --------------------------------------------------------
-unsigned int __fastcall SearchActorByID(unsigned int *pTotalActors, unsigned int a2)
+unsigned int SearchActorByID(unsigned int *pTotalActors, unsigned int a2)
 {
   unsigned int v2; // edi@1
   unsigned int *v3; // esi@1
@@ -4770,7 +4770,7 @@
   return v5;
 }
 //----- (00408AE7) --------------------------------------------------------
-unsigned int __fastcall SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup)
+unsigned int SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup)
 {
   unsigned int *v2; // esi@1
   signed int v3; // ebx@1
@@ -4809,7 +4809,7 @@
   return v9;
 }
 //----- (00408A7E) --------------------------------------------------------
-unsigned int __fastcall SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID)
+unsigned int SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID)
 {
   unsigned int *v2; // esi@1
   signed int v3; // ebx@1
@@ -4848,7 +4848,7 @@
   return v9;
 }
 //----- (00408A27) --------------------------------------------------------
-unsigned int __thiscall SearchAliveActors(unsigned int *pTotalActors)
+unsigned int SearchAliveActors(unsigned int *pTotalActors)
 {
   unsigned int *v1; // esi@1
   int v2; // eax@1