From 4997c4764a5c1a2963080ae8f92d82d966a132a8 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Fri, 24 Aug 2007 00:04:08 +0000
Subject: [PATCH] * (bug 3112) Removal of QVM name obfuscation (TsT
 <tst2006@gmail.com>) * Add developer warning when texture loading falls back
 on jpg from tga * Remove uppercase extension hack from texture loading since
 the Q3 pk3   file system is case insensitive anyway and you would likely want
 to   know about the failures when loading images from the native FS

---
 code/qcommon/files.c     | 28 +++-------------------------
 code/renderer/tr_image.c | 18 +++++-------------
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/code/qcommon/files.c b/code/qcommon/files.c
index f975f27d..1e2ae48c 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@@ -972,22 +972,6 @@ qboolean FS_FilenameCompare( const char *s1, const char *s2 ) {
 	return qfalse;		// strings are equal
 }
 
-/*
-===========
-FS_ShiftedStrStr
-===========
-*/
-char *FS_ShiftedStrStr(const char *string, const char *substring, int shift) {
-	char buf[MAX_STRING_TOKENS];
-	int i;
-
-	for (i = 0; substring[i]; i++) {
-		buf[i] = substring[i] + shift;
-	}
-	buf[i] = '\0';
-	return strstr(string, buf);
-}
-
 /*
 ===========
 FS_FOpenFileRead
@@ -1123,19 +1107,13 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF
 						}
 					}
 
-					// qagame.qvm	- 13
-					// dTZT`X!di`
-					if (!(pak->referenced & FS_QAGAME_REF) && FS_ShiftedStrStr(filename, "dTZT`X!di`", 13)) {
+					if (!(pak->referenced & FS_QAGAME_REF) && strstr(filename, "game.qvm")) {
 						pak->referenced |= FS_QAGAME_REF;
 					}
-					// cgame.qvm	- 7
-					// \`Zf^'jof
-					if (!(pak->referenced & FS_CGAME_REF) && FS_ShiftedStrStr(filename , "\\`Zf^'jof", 7)) {
+					if (!(pak->referenced & FS_CGAME_REF) && strstr(filename, "cgame.qvm")) {
 						pak->referenced |= FS_CGAME_REF;
 					}
-					// ui.qvm		- 5
-					// pd)lqh
-					if (!(pak->referenced & FS_UI_REF) && FS_ShiftedStrStr(filename , "pd)lqh", 5)) {
+					if (!(pak->referenced & FS_UI_REF) && strstr(filename, "ui.qvm")) {
 						pak->referenced |= FS_UI_REF;
 					}
 
diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index e6990b98..609b8b26 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -4405,11 +4405,14 @@ void R_LoadImage( const char *name, byte **pic, int *width, int *height ) {
 		if (!*pic) {
 			// try jpg in place of tga 
 			char altname[MAX_QPATH];
+
 			strcpy( altname, name );
 			len = strlen( altname );
 			altname[len-3] = 'j';
 			altname[len-2] = 'p';
 			altname[len-1] = 'g';
+
+			ri.Printf( PRINT_DEVELOPER, "WARNING: %s failed, trying %s\n", name, altname );
 			LoadJPG( altname, pic, width, height );
 		}
 	}
@@ -4477,19 +4480,8 @@ image_t	*R_FindImageFile( const char *name, qboolean mipmap, qboolean allowPicmi
 	// load the pic from disk
 	//
 	R_LoadImage( name, &pic, &width, &height );
-	if ( pic == NULL ) {                                    // if we dont get a successful load
-	  char altname[MAX_QPATH];                              // copy the name
-    int len;                                              //  
-    strcpy( altname, name );                              //
-    len = strlen( altname );                              // 
-    altname[len-3] = toupper(altname[len-3]);             // and try upper case extension for unix systems
-    altname[len-2] = toupper(altname[len-2]);             //
-    altname[len-1] = toupper(altname[len-1]);             //
-		ri.Printf( PRINT_DEVELOPER, "trying %s...\n", altname );    // 
-	  R_LoadImage( altname, &pic, &width, &height );        //
-    if (pic == NULL) {                                    // if that fails
-      return NULL;                                        // bail
-    }
+	if ( pic == NULL ) {
+		return NULL;
 	}
 
 	image = R_CreateImage( ( char * ) name, pic, width, height, mipmap, allowPicmip, glWrapClampMode );