X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=world.c;h=e37b24c01325f9ef136abef2ace19350ce2f5c0b;hb=ff451b542b3aa1f65296bd9374fbd7f8dcb645c1;hp=26ffd9bbe57d4fd5365eb1b279364fc72b8a583f;hpb=7d1f3e96e8b6ccc7fda2c4f95bd137fc52a0b3ae;p=xonotic%2Fdarkplaces.git

diff --git a/world.c b/world.c
index 26ffd9bb..e37b24c0 100644
--- a/world.c
+++ b/world.c
@@ -32,29 +32,45 @@ line of sight checks trace->inopen and trace->inwater, but bullets don't
 
 */
 
+#ifdef USEODE
 static void World_Physics_Init(void);
+#endif
 void World_Init(void)
 {
 	Collision_Init();
+#ifdef USEODE
 	World_Physics_Init();
+#endif
 }
 
+#ifdef USEODE
 static void World_Physics_Shutdown(void);
+#endif
 void World_Shutdown(void)
 {
+#ifdef USEODE
 	World_Physics_Shutdown();
+#endif
 }
 
+#ifdef USEODE
 static void World_Physics_Start(world_t *world);
+#endif
 void World_Start(world_t *world)
 {
+#ifdef USEODE
 	World_Physics_Start(world);
+#endif
 }
 
+#ifdef USEODE
 static void World_Physics_End(world_t *world);
+#endif
 void World_End(world_t *world)
 {
+#ifdef USEODE
 	World_Physics_End(world);
+#endif
 }
 
 //============================================================================
@@ -148,10 +164,10 @@ void World_UnlinkAll(world_t *world)
 	// unlink all entities one by one
 	grid = &world->areagrid_outside;
 	while (grid->list.next != &grid->list)
-		World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(*grid->list.next, link_t, list)->entitynumber));
+		World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(grid->list.next, link_t, list)->entitynumber));
 	for (i = 0, grid = world->areagrid;i < AREA_GRIDNODES;i++, grid++)
 		while (grid->list.next != &grid->list)
-			World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(*grid->list.next, link_t, list)->entitynumber));
+			World_UnlinkEdict(PRVM_EDICT_NUM(List_Entry(grid->list.next, link_t, list)->entitynumber));
 }
 
 /*
@@ -173,7 +189,6 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
 {
 	prvm_prog_t *prog = world->prog;
 	int numlist;
-	llist_t *pos;
 	link_t *grid;
 	link_t *l;
 	prvm_edict_t *ent;
@@ -216,14 +231,13 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
 	if (world->areagrid_outside.list.next)
 	{
 		grid = &world->areagrid_outside;
-		List_For_Each(pos, &grid->list)
+		List_For_Each_Entry(l, &grid->list, link_t, list)
 		{
-			l = List_Entry(*pos, link_t, list);
 			ent = PRVM_EDICT_NUM(l->entitynumber);
 			if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
 			{
 				ent->priv.server->areagridmarknumber = world->areagrid_marknumber;
-				if (!ent->priv.server->free && BoxesOverlap(paddedmins, paddedmaxs, ent->priv.server->areamins, ent->priv.server->areamaxs))
+				if (!ent->free && BoxesOverlap(paddedmins, paddedmaxs, ent->priv.server->areamins, ent->priv.server->areamaxs))
 				{
 					if (numlist < maxlist)
 						list[numlist] = ent;
@@ -241,14 +255,13 @@ int World_EntitiesInBox(world_t *world, const vec3_t requestmins, const vec3_t r
 		{
 			if (grid->list.next)
 			{
-				List_For_Each(pos, &grid->list)
+				List_For_Each_Entry(l, &grid->list, link_t, list)
 				{
-					l = List_Entry(*pos, link_t, list);
 					ent = PRVM_EDICT_NUM(l->entitynumber);
 					if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber)
 					{
 						ent->priv.server->areagridmarknumber = world->areagrid_marknumber;
-						if (!ent->priv.server->free && BoxesOverlap(paddedmins, paddedmaxs, ent->priv.server->areamins, ent->priv.server->areamaxs))
+						if (!ent->free && BoxesOverlap(paddedmins, paddedmaxs, ent->priv.server->areamins, ent->priv.server->areamaxs))
 						{
 							if (numlist < maxlist)
 								list[numlist] = ent;
@@ -304,19 +317,23 @@ World_LinkEdict
 
 ===============
 */
