5 files changed, 7 insertions, 7 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;
 	}