okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2

Browse source 
Conflicts:
	Makefile
	code/renderercommon/qgl.h
	code/renderergl1/tr_local.h
	code/sdl/sdl_glimp.c
This commit is contained in:
Tim Angus 2013-05-08 14:27:15 +01:00
commit d9d52f0306
427 changed files with 66082 additions and 14083 deletions
Download patch file Download diff file Expand all files Collapse all files

6
code/client/cl_keys.c
View file

@ -808,7 +808,7 @@ int Key_StringToKeynum( char *str ) {
return -1;
}
if ( !str[1] ) {
return str[0];
return tolower( str[0] );
}
// check for hex code
@ -1001,9 +1001,9 @@ void Key_Bind_f (void)
if (c == 2)
{
if (keys[b].binding)
Com_Printf ("\"%s\" = \"%s\"\n", Cmd_Argv(1), keys[b].binding );
Com_Printf ("\"%s\" = \"%s\"\n", Key_KeynumToString(b), keys[b].binding );
else
Com_Printf ("\"%s\" is not bound\n", Cmd_Argv(1) );
Com_Printf ("\"%s\" is not bound\n", Key_KeynumToString(b) );
return;
}