stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-03 23:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed MD2 models not loading correctly on Linux

Browse source
This commit is contained in:
GoldenTails 2018-05-13 14:19:36 -05:00 committed by GitHub
parent 8e5ac64d7c
commit e66e0bb20e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/hardware/hw_md2.c
View file

@ -288,7 +288,8 @@ static md2_model_t *md2_readModel(const char *filename)
if (model == NULL) if (model == NULL)
return 0; return 0;
file = fopen(filename, "rb"); //Filename checking fixed ~Monster Iestyn and Golden
file = fopen(va("%s"PATHSEP"%s", srb2home, filename), "rb");
if (!file) if (!file)
{ {
free(model); free(model);
@ -477,7 +478,8 @@ static GrTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_
#endif #endif
#endif #endif
png_FILE_p png_FILE; png_FILE_p png_FILE;
char *pngfilename = va("md2/%s", filename); //Filename checking fixed ~Monster Iestyn and Golden
char *pngfilename = va("%s"PATHSEP"md2"PATHSEP"%s", srb2home, filename);
FIL_ForceExtension(pngfilename, ".png"); FIL_ForceExtension(pngfilename, ".png");
png_FILE = fopen(pngfilename, "rb"); png_FILE = fopen(pngfilename, "rb");
@ -605,7 +607,8 @@ static GrTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
size_t pw, ph, size, ptr = 0; size_t pw, ph, size, ptr = 0;
INT32 ch, rep; INT32 ch, rep;
FILE *file; FILE *file;
char *pcxfilename = va("md2/%s", filename); //Filename checking fixed ~Monster Iestyn and Golden
char *pcxfilename = va("%s"PATHSEP"md2"PATHSEP"%s", srb2home, filename);
FIL_ForceExtension(pcxfilename, ".pcx"); FIL_ForceExtension(pcxfilename, ".pcx");
file = fopen(pcxfilename, "rb"); file = fopen(pcxfilename, "rb");
@ -795,7 +798,8 @@ void HWR_InitMD2(void)
} }
// read the md2.dat file // read the md2.dat file
f = fopen("md2.dat", "rt"); //Filename checking fixed ~Monster Iestyn and Golden
f = fopen(va("%s"PATHSEP"%s", srb2home, "md2.dat"), "rt");
if (!f) if (!f)
{ {
@ -861,7 +865,8 @@ void HWR_AddPlayerMD2(int skin) // For MD2's that were added after startup
CONS_Printf("AddPlayerMD2()...\n"); CONS_Printf("AddPlayerMD2()...\n");
// read the md2.dat file // read the md2.dat file
f = fopen("md2.dat", "rt"); //Filename checking fixed ~Monster Iestyn and Golden
f = fopen(va("%s"PATHSEP"%s", srb2home, "md2.dat"), "rt");
if (!f) if (!f)
{ {
@ -906,7 +911,8 @@ void HWR_AddSpriteMD2(size_t spritenum) // For MD2s that were added after startu
return; return;
// Read the md2.dat file // Read the md2.dat file
f = fopen("md2.dat", "rt"); //Filename checking fixed ~Monster Iestyn and Golden
f = fopen(va("%s"PATHSEP"%s", srb2home, "md2.dat"), "rt");
if (!f) if (!f)
{ {