vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'next' into music-credits

Browse source
This commit is contained in:
TehRealSalt 2019-01-10 01:14:02 -05:00
parent 37e79ebfbd 41c32be673
commit 5b05eff41f
1 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/hardware/hw_md2.c
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)
{ {
@ -816,12 +830,16 @@ void HWR_InitMD2(void)
//Filename checking fixed ~Monster Iestyn and Golden //Filename checking fixed ~Monster Iestyn and Golden
f = fopen(va("%s"PATHSEP"%s", srb2home, "kmd2.dat"), "rt"); f = fopen(va("%s"PATHSEP"%s", srb2home, "kmd2.dat"), "rt");
if (!f)
{
f = fopen(va("%s"PATHSEP"%s", srb2path, "kmd2.dat"), "rt");
if (!f) if (!f)
{ {
CONS_Printf("%s %s\n", M_GetText("Error while loading kmd2.dat:"), strerror(errno)); CONS_Printf("%s %s\n", M_GetText("Error while loading kmd2.dat:"), strerror(errno));
nomd2s = true; nomd2s = true;
return; return;
} }
}
while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4) while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
{ {
if (stricmp(name, "PLAY") == 0) if (stricmp(name, "PLAY") == 0)
@ -885,10 +903,14 @@ void HWR_AddPlayerMD2(int skin) // For MD2's that were added after startup
if (!f) if (!f)
{ {
CONS_Printf("Error while loading kmd2.dat\n"); f = fopen(va("%s"PATHSEP"%s", srb2path, "kmd2.dat"), "rt");
if (!f)
{
CONS_Printf("%s %s\n", M_GetText("Error while loading kmd2.dat:"), strerror(errno));
nomd2s = true; nomd2s = true;
return; return;
} }
}
// Check for any MD2s that match the names of player skins! // Check for any MD2s that match the names of player skins!
while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4) while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
@ -931,10 +953,14 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
if (!f) if (!f)
{ {
CONS_Printf("Error while loading kmd2.dat\n"); f = fopen(va("%s"PATHSEP"%s", srb2path, "kmd2.dat"), "rt");
if (!f)
{
CONS_Printf("%s %s\n", M_GetText("Error while loading kmd2.dat:"), strerror(errno));
nomd2s = true; nomd2s = true;
return; return;
} }
}
// Check for any MD2s that match the names of player skins! // Check for any MD2s that match the names of player skins!
while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4) while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)