From dd0dd03f6f94a15b8764973e4c893526d8cfd722 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Tue, 2 Oct 2007 21:29:25 +0000 Subject: * Merge of ioq3-r1189 + Fix bug that prevented key up events getting to cgame/ui when not in game + Use Key_[GS]etCatcher everywhere to set keycatcher + Clear all key states when the catcher changes * Slim down client userinfo somewhat * Remove some redundant client autocomplete commands * Actually make use of "menuStack" in the UI module + No longer close all menus when exiting one, instead reverting to the next one on the stack + Cleanup the menu activation functions a little * Truncate text in list columns if it exceeds the column width * Remove maxChars field from columns member of ITEM_TYPE_LISTBOX * Revert r992 due to more general and less buggy/hacky fix from ioq3 --- src/qcommon/qcommon.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/qcommon') diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h index 7e6c40cd..59332068 100644 --- a/src/qcommon/qcommon.h +++ b/src/qcommon/qcommon.h @@ -683,10 +683,12 @@ MISC // vsnprintf is ISO/IEC 9899:1999 // abstracting this to make it portable -#ifdef WIN32 +#ifdef _WIN32 #define Q_vsnprintf _vsnprintf +#define Q_snprintf _snprintf #else #define Q_vsnprintf vsnprintf +#define Q_snprintf snprintf #endif // returned by Sys_GetProcessorFeatures -- cgit