curl: longer URLs

[xonotic/darkplaces.git] / model_sprite.c

diff --git a/model_sprite.c b/model_sprite.c
index ed618b5311cce6e7f1314e1afd938a1c8f16d928..0c27bc21801f886e2073289942ed0dc977f59e0c 100644 (file)
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -148,7 +148,7 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
                                Host_Error("Mod_Sprite_SharedSetup: invalid interval");
                }
 
-               sprintf(loadmodel->animscenes[i].name, "frame %i", i);
+               dpsnprintf(loadmodel->animscenes[i].name, sizeof(loadmodel->animscenes[i].name), "frame %i", i);
                loadmodel->animscenes[i].firstframe = realframes;
                loadmodel->animscenes[i].framecount = groupframes;
                loadmodel->animscenes[i].framerate = 1.0f / interval;
@@ -182,13 +182,13 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
                                {
                                        if (groupframes > 1)
                                        {
-                                               sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
-                                               sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j);
+                                               dpsnprintf (name, sizeof(name), "%s_%i_%i", loadmodel->name, i, j);
+                                               dpsnprintf (fogname, sizeof(fogname), "%s_%i_%ifog", loadmodel->name, i, j);
                                        }
                                        else
                                        {
-                                               sprintf (name, "%s_%i", loadmodel->name, i);
-                                               sprintf (fogname, "%s_%ifog", loadmodel->name, i);
+                                               dpsnprintf (name, sizeof(name), "%s_%i", loadmodel->name, i);
+                                               dpsnprintf (fogname, sizeof(fogname), "%s_%ifog", loadmodel->name, i);
                                        }
                                        if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags | TEXF_COMPRESS, false)))
                                        {
@@ -197,10 +197,10 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
                                                {
                                                        for (x = 0;x < width*height;x++)
                                                        {
-                                                               pixels[i*4+2] = datapointer[i*4+0];
-                                                               pixels[i*4+1] = datapointer[i*4+1];
-                                                               pixels[i*4+0] = datapointer[i*4+2];
-                                                               pixels[i*4+3] = datapointer[i*4+3];
+                                                               pixels[x*4+2] = datapointer[x*4+0];
+                                                               pixels[x*4+1] = datapointer[x*4+1];
+                                                               pixels[x*4+0] = datapointer[x*4+2];
+                                                               pixels[x*4+3] = datapointer[x*4+3];
                                                        }
                                                }
                                                else //if (version == SPRITEHL_VERSION || version == SPRITE_VERSION)
@@ -233,7 +233,7 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
 }
 
 extern void R_Model_Sprite_Draw(entity_render_t *ent);
-void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)
+void Mod_IDSP_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
        int version;
        const unsigned char *datapointer;
@@ -343,7 +343,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)
 }
 
 
-void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
+void Mod_IDS2_Load(dp_model_t *mod, void *buffer, void *bufferend)
 {
        int i, version, fullbright;
        const dsprite2_t *pinqsprite;