Mercurial > mm7

changeset 1874:a6276dda8804

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Actor::AddBloodsplatOnDamageOverlay cleaned up
author Grumpy7
date Thu, 17 Oct 2013 07:57:01 +0200
parents a53bd0511de2
children 1d9e4b50bc7c
files Actor.cpp
diffstat 1 files changed, 16 insertions(+), 69 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Thu Oct 17 07:46:11 2013 +0200
+++ b/Actor.cpp	Thu Oct 17 07:57:01 2013 +0200
@@ -1339,106 +1339,53 @@
 //----- (0043AE80) --------------------------------------------------------
 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
-  int v7; // [sp-Ch] [bp-10h]@3
-  int v8; // [sp-8h] [bp-Ch]@3
-  __int16 v9; // [sp-4h] [bp-8h]@3
 
-  result = a2 - 1;
   v4 = PID(OBJECT_Actor,uActorID);
   switch ( a2 )
   {
     case 1:
       if ( a3 )
       {
-        v9 = 0;
-        v8 = (signed __int64)(sub_43AE12(a3) * 65536.0);
-        v7 = 0;
-        LOWORD(v6) = v4;
-        v5 = 904;
-        goto LABEL_16;
+        pOtherOverlayList->_4418B6(904, v4, 0, (sub_43AE12(a3) * 65536.0), 0);
       }
       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;
+        pOtherOverlayList->_4418B6(905, v4, 0, (sub_43AE12(a3) * 65536.0), 0);
       }
       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;
+        pOtherOverlayList->_4418B6(906, v4, 0, (sub_43AE12(a3) * 65536.0), 0);
       }
       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;
+        pOtherOverlayList->_4418B6(907, v4, 0, (sub_43AE12(a3) * 65536.0), 0);
       }
       return;
     case 5:
-      v9 = 4;
-      v8 = 65536;
-      v7 = 0;
-      v6 = PID(OBJECT_Actor,uActorID);
-      v5 = 901;
-      goto LABEL_16;
+      pOtherOverlayList->_4418B6(901, v4, 0, PID(OBJECT_Actor,uActorID), 0);
+      return;
     case 6:
-      v9 = 4;
-      v8 = 65536;
-      v7 = 0;
-      v6 = PID(OBJECT_Actor,uActorID);
-      v5 = 902;
-      goto LABEL_16;
+      pOtherOverlayList->_4418B6(902, v4, 0, PID(OBJECT_Actor,uActorID), 0);
+      return;
     case 7:
-      v9 = 4;
-      v8 = 65536;
-      v7 = 0;
-      v6 = PID(OBJECT_Actor,uActorID);
-      v5 = 903;
-      goto LABEL_16;
+      pOtherOverlayList->_4418B6(903, v4, 0, PID(OBJECT_Actor,uActorID), 0);
+      return;
     case 8:
-      v9 = 4;
-      v8 = 65536;
-      v7 = 0;
-      v6 = PID(OBJECT_Actor,uActorID);
-      v5 = 900;
-      goto LABEL_16;
+      pOtherOverlayList->_4418B6(900, v4, 0, PID(OBJECT_Actor,uActorID), 0);
+      return;
     case 9:
-      v9 = 4;
-      v8 = 65536;
-      v7 = 0;
-      v6 = PID(OBJECT_Actor,uActorID);
-      v5 = 909;
-      goto LABEL_16;
+      pOtherOverlayList->_4418B6(909, v4, 0, PID(OBJECT_Actor,uActorID), 0);
+      return;
     case 10:
-      v9 = 4;
-      v8 = 65536;
-      v7 = 0;
-      v6 = PID(OBJECT_Actor,uActorID);
-      v5 = 908;
-LABEL_16:
-      result = pOtherOverlayList->_4418B6(v5, v6, v7, v8, v9);
-      break;
+      pOtherOverlayList->_4418B6(908, v4, 0, PID(OBJECT_Actor,uActorID), 0);
+      return;
     default:
       return;
   }