refine edge cases handling to keynums/keystrings,

[xonotic/darkplaces.git] / model_alias.c

diff --git a/model_alias.c b/model_alias.c
index b9990beb6b28e5dd6e9c20082cbc99d567fa3c0a..46375f962f0798e04917d777590fd81b2ca5b4e7 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -3073,6 +3073,8 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
                        biggestorigin = max(biggestorigin, fabs(k->origin[2]));
                }
                loadmodel->num_posescale = biggestorigin / 32767.0f;
+               if (loadmodel->num_posescale == 0) // don't divide by zero
+                       loadmodel->num_posescale = 1.0;
                loadmodel->num_poseinvscale = 1.0f / loadmodel->num_posescale;
        
                // load the poses from the animkeys
@@ -3112,6 +3114,8 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
                        biggestorigin = max(biggestorigin, fabs(p->basepose.origin[2]));
                }
                loadmodel->num_posescale = biggestorigin / 32767.0f;
+               if (loadmodel->num_posescale == 0) // don't divide by zero
+                       loadmodel->num_posescale = 1.0;
                loadmodel->num_poseinvscale = 1.0f / loadmodel->num_posescale;
        
                // load the basepose as a frame
@@ -3894,8 +3898,8 @@ void Mod_INTERQUAKEMODEL_Load(model_t *mod, void *buffer, void *bufferend)
                loadmodel->PointSuperContents = Mod_CollisionBIH_PointSuperContents_Mesh;
        }
 
-       if (joint        ) Mem_Free(joint        );joint         = NULL;
-       if (joint1       ) Mem_Free(joint1       );joint1        = NULL;
-       if (pose         ) Mem_Free(pose         );pose          = NULL;
-       if (pose1        ) Mem_Free(pose1        );pose1         = NULL;
+       if (joint)  { Mem_Free(joint);  joint  = NULL; }
+       if (joint1) { Mem_Free(joint1); joint1 = NULL; }
+       if (pose)   { Mem_Free(pose);   pose   = NULL; }
+       if (pose1)  { Mem_Free(pose1);  pose1  = NULL; }
 }