nzp-team/quakespasm
0
0
Fork 0
mirror of https://github.com/nzp-team/quakespasm.git synced 2024-11-21 19:31:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

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

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);