diff options
Diffstat (limited to 'code/ui')
| -rw-r--r-- | code/ui/ui_shared.c | 8 | ||||
| -rw-r--r-- | code/ui/ui_util.c | 29 |
2 files changed, 4 insertions, 33 deletions
diff --git a/code/ui/ui_shared.c b/code/ui/ui_shared.c index db643ca..da4a29e 100644 --- a/code/ui/ui_shared.c +++ b/code/ui/ui_shared.c @@ -42,7 +42,7 @@ typedef struct scrollInfo_s { static scrollInfo_t scrollInfo; -static void (*captureFunc) (void *p) = NULL; +static void (*captureFunc) (void *p) = 0; static void *captureData = NULL; static itemDef_t *itemCapture = NULL; // item that has the mouse captured ( if any ) @@ -2371,7 +2371,7 @@ qboolean Item_HandleKey(itemDef_t *item, int key, qboolean down) { if (itemCapture) { Item_StopCapture(itemCapture); itemCapture = NULL; - captureFunc = NULL; + captureFunc = 0; captureData = NULL; } else { // bk001206 - parentheses @@ -5134,7 +5134,7 @@ keywordHash_t itemParseKeywords[] = { {"hideCvar", ItemParse_hideCvar, NULL}, {"cinematic", ItemParse_cinematic, NULL}, {"doubleclick", ItemParse_doubleClick, NULL}, - {NULL, NULL, NULL} + {NULL, 0, NULL} }; keywordHash_t *itemParseKeywordHash[KEYWORDHASH_SIZE]; @@ -5535,7 +5535,7 @@ keywordHash_t menuParseKeywords[] = { {"fadeClamp", MenuParse_fadeClamp, NULL}, {"fadeCycle", MenuParse_fadeCycle, NULL}, {"fadeAmount", MenuParse_fadeAmount, NULL}, - {NULL, NULL, NULL} + {NULL, 0, NULL} }; keywordHash_t *menuParseKeywordHash[KEYWORDHASH_SIZE]; diff --git a/code/ui/ui_util.c b/code/ui/ui_util.c deleted file mode 100644 index e0bb1e0..0000000 --- a/code/ui/ui_util.c +++ /dev/null @@ -1,29 +0,0 @@ -/* -=========================================================================== -Copyright (C) 1999-2005 Id Software, Inc. - -This file is part of Quake III Arena source code. - -Quake III Arena source code is free software; you can redistribute it -and/or modify it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2 of the License, -or (at your option) any later version. - -Quake III Arena source code is distributed in the hope that it will be -useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Foobar; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -=========================================================================== -*/ -// ui_util.c -// -// origin: rad -// new ui support stuff -// -// memory, string alloc - - |