-void World_LinkEdict(world_t *world, prvm_edict_t *ent, const vec3_t mins, const vec3_t maxs)
+void World_LinkEdict(world_t *world, prvm_edict_t *ent, const vec3_t mins, const vec3_t maxs, qbool link_solid_not)
 {
 	prvm_prog_t *prog = world->prog;
 	// unlink from old position first
 	if (ent->priv.server->areagrid[0].list.prev)
 		World_UnlinkEdict(ent);
 
+	// some games don't want SOLID_NOT entities linked
+	if (!link_solid_not && PRVM_serveredictfloat(ent, solid) == SOLID_NOT)
+		return;
+
 	// don't add the world
 	if (ent == prog->edicts)
 		return;
 
 	// don't add free entities
-	if (ent->priv.server->free)
+	if (ent->free)
 		return;
 
 	VectorCopy(mins, ent->priv.server->areamins);
@@ -1462,15 +1479,12 @@ static dllfunction_t odefuncs[] =
 //	{"dGeomTriMeshDataUpdate",                      (void **) &dGeomTriMeshDataUpdate},
 	{NULL, NULL}
 };
-
 // Handle for ODE DLL
 dllhandle_t ode_dll = NULL;
 #endif
-#endif
 
 static void World_Physics_Init(void)
 {
-#ifdef USEODE
 #ifndef LINK_TO_LIBODE
 	const char* dllnames [] =
 	{
@@ -1554,12 +1568,9 @@ static void World_Physics_Init(void)
 		}
 #endif
 	}
-#endif
 }
-
 static void World_Physics_Shutdown(void)
 {
-#ifdef USEODE
 #ifndef LINK_TO_LIBODE
 	if (ode_dll)
 #endif
@@ -1570,10 +1581,8 @@ static void World_Physics_Shutdown(void)
 		ode_dll = NULL;
 #endif
 	}
-#endif
 }
 
-#ifdef USEODE
 static void World_Physics_UpdateODE(world_t *world)
 {
 	dWorldID odeworld;
@@ -1630,20 +1639,16 @@ static void World_Physics_EnableODE(world_t *world)
 
 	World_Physics_UpdateODE(world);
 }
-#endif
 
 static void World_Physics_Start(world_t *world)
 {
-#ifdef USEODE
 	if (world->physics.ode)
 		return;
 	World_Physics_EnableODE(world);
-#endif
 }
 
 static void World_Physics_End(world_t *world)
 {
-#ifdef USEODE
 	if (world->physics.ode)
 	{
 		dWorldDestroy((dWorldID)world->physics.ode_world);
@@ -1651,17 +1656,14 @@ static void World_Physics_End(world_t *world)
 		dJointGroupDestroy((dJointGroupID)world->physics.ode_contactgroup);
 		world->physics.ode = false;
 	}
-#endif
 }
 
 void World_Physics_RemoveJointFromEntity(world_t *world, prvm_edict_t *ed)
 {
 	ed->priv.server->ode_joint_type = 0;
-#ifdef USEODE
 	if(ed->priv.server->ode_joint)
 		dJointDestroy((dJointID)ed->priv.server->ode_joint);
 	ed->priv.server->ode_joint = NULL;
-#endif
 }
 
 void World_Physics_RemoveFromEntity(world_t *world, prvm_edict_t *ed)
@@ -1670,7 +1672,6 @@ void World_Physics_RemoveFromEntity(world_t *world, prvm_edict_t *ed)
 
 	// entity is not physics controlled, free any physics data
 	ed->priv.server->ode_physics = false;
-#ifdef USEODE
 	if (ed->priv.server->ode_geom)
 		dGeomDestroy((dGeomID)ed->priv.server->ode_geom);
 	ed->priv.server->ode_geom = NULL;
@@ -1700,7 +1701,6 @@ void World_Physics_RemoveFromEntity(world_t *world, prvm_edict_t *ed)
 		dBodyDestroy((dBodyID)ed->priv.server->ode_body);
 	}
 	ed->priv.server->ode_body = NULL;
-#endif
 	if (ed->priv.server->ode_vertex3f)
 		Mem_Free(ed->priv.server->ode_vertex3f);
 	ed->priv.server->ode_vertex3f = NULL;
