Fix texture type of renderbuffers (was random crap, now is GL_TEXTURE_2D).

[xonotic/darkplaces.git] / model_brush.c

diff --git a/model_brush.c b/model_brush.c
index 9f8d70e122c09f70934d03f78c266caef0a3e5e8..5cc71a7eacd80fd79bb8c4d0136948027b1aefcf 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -2129,7 +2129,7 @@ static void Mod_Q1BSP_ParseWadsFromEntityLump(const char *data)
                                for (i = 0;i < (int)sizeof(value);i++)
                                        if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':')
                                                break;
-                               if (value[i])
+                               if (i < (int)sizeof(value) && value[i])
                                {
                                        for (;i < (int)sizeof(value);i++)
                                        {
@@ -4236,7 +4236,7 @@ static void Mod_Q2BSP_LoadNodes(sizebuf_t *sb)
                out->numsurfaces = (unsigned short)MSG_ReadLittleShort(sb);
                if (out->firstsurface + out->numsurfaces > (unsigned int)loadmodel->num_surfaces)
                {
-                       Con_Printf("Mod_Q2BSP_LoadNodes: invalid surface index range %i+%i (file has only %i surfaces)\n", p, out->firstsurface, out->numsurfaces, loadmodel->num_surfaces);
+                       Con_Printf("Mod_Q2BSP_LoadNodes: invalid surface index range %i+%i (file has only %i surfaces)\n", out->firstsurface, out->numsurfaces, loadmodel->num_surfaces);
                        out->firstsurface = 0;
                        out->numsurfaces = 0;
                }
@@ -5126,10 +5126,9 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
 
        for (i = 0;i < count;i++)
        {
-               strlcpy (out[i].name, in[i].name, sizeof (out[i].name));
                out[i].surfaceflags = LittleLong(in[i].surfaceflags);
                out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
-               Mod_LoadTextureFromQ3Shader(out + i, out[i].name, true, true, TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS);
+               Mod_LoadTextureFromQ3Shader(out + i, in[i].name, true, true, TEXF_MIPMAP | TEXF_ISWORLD | TEXF_PICMIP | TEXF_COMPRESS);
                // restore the surfaceflags and supercontents
                out[i].surfaceflags = LittleLong(in[i].surfaceflags);
                out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));