const fixes

codemp/client/cl_keys.cpp

@@ -724,7 +724,7 @@ static void keyConcatArgs( void ) {
 }
 
 static void ConcatRemaining( const char *src, const char *start ) {
-	char *str;
+	const char *str;
 
 	str = strstr(src, start);
 	if (!str) {
@@ -1023,7 +1023,7 @@ the K_* names are matched up.
 to be configured even if they don't have defined names.
 ===================
 */
-int Key_StringToKeynum( char *str ) {
+int Key_StringToKeynum( const char *str ) {
 	int			i;
 	
 	if ( !str || !str[0] ) 

codemp/client/client.h

@@ -501,7 +501,7 @@ void IN_CenterView (void);
 void CL_VerifyCode( void );
 
 float CL_KeyState (kbutton_t *key);
-int Key_StringToKeynum( char *str );
+int Key_StringToKeynum( const char *str );
 const char *Key_KeynumToString( int keynum/*, qboolean bTranslate */ ); //note: translate is only called for menu display not configs
 
 //

codemp/qcommon/files_pc.cpp

@@ -646,7 +646,7 @@ bool FS_FileCacheable(const char* const filename)
 FS_ShiftedStrStr
 ===========
 */
-char *FS_ShiftedStrStr(const char *string, const char *substring, int shift) {
+const char *FS_ShiftedStrStr(const char *string, const char *substring, int shift) {
 	char buf[MAX_STRING_TOKENS];
 	int i;
 

codemp/qcommon/stringed_ingame.cpp

@@ -751,24 +751,28 @@ void CStringEdPackage::AddEntry( LPCSTR psLocalReference )
 
 LPCSTR Leetify( LPCSTR psString )
 {
-	static string str;
-	str = psString;
 	if (sp_leet->integer == 42)	// very specific test, so you won't hit it accidentally
 	{
 		static const
 		char cReplace[]={	'o','0','l','1','e','3','a','4','s','5','t','7','i','!','h','#',
 							'O','0','L','1','E','3','A','4','S','5','T','7','I','!','H','#'	// laziness because of strchr()
 						};
-
+		static char *str;
 		char *p;
+
+		free(str);
+		str = strdup(psString);
+
 		for (int i=0; i<sizeof(cReplace); i+=2)
 		{
-			while ((p=strchr(str.c_str(),cReplace[i]))!=NULL)
+			while ((p=strchr(str,cReplace[i]))!=NULL)
 				*p = cReplace[i+1];
 		}
-	}
 
-	return str.c_str();
+		return str;
+	} else {
+		return psString;
+	}
 }
 
 

codemp/renderer/tr_image.cpp

@@ -1206,7 +1206,7 @@ image_t *R_CreateImage( const char *name, const byte *pic, int width, int height
 
 	if (name[0] == '*')
 	{
-		char *psLightMapNameSearchPos = strrchr(name,'/');
+		const char *psLightMapNameSearchPos = strrchr(name,'/');
 		if (  psLightMapNameSearchPos && !strncmp( psLightMapNameSearchPos+1, "lightmap", 8 ) ) {
 			isLightmap = qtrue;
 		}

codemp/sdl/sdl_input.cpp

@@ -144,7 +144,7 @@ static qboolean IN_IsConsoleKey( int key, const unsigned char character )
 	// Only parse the variable when it changes
 	if( cl_consoleKeys->modified )
 	{
-		char *text_p, *token;
+		const char *text_p, *token;
 
 		cl_consoleKeys->modified = qfalse;
 		text_p = cl_consoleKeys->string;