Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Tyler Young 2023-01-01 20:31:02 -05:00
commit 770fb49e68
3 changed files with 4 additions and 2 deletions

3
.gitignore vendored
View File

@ -1,4 +1,5 @@
build/*
assets/vita/eboot.bin
*.vpk
*.elf
*.elf.unstripped.elf
@ -6,4 +7,4 @@ build/*
*.nro
*.nacl
*.sfo
*.bin
*.bin

Binary file not shown.

View File

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