X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_phys.c;h=8777ea00a34a7ece5d9e6a822877a5b9bad05f82;hb=a9c78f0e29accdafe13371463fd9f219091848b2;hp=5169028e8095938baf89a463c5e0d40f38b948fa;hpb=1b29a19b96e18008296fa81d65d99e112f002aab;p=xonotic%2Fdarkplaces.git

diff --git a/sv_phys.c b/sv_phys.c
index 5169028e..8777ea00 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -255,6 +255,63 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 }
 #endif
 
+int SV_PointSuperContents(const vec3_t point)
+{
+	int supercontents = 0;
+	int i;
+	prvm_edict_t *touch;
+	vec3_t transformed;
+	// matrices to transform into/out of other entity's space
+	matrix4x4_t matrix, imatrix;
+	// model of other entity
+	model_t *model;
+	unsigned int modelindex;
+	int frame;
+	// list of entities to test for collisions
+	int numtouchedicts;
+	prvm_edict_t *touchedicts[MAX_EDICTS];
+
+	// get world supercontents at this point
+	if (sv.worldmodel && sv.worldmodel->PointSuperContents)
+		supercontents = sv.worldmodel->PointSuperContents(sv.worldmodel, 0, point);
+
+	// if sv_gameplayfix_swiminbmodels is off we're done
+	if (!sv_gameplayfix_swiminbmodels.integer)
+		return supercontents;
+
+	// get list of entities at this point
+	numtouchedicts = World_EntitiesInBox(&sv.world, point, point, MAX_EDICTS, touchedicts);
+	if (numtouchedicts > MAX_EDICTS)
+	{
+		// this never happens
+		Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+		numtouchedicts = MAX_EDICTS;
+	}
+	for (i = 0;i < numtouchedicts;i++)
+	{
+		touch = touchedicts[i];
+
+		// we only care about SOLID_BSP for pointcontents
+		if (touch->fields.server->solid != SOLID_BSP)
+			continue;
+
+		// might interact, so do an exact clip
+		modelindex = (unsigned int)touch->fields.server->modelindex;
+		if (modelindex >= MAX_MODELS)
+			continue;
+		model = sv.models[(int)touch->fields.server->modelindex];
+		if (!model || !model->PointSuperContents)
+			continue;
+		Matrix4x4_CreateFromQuakeEntity(&matrix, touch->fields.server->origin[0], touch->fields.server->origin[1], touch->fields.server->origin[2], touch->fields.server->angles[0], touch->fields.server->angles[1], touch->fields.server->angles[2], 1);
+		Matrix4x4_Invert_Simple(&imatrix, &matrix);
+		Matrix4x4_Transform(&imatrix, point, transformed);
+		frame = (int)touch->fields.server->frame;
+		supercontents |= model->PointSuperContents(model, bound(0, frame, (model->numframes - 1)), transformed);
+	}
+
+	return supercontents;
+}
+
 /*
 ===============================================================================
 
@@ -552,12 +609,12 @@ void SV_CheckVelocity (prvm_edict_t *ent)
 	{
 		if (IS_NAN(ent->fields.server->velocity[i]))
 		{
-			Con_Printf("Got a NaN velocity on %s\n", PRVM_GetString(ent->fields.server->classname));
+			Con_Printf("Got a NaN velocity on entity #%i (%s)\n", PRVM_NUM_FOR_EDICT(ent), PRVM_GetString(ent->fields.server->classname));
 			ent->fields.server->velocity[i] = 0;
 		}
 		if (IS_NAN(ent->fields.server->origin[i]))
 		{
-			Con_Printf("Got a NaN origin on %s\n", PRVM_GetString(ent->fields.server->classname));
+			Con_Printf("Got a NaN origin on entity #%i (%s)\n", PRVM_NUM_FOR_EDICT(ent), PRVM_GetString(ent->fields.server->classname));
 			ent->fields.server->origin[i] = 0;
 		}
 	}
@@ -1134,6 +1191,9 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 		 || check->fields.server->movetype == MOVETYPE_FAKEPUSH)
 			continue;
 
+		// tell any MOVETYPE_STEP entity that it may need to check for water transitions
+		check->priv.server->waterposition_forceupdate = true;
+
 		// if the entity is standing on the pusher, it will definitely be moved
 		// if the entity is not standing on the pusher, but is in the pusher's
 		// final position, move it
@@ -1916,6 +1976,7 @@ void SV_Physics_Step (prvm_edict_t *ent)
 				SV_CheckVelocity(ent);
 				SV_FlyMove(ent, sv.frametime, NULL, SV_GenericHitSuperContentsMask(ent));
 				SV_LinkEdict(ent, true);
+				ent->priv.server->waterposition_forceupdate = true;
 			}
 		}
 		else
@@ -1931,13 +1992,20 @@ void SV_Physics_Step (prvm_edict_t *ent)
 			// just hit ground
 			if (hitsound && (int)ent->fields.server->flags & FL_ONGROUND && sv_sound_land.string)
 				SV_StartSound(ent, 0, sv_sound_land.string, 255, 1);
+			ent->priv.server->waterposition_forceupdate = true;
 		}
 	}
 
 // regular thinking
-	SV_RunThink(ent);
+	if (!SV_RunThink(ent))
+		return;
 
-	SV_CheckWaterTransition(ent);
+	if (ent->priv.server->waterposition_forceupdate || !VectorCompare(ent->fields.server->origin, ent->priv.server->waterposition_origin))
+	{
+		ent->priv.server->waterposition_forceupdate = false;
+		VectorCopy(ent->fields.server->origin, ent->priv.server->waterposition_origin);
+		SV_CheckWaterTransition(ent);
+	}
 }
 
 //============================================================================