aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--code/game/g_client.c4
-rw-r--r--code/game/g_items.c2
-rw-r--r--code/game/g_misc.c2
-rw-r--r--code/game/g_spawn.c4
-rw-r--r--code/game/g_trigger.c2
-rw-r--r--code/q3_ui/ui_atoms.c4
-rw-r--r--code/q3_ui/ui_ingame.c4
-rw-r--r--code/q3_ui/ui_menu.c2
-rw-r--r--code/q3_ui/ui_servers2.c4
-rw-r--r--code/ui/ui_shared.c8
-rw-r--r--code/ui/ui_util.c29
-rw-r--r--code/unix/Makefile1
12 files changed, 18 insertions, 48 deletions
diff --git a/code/game/g_client.c b/code/game/g_client.c
index 9dcfaa4..84e366f 100644
--- a/code/game/g_client.c
+++ b/code/game/g_client.c
@@ -1004,8 +1004,8 @@ void ClientBegin( int clientNum ) {
trap_UnlinkEntity( ent );
}
G_InitGentity( ent );
- ent->touch = NULL;
- ent->pain = NULL;
+ ent->touch = 0;
+ ent->pain = 0;
ent->client = client;
client->pers.connected = CON_CONNECTED;
diff --git a/code/game/g_items.c b/code/game/g_items.c
index fd75412..1222fbd 100644
--- a/code/game/g_items.c
+++ b/code/game/g_items.c
@@ -542,7 +542,7 @@ void Touch_Item (gentity_t *ent, gentity_t *other, trace_t *trace) {
// events such as ctf flags
if ( respawn <= 0 ) {
ent->nextthink = 0;
- ent->think = NULL;
+ ent->think = 0;
} else {
ent->nextthink = level.time + respawn * 1000;
ent->think = RespawnItem;
diff --git a/code/game/g_misc.c b/code/game/g_misc.c
index f631a8d..ee75cde 100644
--- a/code/game/g_misc.c
+++ b/code/game/g_misc.c
@@ -288,7 +288,7 @@ void Use_Shooter( gentity_t *ent, gentity_t *other, gentity_t *activator ) {
static void InitShooter_Finish( gentity_t *ent ) {
ent->enemy = G_PickTarget( ent->target );
- ent->think = NULL;
+ ent->think = 0;
ent->nextthink = 0;
}
diff --git a/code/game/g_spawn.c b/code/game/g_spawn.c
index f21e13b..7d2ac10 100644
--- a/code/game/g_spawn.c
+++ b/code/game/g_spawn.c
@@ -191,7 +191,7 @@ void SP_team_blueobelisk( gentity_t *ent );
void SP_team_redobelisk( gentity_t *ent );
void SP_team_neutralobelisk( gentity_t *ent );
#endif
-void SP_item_botroam( gentity_t *ent ) {};
+void SP_item_botroam( gentity_t *ent ) { }
spawn_t spawns[] = {
// info entities don't do anything at all, but provide positional
@@ -266,7 +266,7 @@ spawn_t spawns[] = {
#endif
{"item_botroam", SP_item_botroam},
- {NULL, NULL}
+ {NULL, 0}
};
/*
diff --git a/code/game/g_trigger.c b/code/game/g_trigger.c
index 16c1fc9..9db2304 100644
--- a/code/game/g_trigger.c
+++ b/code/game/g_trigger.c
@@ -67,7 +67,7 @@ void multi_trigger( gentity_t *ent, gentity_t *activator ) {
} else {
// we can't just remove (self) here, because this is a touch function
// called while looping through area links...
- ent->touch = NULL;
+ ent->touch = 0;
ent->nextthink = level.time + FRAMETIME;
ent->think = G_FreeEntity;
}
diff --git a/code/q3_ui/ui_atoms.c b/code/q3_ui/ui_atoms.c
index ae4cbb9..b74ad7f 100644
--- a/code/q3_ui/ui_atoms.c
+++ b/code/q3_ui/ui_atoms.c
@@ -821,10 +821,10 @@ void UI_SetActiveMenu( uiMenuCommand_t menu ) {
UI_MainMenu();
return;
case UIMENU_NEED_CD:
- UI_ConfirmMenu( "Insert the CD", (voidfunc_f)NULL, NeedCDAction );
+ UI_ConfirmMenu( "Insert the CD", 0, NeedCDAction );
return;
case UIMENU_BAD_CD_KEY:
- UI_ConfirmMenu( "Bad CD Key", (voidfunc_f)NULL, NeedCDKeyAction );
+ UI_ConfirmMenu( "Bad CD Key", 0, NeedCDKeyAction );
return;
case UIMENU_INGAME:
/*
diff --git a/code/q3_ui/ui_ingame.c b/code/q3_ui/ui_ingame.c
index 9b58c11..2ec053e 100644
--- a/code/q3_ui/ui_ingame.c
+++ b/code/q3_ui/ui_ingame.c
@@ -120,11 +120,11 @@ void InGame_Event( void *ptr, int notification ) {
break;
case ID_RESTART:
- UI_ConfirmMenu( "RESTART ARENA?", (voidfunc_f)NULL, InGame_RestartAction );
+ UI_ConfirmMenu( "RESTART ARENA?", 0, InGame_RestartAction );
break;
case ID_QUIT:
- UI_ConfirmMenu( "EXIT GAME?", (voidfunc_f)NULL, InGame_QuitAction );
+ UI_ConfirmMenu( "EXIT GAME?", 0, InGame_QuitAction );
break;
case ID_SERVERINFO:
diff --git a/code/q3_ui/ui_menu.c b/code/q3_ui/ui_menu.c
index 6722435..1850464 100644
--- a/code/q3_ui/ui_menu.c
+++ b/code/q3_ui/ui_menu.c
@@ -126,7 +126,7 @@ void Main_MenuEvent (void* ptr, int event) {
break;
case ID_EXIT:
- UI_ConfirmMenu( "EXIT GAME?", NULL, MainMenu_ExitAction );
+ UI_ConfirmMenu( "EXIT GAME?", 0, MainMenu_ExitAction );
break;
}
}
diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c
index 2067354..d7fae72 100644
--- a/code/q3_ui/ui_servers2.c
+++ b/code/q3_ui/ui_servers2.c
@@ -1265,11 +1265,11 @@ static void ArenaServers_Event( void* ptr, int event ) {
case ID_PUNKBUSTER:
if (g_arenaservers.punkbuster.curvalue)
{
- UI_ConfirmMenu_Style( "Enable Punkbuster?", UI_CENTER|UI_INVERSE|UI_SMALLFONT, (voidfunc_f)NULL, Punkbuster_ConfirmEnable );
+ UI_ConfirmMenu_Style( "Enable Punkbuster?", UI_CENTER|UI_INVERSE|UI_SMALLFONT, 0, Punkbuster_ConfirmEnable );
}
else
{
- UI_ConfirmMenu_Style( "Disable Punkbuster?", UI_CENTER|UI_INVERSE|UI_SMALLFONT, (voidfunc_f)NULL, Punkbuster_ConfirmDisable );
+ UI_ConfirmMenu_Style( "Disable Punkbuster?", UI_CENTER|UI_INVERSE|UI_SMALLFONT, 0, Punkbuster_ConfirmDisable );
}
break;
}
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
-
-
diff --git a/code/unix/Makefile b/code/unix/Makefile
index a526338..0418b4b 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -1325,7 +1325,6 @@ MPUIOBJ_ = \
$(B)/missionpack/ui/ui_atoms.o \
$(B)/missionpack/ui/ui_gameinfo.o \
$(B)/missionpack/ui/ui_players.o \
- $(B)/missionpack/ui/ui_util.o \
$(B)/missionpack/ui/ui_shared.o \
\
$(B)/missionpack/game/bg_misc.o \
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 16:25:02 +0000