game: replace heretic2 hack to quake (edict_s)1 hack

0lvin · Sep 7, 2024 · f07c856 · f07c856
1 parent 7905943
commit f07c856
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/src/client/cl_prediction.c b/src/client/cl_prediction.c
@@ -169,12 +169,10 @@ CL_PMTrace(vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end)
 	/* check against world */
 	t = CM_BoxTrace(start, end, mins, maxs, 0, MASK_PLAYERSOLID);
 
-// jmarshall - c++ - this was wrong?
 	if (t.fraction < 1.0)
 	{
-		t.ent = (edict_t *)&cl_parse_entities[1];
+		t.ent = (struct edict_s *)1;
 	}
-// jmarshall end
 
 	/* check all other solid models */
 	CL_ClipMoveToEntities(start, mins, maxs, end, &t);

diff --git a/src/game/effects/fx_debris.c b/src/game/effects/fx_debris.c
@@ -763,7 +763,7 @@ static void FXDebris_Collision(client_entity_t *self, CE_Message_t *msg)
 			return;
 
 		// hit the world
-		if(trace->ent == (struct edict_s *)-1)
+		if(trace->ent == WALL_ENTITY)
 		{
 			if(trace->contents&CONTENTS_SOLID)
 			{//hit a solid surface, make noise and leave any decals

diff --git a/src/game/effects/fx_halo.c b/src/game/effects/fx_halo.c
@@ -76,7 +76,7 @@ static qboolean FXHaloThink(struct client_entity_s *self, centity_t *Owner)
 
 	if (trace.fraction < 1.0)	//Hit something
 	{
-		if ((trace.ent != ((struct edict_s *)-1)))	//Model
+		if (trace.ent != WALL_ENTITY)	//Model
 		{
 			es = (entity_state_t *) trace.ent;
 

diff --git a/src/game/effects/utilities.h b/src/game/effects/utilities.h
@@ -46,4 +46,7 @@ float GetGravity();
 qboolean ReferencesInitialized(centity_t *owner);
 qboolean RefPointsValid(centity_t *owner);
 
+// NOTE: 1 means that the last entity was a wall...
+#define WALL_ENTITY (struct edict_s *)1
+
 #endif
diff --git a/src/game/g_ai.c b/src/game/g_ai.c
@@ -307,7 +307,7 @@ int ai_hopdown(edict_t *self, vec3_t goalpos, float height_max)
 		}
 		else
 		{
-			if (trace.ent == (struct edict_s *)-1)
+			if (trace.ent == WALL_ENTITY)
 				return false;
 
 			if (trace.contents != CONTENTS_SOLID)

diff --git a/src/game/header/local.h b/src/game/header/local.h
@@ -1639,6 +1639,9 @@ struct edict_s
 	void			*script;
 };
 
+// NOTE: 1 means that the last entity was a wall...
+#define WALL_ENTITY (struct edict_s *)1
+
 /*
  * Uncomment for check that exported functions declarations are same as in
  * implementation. (-Wmissing-prototypes )

diff --git a/src/game/monster/plaguessithra/plaguessithra.c b/src/game/monster/plaguessithra/plaguessithra.c
@@ -849,8 +849,10 @@ void ssithraCheckJump (edict_t *self)
 			}
 			else
 			{
-//				if (trace.ent == (struct edict_s *)-1)
-//					return;
+				if (trace.ent == WALL_ENTITY)
+				{
+					return;
+				}
 
 				if (trace.contents != CONTENTS_SOLID)
 				{
@@ -991,7 +993,7 @@ void ssithraCheckJump (edict_t *self)
 		//			}
 					else
 					{
-						if (trace.ent == (struct edict_s *)-1)
+						if (trace.ent == WALL_ENTITY)
 							return;
 
 		//				if (trace.contents != CONTENTS_SOLID)

diff --git a/src/game/player/weapon.c b/src/game/player/weapon.c
@@ -563,10 +563,7 @@ void WeaponThink_SwordStaff(edict_t *Caster,char *Format,...)
 			AlertMonsters (Caster, Caster, 1, true);
 			gi.sound(Caster, CHAN_AUTO, gi.soundindex("weapons/staffhitwall.wav"), 1, ATTN_NORM, 0);
 
-			// NOTENOTE -1 means that the last entity was a wall...
-// jmarshall - 64bit
-			Caster->client->lastentityhit = (edict_t*)-1; // 0xFFFFFFFF;
-// jmarshall end
+			Caster->client->lastentityhit = WALL_ENTITY;
 		}
 	}
 }