From b88cd08ed960d2f3c6734e3a77b6d084e60c8cc4 Mon Sep 17 00:00:00 2001
From: Richard Allen <ra@ra.is>
Date: Thu, 4 Oct 2012 15:02:45 +0000
Subject: [PATCH] IOQ3 commit 2266

---
 reaction/code/game/g_items.c     | 4 ++--
 reaction/code/game/g_mover.c     | 4 ++--
 reaction/code/qcommon/q_shared.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/reaction/code/game/g_items.c b/reaction/code/game/g_items.c
index c4e8c9c8..89f9b2e6 100644
--- a/reaction/code/game/g_items.c
+++ b/reaction/code/game/g_items.c
@@ -1339,8 +1339,8 @@ void G_RunItem(gentity_t * ent)
 	int contents;
 	int mask;
 
-	// if groundentity has been set to -1, it may have been pushed off an edge
-	if (ent->s.groundEntityNum == -1) {
+	// if its groundentity has been set to none, it may have been pushed off an edge
+	if (ent->s.groundEntityNum == ENTITYNUM_NONE) {
 		if (ent->s.pos.trType != TR_GRAVITY) {
 			ent->s.pos.trType = TR_GRAVITY;
 			ent->s.pos.trTime = level.time;
diff --git a/reaction/code/game/g_mover.c b/reaction/code/game/g_mover.c
index 9452e63f..9f03c68a 100644
--- a/reaction/code/game/g_mover.c
+++ b/reaction/code/game/g_mover.c
@@ -356,7 +356,7 @@ qboolean G_TryPushingEntity(gentity_t * check, gentity_t * pusher, vec3_t move,
 	}
 	// may have pushed them off an edge
 	if (check->s.groundEntityNum != pusher->s.number) {
-		check->s.groundEntityNum = -1;
+		check->s.groundEntityNum = ENTITYNUM_NONE;
 	}
 
 	block = G_TestEntityPosition(check);
@@ -381,7 +381,7 @@ qboolean G_TryPushingEntity(gentity_t * check, gentity_t * pusher, vec3_t move,
 	VectorCopy((pushed_p - 1)->angles, check->s.apos.trBase);
 	block = G_TestEntityPosition(check);
 	if (!block) {
-		check->s.groundEntityNum = -1;
+		check->s.groundEntityNum = ENTITYNUM_NONE;
 		pushed_p--;
 		return qtrue;
 	}
diff --git a/reaction/code/qcommon/q_shared.h b/reaction/code/qcommon/q_shared.h
index 715af2cf..75a02f71 100644
--- a/reaction/code/qcommon/q_shared.h
+++ b/reaction/code/qcommon/q_shared.h
@@ -1309,7 +1309,7 @@ typedef struct entityState_s {
 	int		otherEntityNum;	// shotgun sources, etc
 	int		otherEntityNum2;
 
-	int		groundEntityNum;	// -1 = in air
+	int		groundEntityNum;	// ENTITYNUM_NONE = in air
 
 	int		constantLight;	// r + (g<<8) + (b<<16) + (intensity<<24)
 	int		loopSound;		// constantly loop this sound