mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2024-11-10 23:32:06 +00:00
Fixed a bug
This commit is contained in:
parent
5d216907fd
commit
f7acfb9f06
2 changed files with 51 additions and 1 deletions
|
@ -6,6 +6,48 @@
|
|||
--------------------Configuration: ui - Win32 Release TA--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP52B.tmp" with contents
|
||||
[
|
||||
/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /FR"Release_TA/" /Fp"Release_TA/ta_ui.pch" /YX /Fo"Release_TA/" /Fd"Release_TA/" /FD /c
|
||||
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_shared.c"
|
||||
]
|
||||
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP52B.tmp"
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP52C.tmp" with contents
|
||||
[
|
||||
/nologo /base:"0x40000000" /dll /incremental:no /pdb:"Release_TA/uix86.pdb" /map:"Release_TA/uix86.map" /machine:I386 /def:".\ui.def" /out:"../Release/uix86.dll" /implib:"Release_TA/uix86.lib"
|
||||
.\Release_TA\bg_misc.obj
|
||||
.\Release_TA\q_math.obj
|
||||
.\Release_TA\q_shared.obj
|
||||
.\Release_TA\ui_atoms.obj
|
||||
.\Release_TA\ui_gameinfo.obj
|
||||
.\Release_TA\ui_main.obj
|
||||
.\Release_TA\ui_players.obj
|
||||
.\Release_TA\ui_shared.obj
|
||||
.\Release_TA\ui_syscalls.obj
|
||||
.\Release_TA\ui_util.obj
|
||||
]
|
||||
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP52C.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
ui_shared.c
|
||||
Linking...
|
||||
Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP530.tmp" with contents
|
||||
[
|
||||
/nologo /o"Release_TA/ta_ui.bsc"
|
||||
.\Release_TA\bg_misc.sbr
|
||||
.\Release_TA\q_math.sbr
|
||||
.\Release_TA\q_shared.sbr
|
||||
.\Release_TA\ui_atoms.sbr
|
||||
.\Release_TA\ui_gameinfo.sbr
|
||||
.\Release_TA\ui_main.sbr
|
||||
.\Release_TA\ui_players.sbr
|
||||
.\Release_TA\ui_shared.sbr
|
||||
.\Release_TA\ui_syscalls.sbr
|
||||
.\Release_TA\ui_util.sbr]
|
||||
Creating command line "bscmake.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP530.tmp"
|
||||
Creating browse info file...
|
||||
<h3>Output Window</h3>
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.27 2003/03/31 00:40:54 makro
|
||||
// Fixed a bug
|
||||
//
|
||||
// Revision 1.26 2003/03/31 00:23:18 makro
|
||||
// Replacements and stuff
|
||||
//
|
||||
|
@ -5290,6 +5293,7 @@ qboolean ItemParse_name(itemDef_t * item, int handle)
|
|||
qboolean ItemParse_shortcutKey(itemDef_t * item, int handle)
|
||||
{
|
||||
const char *temp;
|
||||
int c;
|
||||
|
||||
if (!PC_String_Parse(handle, &temp)) {
|
||||
item->window.shortcutKey = -1;
|
||||
|
@ -5297,7 +5301,11 @@ qboolean ItemParse_shortcutKey(itemDef_t * item, int handle)
|
|||
}
|
||||
//Com_Printf(S_COLOR_BLUE "^4MDEBUG: Shortcut key read: %s\n^7", item->window.shortcutKey);
|
||||
|
||||
item->window.shortcutKey = (strlen(temp) == 1) ? temp[0] : UI_RQ3_KeyNumFromChar(temp);
|
||||
c = (strlen(temp) == 1) ? temp[0] : UI_RQ3_KeyNumFromChar(temp);
|
||||
if (c>='A' && c<='Z')
|
||||
c -= 'A'-'a';
|
||||
item->window.shortcutKey = c;
|
||||
|
||||
return qtrue;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue