fix crash when loading progs/null.spr in nehahra, which has 0x0 size

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7249 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/model_sprite.c b/model_sprite.c
index 506b00e3f8db2c5f94bd1b3d43056385115eba6b..623243d7c1781b6986aa36eec67effac8b28fe91 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -170,24 +170,30 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
                        if (modelradius < x + y)
                                modelradius = x + y;
 
                        if (modelradius < x + y)
                                modelradius = x + y;
 

-                       if (width > 0 && height > 0 && cls.state != ca_dedicated)
+                       if (cls.state != ca_dedicated)

                        {
                                skinframe = NULL;
                        {
                                skinframe = NULL;

-                               if (groupframes > 1)
-                                       sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
-                               else
-                                       sprintf (name, "%s_%i", loadmodel->name, i);
-                               if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags, false)))
+                               // note: Nehahra's null.spr has width == 0 and height == 0
+                               if (width > 0 && height > 0)

                                {
                                        if (groupframes > 1)
                                {
                                        if (groupframes > 1)

-                                               sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j);
+                                               sprintf (name, "%s_%i_%i", loadmodel->name, i, j);

                                        else
                                        else

-                                               sprintf (fogname, "%s_%ifog", loadmodel->name, i);
-                                       if (version == SPRITE32_VERSION)
-                                               skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 32, NULL, NULL);
-                                       else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
-                                               skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 8, palette, alphapalette);
+                                               sprintf (name, "%s_%i", loadmodel->name, i);
+                                       if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags, false)))
+                                       {
+                                               if (groupframes > 1)
+                                                       sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j);
+                                               else
+                                                       sprintf (fogname, "%s_%ifog", loadmodel->name, i);
+                                               if (version == SPRITE32_VERSION)
+                                                       skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 32, NULL, NULL);
+                                               else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
+                                                       skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 8, palette, alphapalette);
+                                       }

                                }
                                }

+                               if (skinframe == NULL)
+                                       skinframe = R_SkinFrame_LoadMissing();

                                Mod_SpriteSetupTexture(&loadmodel->data_textures[realframes], skinframe, fullbright, additive);
                        }
 
                                Mod_SpriteSetupTexture(&loadmodel->data_textures[realframes], skinframe, fullbright, additive);
                        }