From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 3 Jun 2003 05:18:04 +0000 (+0000)
Subject: fixed bug that used bmodel collision geometry on non-SOLID_BSP entities (thanks to... 
X-Git-Tag: xonotic-v0.1.0preview~6600
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=2dc5c73a24afd505d17ccee2297d033093cf2e40;p=xonotic%2Fdarkplaces.git

fixed bug that used bmodel collision geometry on non-SOLID_BSP entities (thanks to FrikaC for reporting this bug)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3063 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/world.c b/world.c
index 85a53826..3d63db31 100644
--- a/world.c
+++ b/world.c
@@ -453,17 +453,17 @@ trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t max
 {
 	int i;
 	trace_t trace;
-	model_t *model;
-
-	i = ent->v->modelindex;
-	if ((unsigned int) i >= MAX_MODELS)
-		Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
-	model = sv.models[i];
-	if (i != 0 && model == NULL)
-		Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
+	model_t *model = NULL;
 
 	if ((int) ent->v->solid == SOLID_BSP)
 	{
+		i = ent->v->modelindex;
+		if ((unsigned int) i >= MAX_MODELS)
+			Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
+		model = sv.models[i];
+		if (i != 0 && model == NULL)
+			Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
+
 		Mod_CheckLoaded(model);
 		if (model->type != mod_brush)
 		{