diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-08-24 00:04:08 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-08-24 00:04:08 +0000 |
| commit | f59b4fa3759152490983b6123595d5a29cb8f034 (patch) | |
| tree | 2b3fc6ee912dad0867aac135486d43e9cf22e782 /code/qcommon/files.c | |
| parent | 78d87c0cc47dd707ff556e3926c9a32f8a77f5db (diff) | |
| download | ioquake3-aero-f59b4fa3759152490983b6123595d5a29cb8f034.tar.gz ioquake3-aero-f59b4fa3759152490983b6123595d5a29cb8f034.zip | |
* (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
git-svn-id: svn://svn.icculus.org/quake3/trunk@1133 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/qcommon/files.c')
| -rw-r--r-- | code/qcommon/files.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/code/qcommon/files.c b/code/qcommon/files.c index f975f27..1e2ae48 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -974,22 +974,6 @@ qboolean FS_FilenameCompare( const char *s1, const char *s2 ) { /* =========== -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 Finds the file in the search path. @@ -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; } |