@@ -1723,7 +1723,6 @@ void World_Physics_RemoveFromEntity(world_t *world, prvm_edict_t *ed)
 
 void World_Physics_ApplyCmd(prvm_edict_t *ed, edict_odefunc_t *f)
 {
-#ifdef USEODE
 	dBodyID body = (dBodyID)ed->priv.server->ode_body;
 
 	switch(f->type)
@@ -1745,10 +1744,8 @@ void World_Physics_ApplyCmd(prvm_edict_t *ed, edict_odefunc_t *f)
 	default:
 		break;
 	}
-#endif
 }
 
-#ifdef USEODE
 static void World_Physics_Frame_BodyToEntity(world_t *world, prvm_edict_t *ed)
 {
 	prvm_prog_t *prog = world->prog;
@@ -1865,7 +1862,7 @@ static void World_Physics_Frame_ForceFromEntity(world_t *world, prvm_edict_t *ed
 	if (!forcetype)
 		return;
 	enemy = PRVM_gameedictedict(ed, enemy);
-	if (enemy <= 0 || enemy >= prog->num_edicts || prog->edicts[enemy].priv.required->free || prog->edicts[enemy].priv.server->ode_body == 0)
+	if (enemy <= 0 || enemy >= prog->num_edicts || prog->edicts[enemy].free || prog->edicts[enemy].priv.server->ode_body == 0)
 		return;
 	VectorCopy(PRVM_gameedictvector(ed, movedir), movedir);
 	VectorCopy(PRVM_gameedictvector(ed, origin), origin);
@@ -1917,9 +1914,9 @@ static void World_Physics_Frame_JointFromEntity(world_t *world, prvm_edict_t *ed
 	VectorCopy(PRVM_gameedictvector(ed, movedir), movedir);
 	if(movetype == MOVETYPE_PHYSICS)
 		jointtype = JOINTTYPE_NONE; // can't have both
-	if(enemy <= 0 || enemy >= prog->num_edicts || prog->edicts[enemy].priv.required->free || prog->edicts[enemy].priv.server->ode_body == 0)
+	if(enemy <= 0 || enemy >= prog->num_edicts || prog->edicts[enemy].free || prog->edicts[enemy].priv.server->ode_body == 0)
 		enemy = 0;
-	if(aiment <= 0 || aiment >= prog->num_edicts || prog->edicts[aiment].priv.required->free || prog->edicts[aiment].priv.server->ode_body == 0)
+	if(aiment <= 0 || aiment >= prog->num_edicts || prog->edicts[aiment].free || prog->edicts[aiment].priv.server->ode_body == 0)
 		aiment = 0;
 	// see http://www.ode.org/old_list_archives/2006-January/017614.html
 	// we want to set ERP? make it fps independent and work like a spring constant
@@ -2736,17 +2733,17 @@ treatasbox:
 	if (physics_ode_trick_fixnan.integer)
 	{
 		test = VectorLength2(origin) + VectorLength2(forward) + VectorLength2(left) + VectorLength2(up) + VectorLength2(velocity) + VectorLength2(spinvelocity);
-		if (VEC_IS_NAN(test))
+		if (isnan(test))
 		{
 			modified = true;
 			//Con_Printf("Fixing NAN values on entity %i : .classname = \"%s\" .origin = '%f %f %f' .velocity = '%f %f %f' .axis_forward = '%f %f %f' .axis_left = '%f %f %f' .axis_up = %f %f %f' .spinvelocity = '%f %f %f'\n", PRVM_NUM_FOR_EDICT(ed), PRVM_GetString(PRVM_gameedictstring(ed, classname)), origin[0], origin[1], origin[2], velocity[0], velocity[1], velocity[2], forward[0], forward[1], forward[2], left[0], left[1], left[2], up[0], up[1], up[2], spinvelocity[0], spinvelocity[1], spinvelocity[2]);
 			if (physics_ode_trick_fixnan.integer >= 2)
 				Con_Printf("Fixing NAN values on entity %i : .classname = \"%s\" .origin = '%f %f %f' .velocity = '%f %f %f' .angles = '%f %f %f' .avelocity = '%f %f %f'\n", PRVM_NUM_FOR_EDICT(ed), PRVM_GetString(prog, PRVM_gameedictstring(ed, classname)), origin[0], origin[1], origin[2], velocity[0], velocity[1], velocity[2], angles[0], angles[1], angles[2], avelocity[0], avelocity[1], avelocity[2]);
 			test = VectorLength2(origin);
-			if (VEC_IS_NAN(test))
+			if (isnan(test))
 				VectorClear(origin);
 			test = VectorLength2(forward) * VectorLength2(left) * VectorLength2(up);
-			if (VEC_IS_NAN(test))
+			if (isnan(test))
 			{
 				VectorSet(angles, 0, 0, 0);
 				VectorSet(forward, 1, 0, 0);
@@ -2754,10 +2751,10 @@ treatasbox:
 				VectorSet(up, 0, 0, 1);
 			}
 			test = VectorLength2(velocity);
-			if (VEC_IS_NAN(test))
+			if (isnan(test))
 				VectorClear(velocity);
 			test = VectorLength2(spinvelocity);
-			if (VEC_IS_NAN(test))
+			if (isnan(test))
 			{
 				VectorClear(avelocity);
 				VectorClear(spinvelocity);
@@ -2928,7 +2925,7 @@ static void nearCallback (void *data, dGeomID o1, dGeomID o2)
 		return;
 
 	ed1 = (prvm_edict_t *) dGeomGetData(o1);
-	if(ed1 && ed1->priv.server->free)
+	if(ed1 && ed1->free)
 		ed1 = NULL;
 	if(ed1)
 	{
@@ -2939,7 +2936,7 @@ static void nearCallback (void *data, dGeomID o1, dGeomID o2)
 	}
 
 	ed2 = (prvm_edict_t *) dGeomGetData(o2);
-	if(ed2 && ed2->priv.server->free)
+	if(ed2 && ed2->free)
 		ed2 = NULL;
 	if(ed2)
 	{
@@ -3009,11 +3006,9 @@ static void nearCallback (void *data, dGeomID o1, dGeomID o2)
 		dJointAttach(c, b1, b2);
 	}
 }
-#endif
 
 void World_Physics_Frame(world_t *world, double frametime, double gravity)
 {
-#ifdef USEODE
 	prvm_prog_t *prog = world->prog;
 	double tdelta, tdelta2, tdelta3, simulationtime, collisiontime;
 
@@ -3053,11 +3048,11 @@ void World_Physics_Frame(world_t *world, double frametime, double gravity)
 		if (prog)
 		{
 			for (i = 0, ed = prog->edicts + i;i < prog->num_edicts;i++, ed++)
-				if (!prog->edicts[i].priv.required->free)
+				if (!prog->edicts[i].free)
 					World_Physics_Frame_BodyFromEntity(world, ed);
 			// oh, and it must be called after all bodies were created
 			for (i = 0, ed = prog->edicts + i;i < prog->num_edicts;i++, ed++)
-				if (!prog->edicts[i].priv.required->free)
+				if (!prog->edicts[i].free)
 					World_Physics_Frame_JointFromEntity(world, ed);
 		}
 
@@ -3078,7 +3073,7 @@ void World_Physics_Frame(world_t *world, double frametime, double gravity)
 			{
 				int j;
 				for (j = 0, ed = prog->edicts + j;j < prog->num_edicts;j++, ed++)
-					if (!prog->edicts[j].priv.required->free)
+					if (!prog->edicts[j].free)
 						World_Physics_Frame_ForceFromEntity(world, ed);
 			}
 			// run physics (move objects, calculate new velocities)
@@ -3095,7 +3090,7 @@ void World_Physics_Frame(world_t *world, double frametime, double gravity)
 		if (prog)
 		{
 			for (i = 1, ed = prog->edicts + i;i < prog->num_edicts;i++, ed++)
-				if (!prog->edicts[i].priv.required->free)
+				if (!prog->edicts[i].free)
 					World_Physics_Frame_BodyToEntity(world, ed);
 
 			// print stats
@@ -3107,7 +3102,7 @@ void World_Physics_Frame(world_t *world, double frametime, double gravity)
 				world->physics.ode_activeovjects = 0;
 				for (i = 1, ed = prog->edicts + i;i < prog->num_edicts;i++, ed++)
 				{
-					if (prog->edicts[i].priv.required->free)
+					if (prog->edicts[i].free)
 						continue;
 					body = (dBodyID)prog->edicts[i].priv.server->ode_body;
 					if (!body)
@@ -3120,5 +3115,5 @@ void World_Physics_Frame(world_t *world, double frametime, double gravity)
 			}
 		}
 	}
-#endif
 }
+#endif