diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-05 18:17:46 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-05 18:17:46 +0000 |
| commit | d37536edf4660f3c46e4876b6d72e9a200549ffe (patch) | |
| tree | 637eb5f3e49f4075ecdef97a31f5e8157cee73a2 /code/q3_ui/ui_controls2.c | |
| parent | 4496eacc4ec7406fd694693da5a7f9589933f7fd (diff) | |
| download | ioquake3-aero-d37536edf4660f3c46e4876b6d72e9a200549ffe.tar.gz ioquake3-aero-d37536edf4660f3c46e4876b6d72e9a200549ffe.zip | |
* Merge unified-sdl to trunk
* Bump Q3_VERSION to 1.35
git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/q3_ui/ui_controls2.c')
| -rw-r--r-- | code/q3_ui/ui_controls2.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/code/q3_ui/ui_controls2.c b/code/q3_ui/ui_controls2.c index ba9528c..907ad00 100644 --- a/code/q3_ui/ui_controls2.c +++ b/code/q3_ui/ui_controls2.c @@ -223,7 +223,7 @@ typedef struct static controls_t s_controls; -static vec4_t controls_binding_color = {1.00f, 0.43f, 0.00f, 1.00f}; // bk: Win32 C4305 +static vec4_t controls_binding_color = {1.00f, 0.43f, 0.00f, 1.00f}; static bind_t g_bindings[] = { @@ -561,7 +561,6 @@ static void Controls_Update( void ) { // disable all controls in all groups for( i = 0; i < C_MAX; i++ ) { controls = g_controls[i]; - // bk001204 - parentheses for( j = 0; (control = controls[j]) ; j++ ) { control->flags |= (QMF_HIDDEN|QMF_INACTIVE); } @@ -570,14 +569,12 @@ static void Controls_Update( void ) { controls = g_controls[s_controls.section]; // enable controls in active group (and count number of items for vertical centering) - // bk001204 - parentheses for( j = 0; (control = controls[j]) ; j++ ) { control->flags &= ~(QMF_GRAYED|QMF_HIDDEN|QMF_INACTIVE); } // position controls y = ( SCREEN_HEIGHT - j * SMALLCHAR_HEIGHT ) / 2; - // bk001204 - parentheses for( j = 0; (control = controls[j]) ; j++, y += SMALLCHAR_HEIGHT ) { control->x = 320; control->y = y; |