mirror of
https://github.com/ioquake/jedi-academy.git
synced 2024-11-25 21:51:04 +00:00
strlwr -> Q_strlwr
This commit is contained in:
parent
3b0e200e4f
commit
46c9f91703
9 changed files with 8 additions and 22 deletions
|
@ -262,7 +262,7 @@ int CFxScheduler::RegisterEffect( const char *file, bool bHasCorrectPath /*= fal
|
||||||
char sfile[MAX_QPATH];
|
char sfile[MAX_QPATH];
|
||||||
|
|
||||||
COM_StripExtension( file, sfile );
|
COM_StripExtension( file, sfile );
|
||||||
strlwr(sfile);
|
Q_strlwr(sfile);
|
||||||
|
|
||||||
Com_DPrintf("Registering effect : %s\n", sfile);
|
Com_DPrintf("Registering effect : %s\n", sfile);
|
||||||
|
|
||||||
|
|
|
@ -851,7 +851,7 @@ sfx_t *S_FindName( const char *name ) {
|
||||||
sfx = &s_knownSfx[i];
|
sfx = &s_knownSfx[i];
|
||||||
memset (sfx, 0, sizeof(*sfx));
|
memset (sfx, 0, sizeof(*sfx));
|
||||||
Q_strncpyz(sfx->sSoundName, sSoundNameNoExt, sizeof(sfx->sSoundName));
|
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];
|
sfx->next = sfxHash[hash];
|
||||||
sfxHash[hash] = sfx;
|
sfxHash[hash] = sfx;
|
||||||
|
|
|
@ -744,7 +744,7 @@ static sboolean S_LoadSound_Actual( sfx_t *sfx )
|
||||||
// make up a local filename to try wav/mp3 substitutes...
|
// make up a local filename to try wav/mp3 substitutes...
|
||||||
//
|
//
|
||||||
Q_strncpyz(sLoadName, sfx->sSoundName, sizeof(sLoadName));
|
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...
|
// Ensure name has an extension (which it must have, but you never know), and get ptr to it...
|
||||||
//
|
//
|
||||||
|
|
|
@ -799,7 +799,7 @@ sboolean Music_DynamicDataAvailable(const char *psDynamicMusicLabel)
|
||||||
{
|
{
|
||||||
char sLevelName[MAX_QPATH];
|
char sLevelName[MAX_QPATH];
|
||||||
Q_strncpyz(sLevelName,COM_SkipPath( const_cast<char*>( (psDynamicMusicLabel&&psDynamicMusicLabel[0])?psDynamicMusicLabel:gsLevelNameFromServer.c_str() ) ),sizeof(sLevelName));
|
Q_strncpyz(sLevelName,COM_SkipPath( const_cast<char*>( (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...
|
if (strlen(sLevelName)) // avoid error messages when there's no music waiting to be played and we try and restart it...
|
||||||
{
|
{
|
||||||
|
|
|
@ -896,7 +896,7 @@ static LPCSTR SE_GetFoundFile( string &strResult )
|
||||||
strResult.erase();
|
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;
|
return sTemp;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1283,7 +1283,7 @@ void GLimp_Init( void )
|
||||||
// chipset specific configuration
|
// chipset specific configuration
|
||||||
//
|
//
|
||||||
strcpy( buf, glConfig.renderer_string );
|
strcpy( buf, glConfig.renderer_string );
|
||||||
strlwr( buf );
|
Q_strlwr( buf );
|
||||||
|
|
||||||
//
|
//
|
||||||
// NOTE: if changing cvars, do it within this block. This allows them
|
// NOTE: if changing cvars, do it within this block. This allows them
|
||||||
|
|
|
@ -25,5 +25,3 @@ void QGL_Shutdown( void );
|
||||||
|
|
||||||
// bk001130 - win32
|
// bk001130 - win32
|
||||||
// void IN_JoystickCommands (void);
|
// void IN_JoystickCommands (void);
|
||||||
|
|
||||||
char *strlwr (char *s);
|
|
||||||
|
|
|
@ -86,18 +86,6 @@ void Sys_Mkdir( const char *path )
|
||||||
mkdir (path, 0777);
|
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
|
#define MAX_FOUND_FILES 0x1000
|
||||||
|
|
|
@ -70,7 +70,7 @@ int _buildFileList(const char* path, bool insert, bool buildList)
|
||||||
if(insert || buildList)
|
if(insert || buildList)
|
||||||
{
|
{
|
||||||
// Regular file -- add it to the table
|
// Regular file -- add it to the table
|
||||||
strlwr(full);
|
Q_strlwr(full);
|
||||||
unsigned int code = crc32(0, (const byte *)full, strlen(full));
|
unsigned int code = crc32(0, (const byte *)full, strlen(full));
|
||||||
|
|
||||||
FileInfo info;
|
FileInfo info;
|
||||||
|
@ -286,7 +286,7 @@ int Sys_GetFileCode(const char* name)
|
||||||
char* osname = FS_BuildOSPath(name);
|
char* osname = FS_BuildOSPath(name);
|
||||||
|
|
||||||
// Generate hash for file name
|
// Generate hash for file name
|
||||||
strlwr(osname);
|
Q_strlwr(osname);
|
||||||
unsigned int code = crc32(0, (const byte *)osname, strlen(osname));
|
unsigned int code = crc32(0, (const byte *)osname, strlen(osname));
|
||||||
|
|
||||||
// Check if the file exists
|
// Check if the file exists
|
||||||
|
|
Loading…
Reference in a new issue