Cleanup, finally fix the trackThing type confusion hack

shinyquagsire23 · Dec 20, 2021 · 995081f · 995081f
1 parent e66d291
commit 995081f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 51 deletions.
diff --git a/src/World/sithExplosion.c b/src/World/sithExplosion.c
@@ -7,6 +7,7 @@
 #include "Engine/sithTemplate.h"
 #include "Engine/sithSurface.h"
 #include "Engine/sithPhysics.h"
+#include "Primitives/rdMath.h"
 #include "jk.h"
 
 void sithExplosion_CreateThing(sithThing *explosion)
@@ -68,77 +69,51 @@ void sithExplosion_Tick(sithThing *explosion)
 void sithExplosion_UpdateForce(sithThing *explosion)
 {
     sithCollisionSearchEntry *i; // ebp
-    double v3; // st6
-    sithThing *v4; // edi
-    double v5; // st6
-    double v6; // st7
-    double v7; // st5
     sithThing **debrisTemplates; // edi
-    int v9; // ebx
-    float v10; // [esp+0h] [ebp-60h]
-    float v11; // [esp+0h] [ebp-60h]
-    float damage; // [esp+18h] [ebp-48h]
-    float force; // [esp+1Ch] [ebp-44h]
-    float range; // [esp+20h] [ebp-40h]
     rdVector3 a2; // [esp+24h] [ebp-3Ch] BYREF
     rdMatrix34 a3; // [esp+30h] [ebp-30h] BYREF
-    float a1a; // [esp+64h] [ebp+4h]
 
-    range = explosion->explosionParams.range;
-    force = explosion->explosionParams.force;
-    damage = explosion->explosionParams.damage;
+    float range = explosion->explosionParams.range;
+    float force = explosion->explosionParams.force;
+    float damage = explosion->explosionParams.damage;
     if ( range > 0.0 && (damage > 0.0 || force > 0.0) )
     {
         sithAIAwareness_AddEntry(explosion->sector, &explosion->position, 1, 3.0, explosion);
         sithCollision_SearchRadiusForThings(explosion->sector, 0, &explosion->position, &rdroid_zeroVector3, 0.0, range, 0x482);
         for ( i = sithCollision_NextSearchResult(); i; i = sithCollision_NextSearchResult() )
         {
-            v3 = i->distance / range;
-            a1a = 1.0 - v3 * v3;
-            if ( a1a < 0.25 )
-            {
-                a1a = 0.25;
-            }
-            else if ( a1a > 1.0 )
-            {
-                a1a = 1.0;
-            }
+            double v3 = i->distance / range;
+            float a1a = rdMath_clampf(1.0 - (v3 * v3), 0.25, 1.0);
+
             if ( (i->collideType & 2) != 0 )
             {
-                v10 = a1a * damage;
-                sithSurface_SendDamageToThing(i->surface, explosion, v10, explosion->explosionParams.damageClass);
+                sithSurface_SendDamageToThing(i->surface, explosion, a1a * damage, explosion->explosionParams.damageClass);
             }
             else
             {
-                v4 = i->receiver;
+                sithThing* v4 = i->receiver;
                 if ( ((explosion->actorParams.typeflags & THING_TYPEFLAGS_40) == 0
                    || v4 != explosion->prev_thing
                    || v4->signature != explosion->child_signature)
                   && sithCollision_HasLos(explosion, v4, 1) )
                 {
                     if ( force != 0.0 && v4->moveType == SITH_MT_PHYSICS && (v4->physicsParams.physflags & PHYSFLAGS_FEELBLASTFORCE) != 0 )
                     {
-                        v5 = -(a1a * force);
-                        v6 = i->field_14.y * v5;
-                        v7 = i->field_14.z * v5;
-                        a2.x = i->field_14.x * v5;
-                        a2.y = v6;
-                        a2.z = v7;
+                        rdVector_Scale3(&a2, &i->field_14, -(a1a * force));
                         sithPhysics_ThingApplyForce(v4, &a2);
                     }
                     if ( damage != 0.0 )
                     {
-                        v11 = a1a * damage;
-                        sithThing_Damage(v4, explosion, v11, explosion->explosionParams.damageClass);
+                        sithThing_Damage(v4, explosion, a1a * damage, explosion->explosionParams.damageClass);
                     }
                 }
             }
         }
         sithCollision_SearchClose();
     }
+
     debrisTemplates = explosion->explosionParams.debrisTemplates;
-    v9 = 4;
-    do
+    for (int i = 0; i < 4; i++)
     {
         if ( *debrisTemplates )
         {
@@ -149,9 +124,7 @@ void sithExplosion_UpdateForce(sithThing *explosion)
             sithThing_Create(*debrisTemplates, &explosion->position, &a3, explosion->sector, 0);
         }
         ++debrisTemplates;
-        --v9;
     }
-    while ( v9 );
 }
 
 int sithExplosion_LoadThingParams(stdConffileArg *arg, sithThing *thing, int param)

diff --git a/src/World/sithThing.c b/src/World/sithThing.c
@@ -1947,9 +1947,9 @@ int sithThing_DetachThing(sithThing *thing)
         {
             if ( v3->moveType != SITH_MT_PATH )
                 goto LABEL_8;
-            thing->physicsParams.vel.x = (v3->physicsParams.angVel.x * v3->physicsParams.acceleration.y) + thing->physicsParams.vel.x;
-            thing->physicsParams.vel.y = (v3->physicsParams.angVel.y * v3->physicsParams.acceleration.y) + thing->physicsParams.vel.y;
-            thing->physicsParams.vel.z = (v3->physicsParams.angVel.z * v3->physicsParams.acceleration.y) + thing->physicsParams.vel.z;
+            thing->physicsParams.vel.x = (v3->trackParams.vel.x * v3->trackParams.field_20) + thing->physicsParams.vel.x;
+            thing->physicsParams.vel.y = (v3->trackParams.vel.y * v3->trackParams.field_20) + thing->physicsParams.vel.y;
+            thing->physicsParams.vel.z = (v3->trackParams.vel.z * v3->trackParams.field_20) + thing->physicsParams.vel.z;
         }
     }
 LABEL_8:

diff --git a/src/types.h b/src/types.h
@@ -2253,12 +2253,7 @@ typedef struct sithThingTrackParams
     uint32_t numFrames;
     uint32_t loadedFrames;
     sithThingFrame *frames;
-
-    // TODO HACK HACK HACK adjust this variable's position 
-    // to fix some union confusion that I missed somewhere
-#ifndef ARCH_64BIT
     uint32_t field_C;
-#endif
     rdVector3 vel;
     float field_1C;
     float field_20;
@@ -2267,9 +2262,6 @@ typedef struct sithThingTrackParams
     rdVector3 field_58;
     rdVector3 field_64;
     rdVector3 orientation;
-#ifdef ARCH_64BIT
-    uint32_t field_C;
-#endif
 } sithThingTrackParams;
 
 typedef struct sithThing