backported fixes for strlcpy overlap (fixes crashes on OSX)
parent
6b45decc2f
commit
04f53aa8bc
|
@ -4638,10 +4638,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));
|
||||
|
|
Loading…
Reference in New Issue