sithThing de-inlining and renaming

shinyquagsire23 · Dec 6, 2024 · 62771dd · 62771dd
1 parent 4512b0e
commit 62771dd
Show file tree

Hide file tree

Showing 6 changed files with 175 additions and 209 deletions.
diff --git a/src/Dss/sithDSSThing.c b/src/Dss/sithDSSThing.c
@@ -198,6 +198,7 @@ int sithDSSThing_ProcessSyncThing(sithCogMsg *msg)
     if ( !pThing )
         return 0;
 
+    // 1 for multiplayer hackfix:
 #if 0
     // Added: why is this needed???
     if (!pThing->thingtype && pThing->type)
@@ -996,7 +997,7 @@ int sithDSSThing_ProcessFullDesc(sithCogMsg *msg)
     if ( v8 >= sithWorld_pCurrentWorld->numTemplatesLoaded )
         return 0;
 
-    sithThing_sub_4CD8A0(thing, &sithWorld_pCurrentWorld->templates[v8]);
+    sithThing_InstantiateFromTemplate(thing, &sithWorld_pCurrentWorld->templates[v8]);
 
     thing->signature = NETMSG_POPS32();
     thing->thing_id = NETMSG_POPS32();

diff --git a/src/Primitives/rdMatrix.c b/src/Primitives/rdMatrix.c
@@ -420,17 +420,17 @@ void rdMatrix_Identity44(rdMatrix44 *out)
     _memcpy(out, &rdroid_identMatrix44, sizeof(*out));
 }
 
-void rdMatrix_Copy34(rdMatrix34 *dst, rdMatrix34 *src)
+void rdMatrix_Copy34(rdMatrix34 *dst, const rdMatrix34 *src)
 {
     _memcpy(dst, src, sizeof(rdMatrix34));
 }
 
-void rdMatrix_Copy44(rdMatrix44 *dst, rdMatrix44 *src)
+void rdMatrix_Copy44(rdMatrix44 *dst, const rdMatrix44 *src)
 {
     _memcpy(dst, src, sizeof(rdMatrix44));
 }
 
-void rdMatrix_Copy34to44(rdMatrix44 *dst, rdMatrix34 *src)
+void rdMatrix_Copy34to44(rdMatrix44 *dst, const rdMatrix34 *src)
 {
     dst->vA.x = src->rvec.x;
     dst->vB.x = src->lvec.x;
@@ -450,7 +450,7 @@ void rdMatrix_Copy34to44(rdMatrix44 *dst, rdMatrix34 *src)
     dst->vD.w = 1.0;
 }
 
-void rdMatrix_Copy44to34(rdMatrix34 *dst, rdMatrix44 *src)
+void rdMatrix_Copy44to34(rdMatrix34 *dst, const rdMatrix44 *src)
 {
     dst->rvec.x = src->vA.x;
     dst->rvec.y = src->vA.y;
@@ -466,7 +466,7 @@ void rdMatrix_Copy44to34(rdMatrix34 *dst, rdMatrix44 *src)
     dst->scale.z = src->vD.z;
 }
 
-void rdMatrix_Transpose44(rdMatrix44 *out, rdMatrix44 *src)
+void rdMatrix_Transpose44(rdMatrix44 *out, const rdMatrix44 *src)
 {
     rdMatrix44 tmp;
 
@@ -532,7 +532,7 @@ void rdMatrix_Multiply34(rdMatrix34 *out, const rdMatrix34 *mat1, const rdMatrix
                    + mat1->scale.z;
 }
 
-void rdMatrix_Multiply44(rdMatrix44 *out, rdMatrix44 *mat1, rdMatrix44 *mat2)
+void rdMatrix_Multiply44(rdMatrix44 *out, const rdMatrix44 *mat1, const rdMatrix44 *mat2)
 {
     out->vA.x = mat2->vA.y * mat1->vB.x + mat1->vD.x * mat2->vA.w + mat1->vC.x * mat2->vA.z + mat2->vA.x * mat1->vA.x;
     out->vA.y = mat1->vA.y * mat2->vA.x + mat1->vC.y * mat2->vA.z + mat1->vD.y * mat2->vA.w + mat1->vB.y * mat2->vA.y;

diff --git a/src/Primitives/rdMatrix.h b/src/Primitives/rdMatrix.h
@@ -80,13 +80,13 @@ void rdMatrix_ExtractAngles34(const rdMatrix34 *in, rdVector3 *out);
 void rdMatrix_Normalize34(rdMatrix34 *m);
 void rdMatrix_Identity34(rdMatrix34 *out);
 void rdMatrix_Identity44(rdMatrix44 *out);
-void rdMatrix_Copy34(rdMatrix34 *dst, rdMatrix34 *src);
-void rdMatrix_Copy44(rdMatrix44 *dst, rdMatrix44 *src);
-void rdMatrix_Copy34to44(rdMatrix44 *dst, rdMatrix34 *src);
-void rdMatrix_Copy44to34(rdMatrix34 *dst, rdMatrix44 *src);
-void rdMatrix_Transpose44(rdMatrix44 *out, rdMatrix44 *src);
+void rdMatrix_Copy34(rdMatrix34 *dst, const rdMatrix34 *src);
+void rdMatrix_Copy44(rdMatrix44 *dst, const rdMatrix44 *src);
+void rdMatrix_Copy34to44(rdMatrix44 *dst, const rdMatrix34 *src);
+void rdMatrix_Copy44to34(rdMatrix34 *dst, const rdMatrix44 *src);
+void rdMatrix_Transpose44(rdMatrix44 *out, const rdMatrix44 *src);
 void rdMatrix_Multiply34(rdMatrix34 *out, const rdMatrix34 *mat1, const rdMatrix34 *mat2);
-void rdMatrix_Multiply44(rdMatrix44 *out, rdMatrix44 *mat1, rdMatrix44 *mat2);
+void rdMatrix_Multiply44(rdMatrix44 *out, const rdMatrix44 *mat1, const rdMatrix44 *mat2);
 void rdMatrix_PreMultiply34(rdMatrix34 *mat1, rdMatrix34 *mat2);
 void rdMatrix_PreMultiply44(rdMatrix44 *mat1, rdMatrix44 *mat2);
 void rdMatrix_PostMultiply34(rdMatrix34 *mat1, rdMatrix34 *mat2);

diff --git a/src/World/sithTemplate.c b/src/World/sithTemplate.c
@@ -162,7 +162,7 @@ sithThing* sithTemplate_CreateEntry(sithWorld *world)
 
     sithThing_DoesRdThingInit(&tmp);
     result = stdHashTable_GetKeyVal(sithTemplate_hashmap, stdConffile_entry.args[1].value);
-    sithThing_sub_4CD8A0(&tmp, result);
+    sithThing_InstantiateFromTemplate(&tmp, result);
 
     _strncpy(tmp.template_name, stdConffile_entry.args[0].value, 0x1Fu);
     tmp.template_name[31] = 0;