Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-06 19:01:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Load JPEG before TGA

Browse source
This commit is contained in:
OM 2023-05-22 02:16:21 +02:00
parent 86e7a24b38
commit 9e7991f4b1
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
code/renderer/tr_image.c
View file

@ -2085,7 +2085,7 @@ Loads any of the supported image types into a cannonical
================= =================
*/ */
static void R_LoadImage(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) { static void R_LoadImage(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) {
int len; size_t len;
char tempName[MAX_STRING_TOKENS + 1]; char tempName[MAX_STRING_TOKENS + 1];
*hasAlpha = qfalse; *hasAlpha = qfalse;
@ -2099,17 +2099,23 @@ static void R_LoadImage(const char* name, byte** pic, int* width, int* height, q
return; return;
} }
if (!Q_stricmp(name + len - 4, ".tga")) { if (!Q_stricmp(name + len - 4, ".tga") || !Q_stricmp(name + len - 4, ".jpg")) {
LoadTGA(name, pic, width, height); // try tga first char altname[MAX_QPATH];
if (!*pic) { // strcpy(altname, name);
char altname[MAX_QPATH]; // try jpg in place of tga if (r_loadjpg->integer) {
strcpy(altname, name);
len = strlen(altname); len = strlen(altname);
altname[len - 3] = 'j'; altname[len - 3] = 'j';
altname[len - 2] = 'p'; altname[len - 2] = 'p';
altname[len - 1] = 'g'; altname[len - 1] = 'g';
// try jpg first
LoadJPG(altname, pic, width, height); LoadJPG(altname, pic, width, height);
} }
if (!*pic) {
altname[len - 3] = 't';
altname[len - 2] = 'g';
altname[len - 1] = 'a';
LoadTGA(name, pic, width, height);
}
*piMipmapsAvailable = 1; *piMipmapsAvailable = 1;
} }
else if (!Q_stricmp(name + len - 4, ".pcx")) { else if (!Q_stricmp(name + len - 4, ".pcx")) {
@ -2171,7 +2177,7 @@ image_t* R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip
if (image->allowPicmip != allowPicmip) { if (image->allowPicmip != allowPicmip) {
ri.Printf(PRINT_DEVELOPER, "WARNING: reused image %s with mixed allowPicmip parm\n", name); ri.Printf(PRINT_DEVELOPER, "WARNING: reused image %s with mixed allowPicmip parm\n", name);
} }
if (image->wrapClampModeX != glWrapClampModeX || image != glWrapClampModeY) { if (image->wrapClampModeX != glWrapClampModeX || image->wrapClampModeY != glWrapClampModeY) {
ri.Printf(PRINT_ALL, "WARNING: reused image %s with mixed glWrapClampMode parm\n", name); ri.Printf(PRINT_ALL, "WARNING: reused image %s with mixed glWrapClampMode parm\n", name);
} }
} }