nzp-team
/
quakespasm
mirror of https://github.com/nzp-team/quakespasm.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Tyler Young 2023-01-01 20:31:02 -05:00
parent a7b1595985 8da7317c1f
commit 770fb49e68
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
build/* build/*
assets/vita/eboot.bin
*.vpk *.vpk
*.elf *.elf
*.elf.unstripped.elf *.elf.unstripped.elf

BIN
assets/vita/eboot.bin
View File

Binary file not shown.

3
source/image.c
View File

@ -107,8 +107,9 @@ byte *Image_LoadImage (const char *name, int *width, int *height)
q_snprintf (loadfilename, sizeof(loadfilename), "%s.tga", name); q_snprintf (loadfilename, sizeof(loadfilename), "%s.tga", name);
COM_FOpenFile (loadfilename, &f, NULL); COM_FOpenFile (loadfilename, &f, NULL);
if (f) if (f) {
return Image_LoadSTBI (f, width, height); return Image_LoadSTBI (f, width, height);
}
q_snprintf (loadfilename, sizeof(loadfilename), "%s.png", name); q_snprintf (loadfilename, sizeof(loadfilename), "%s.png", name);
COM_FOpenFile (loadfilename, &f, NULL); COM_FOpenFile (loadfilename, &f, NULL);