0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-25 21:31:44 +00:00

Missed a few spots

This commit is contained in:
wolfy852 2019-01-09 15:53:59 -06:00
parent 90148f79eb
commit dbb7267f22

View file

@ -299,10 +299,14 @@ static md2_model_t *md2_readModel(const char *filename)
//Filename checking fixed ~Monster Iestyn and Golden //Filename checking fixed ~Monster Iestyn and Golden
file = fopen(va("%s"PATHSEP"%s", srb2home, filename), "rb"); file = fopen(va("%s"PATHSEP"%s", srb2home, filename), "rb");
if (!file) if (!file)
{
file = fopen(va("%s"PATHSEP"%s", srb2path, filename), "rb");
if (!file)
{ {
free(model); free(model);
return 0; return 0;
} }
}
// initialize model and read header // initialize model and read header
@ -500,7 +504,11 @@ static GrTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_
png_FILE = fopen(pngfilename, "rb"); png_FILE = fopen(pngfilename, "rb");
if (!png_FILE) if (!png_FILE)
{ {
pngfilename = va("%s"PATHSEP"md2"PATHSEP"%s", srb2path, filename);
FIL_ForceExtension(pngfilename, ".png");
png_FILE = fopen(pngfilename, "rb");
//CONS_Debug(DBG_RENDER, "M_SavePNG: Error on opening %s for loading\n", filename); //CONS_Debug(DBG_RENDER, "M_SavePNG: Error on opening %s for loading\n", filename);
if (!png_FILE)
return 0; return 0;
} }
@ -625,10 +633,16 @@ static GrTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
//Filename checking fixed ~Monster Iestyn and Golden //Filename checking fixed ~Monster Iestyn and Golden
char *pcxfilename = va("%s"PATHSEP"md2"PATHSEP"%s", srb2home, filename); char *pcxfilename = va("%s"PATHSEP"md2"PATHSEP"%s", srb2home, filename);
FIL_ForceExtension(pcxfilename, ".pcx");
file = fopen(pcxfilename, "rb");
if (!file)
{
pcxfilename = va("%s"PATHSEP"md2"PATHSEP"%s", srb2path, filename);
FIL_ForceExtension(pcxfilename, ".pcx"); FIL_ForceExtension(pcxfilename, ".pcx");
file = fopen(pcxfilename, "rb"); file = fopen(pcxfilename, "rb");
if (!file) if (!file)
return 0; return 0;
}
if (fread(&header, sizeof (PcxHeader), 1, file) != 1) if (fread(&header, sizeof (PcxHeader), 1, file) != 1)
{ {