diff --git a/codemp/client/FxScheduler.cpp b/codemp/client/FxScheduler.cpp index b89af91..e25c0da 100644 --- a/codemp/client/FxScheduler.cpp +++ b/codemp/client/FxScheduler.cpp @@ -262,7 +262,7 @@ int CFxScheduler::RegisterEffect( const char *file, bool bHasCorrectPath /*= fal char sfile[MAX_QPATH]; COM_StripExtension( file, sfile ); - strlwr(sfile); + Q_strlwr(sfile); Com_DPrintf("Registering effect : %s\n", sfile); diff --git a/codemp/client/snd_dma.cpp b/codemp/client/snd_dma.cpp index da1472e..7288d15 100644 --- a/codemp/client/snd_dma.cpp +++ b/codemp/client/snd_dma.cpp @@ -851,7 +851,7 @@ sfx_t *S_FindName( const char *name ) { sfx = &s_knownSfx[i]; memset (sfx, 0, sizeof(*sfx)); Q_strncpyz(sfx->sSoundName, sSoundNameNoExt, sizeof(sfx->sSoundName)); - strlwr(sfx->sSoundName);//force it down low + Q_strlwr(sfx->sSoundName);//force it down low sfx->next = sfxHash[hash]; sfxHash[hash] = sfx; diff --git a/codemp/client/snd_mem.cpp b/codemp/client/snd_mem.cpp index 5cef22c..121bdf6 100644 --- a/codemp/client/snd_mem.cpp +++ b/codemp/client/snd_mem.cpp @@ -744,7 +744,7 @@ static sboolean S_LoadSound_Actual( sfx_t *sfx ) // make up a local filename to try wav/mp3 substitutes... // Q_strncpyz(sLoadName, sfx->sSoundName, sizeof(sLoadName)); - strlwr( sLoadName ); + Q_strlwr( sLoadName ); // // Ensure name has an extension (which it must have, but you never know), and get ptr to it... // diff --git a/codemp/client/snd_music.cpp b/codemp/client/snd_music.cpp index 1036095..0a0a8a1 100644 --- a/codemp/client/snd_music.cpp +++ b/codemp/client/snd_music.cpp @@ -799,7 +799,7 @@ sboolean Music_DynamicDataAvailable(const char *psDynamicMusicLabel) { char sLevelName[MAX_QPATH]; Q_strncpyz(sLevelName,COM_SkipPath( const_cast( (psDynamicMusicLabel&&psDynamicMusicLabel[0])?psDynamicMusicLabel:gsLevelNameFromServer.c_str() ) ),sizeof(sLevelName)); - strlwr(sLevelName); + Q_strlwr(sLevelName); if (strlen(sLevelName)) // avoid error messages when there's no music waiting to be played and we try and restart it... { diff --git a/codemp/qcommon/stringed_ingame.cpp b/codemp/qcommon/stringed_ingame.cpp index 488c0a0..caf547e 100644 --- a/codemp/qcommon/stringed_ingame.cpp +++ b/codemp/qcommon/stringed_ingame.cpp @@ -896,7 +896,7 @@ static LPCSTR SE_GetFoundFile( string &strResult ) strResult.erase(); } -// strlwr(sTemp); // just for consistancy and set<> -> set<> erasure checking etc +// Q_strlwr(sTemp); // just for consistancy and set<> -> set<> erasure checking etc return sTemp; } diff --git a/codemp/unix/linux_glimp.c b/codemp/unix/linux_glimp.c index a2449b8..13ab8d6 100644 --- a/codemp/unix/linux_glimp.c +++ b/codemp/unix/linux_glimp.c @@ -1283,7 +1283,7 @@ void GLimp_Init( void ) // chipset specific configuration // strcpy( buf, glConfig.renderer_string ); - strlwr( buf ); + Q_strlwr( buf ); // // NOTE: if changing cvars, do it within this block. This allows them diff --git a/codemp/unix/linux_local.h b/codemp/unix/linux_local.h index 776d27f..90d7140 100644 --- a/codemp/unix/linux_local.h +++ b/codemp/unix/linux_local.h @@ -25,5 +25,3 @@ void QGL_Shutdown( void ); // bk001130 - win32 // void IN_JoystickCommands (void); - -char *strlwr (char *s); diff --git a/codemp/unix/unix_shared.cpp b/codemp/unix/unix_shared.cpp index f992276..0c75485 100644 --- a/codemp/unix/unix_shared.cpp +++ b/codemp/unix/unix_shared.cpp @@ -86,18 +86,6 @@ void Sys_Mkdir( const char *path ) mkdir (path, 0777); } -char *strlwr (char *s) { - if ( s==NULL ) { // bk001204 - paranoia - assert(0); - return s; - } - while (*s) { - *s = tolower(*s); - s++; - } - return s; // bk001204 - duh -} - //============================================ #define MAX_FOUND_FILES 0x1000 diff --git a/codemp/win32/win_filecode.cpp b/codemp/win32/win_filecode.cpp index a1ba9a8..ebd308b 100644 --- a/codemp/win32/win_filecode.cpp +++ b/codemp/win32/win_filecode.cpp @@ -70,7 +70,7 @@ int _buildFileList(const char* path, bool insert, bool buildList) if(insert || buildList) { // Regular file -- add it to the table - strlwr(full); + Q_strlwr(full); unsigned int code = crc32(0, (const byte *)full, strlen(full)); FileInfo info; @@ -286,7 +286,7 @@ int Sys_GetFileCode(const char* name) char* osname = FS_BuildOSPath(name); // Generate hash for file name - strlwr(osname); + Q_strlwr(osname); unsigned int code = crc32(0, (const byte *)osname, strlen(osname)); // Check if the file exists