X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=clvm_cmds.c;h=1c6222a39f0f678bb51ded123124701e62101fdd;hb=e7a93776d7db4fd5d8e3292e4949a69c3ee0020f;hp=b566f0521451c4bb055898eaf4f07f8fe1df5e4f;hpb=d8c070909c9525c027065995333c6a173413a956;p=xonotic%2Fdarkplaces.git

diff --git a/clvm_cmds.c b/clvm_cmds.c
index b566f052..1c6222a3 100644
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -83,39 +83,44 @@ void VM_CL_setmodel (void)
 	VM_SAFEPARMCOUNT(2, VM_CL_setmodel);
 
 	e = PRVM_G_EDICT(OFS_PARM0);
+	e->fields.client->modelindex = 0;
+	e->fields.client->model = 0;
+
 	m = PRVM_G_STRING(OFS_PARM1);
+	mod = NULL;
 	for (i = 0;i < MAX_MODELS && cl.csqc_model_precache[i];i++)
 	{
 		if (!strcmp(cl.csqc_model_precache[i]->name, m))
 		{
-			e->fields.client->model = PRVM_SetEngineString(cl.csqc_model_precache[i]->name);
+			mod = cl.csqc_model_precache[i];
+			e->fields.client->model = PRVM_SetEngineString(mod->name);
 			e->fields.client->modelindex = -(i+1);
-			return;
+			break;
 		}
 	}
 
-	for (i = 0;i < MAX_MODELS;i++)
-	{
-		mod = cl.model_precache[i];
-		if (mod && !strcmp(mod->name, m))
+	if( !mod ) {
+		for (i = 0;i < MAX_MODELS;i++)
 		{
-			e->fields.client->model = PRVM_SetEngineString(mod->name);
-			e->fields.client->modelindex = i;
-			return;
+			mod = cl.model_precache[i];
+			if (mod && !strcmp(mod->name, m))
+			{
+				e->fields.client->model = PRVM_SetEngineString(mod->name);
+				e->fields.client->modelindex = i;
+				break;
+			}
 		}
 	}
 
-	e->fields.client->modelindex = 0;
-	e->fields.client->model = 0;
-	VM_Warning ("setmodel: model '%s' not precached\n", m);
-
-	// TODO: check if this breaks needed consistency and maybe add a cvar for it too?? [1/10/2008 Black]
-	if (mod)
-	{
-		SetMinMaxSize (e, mod->normalmins, mod->normalmaxs);
-	}
+	if( mod ) {
+		// TODO: check if this breaks needed consistency and maybe add a cvar for it too?? [1/10/2008 Black]
+		//SetMinMaxSize (e, mod->normalmins, mod->normalmaxs);
+	} 
 	else
+	{
 		SetMinMaxSize (e, vec3_origin, vec3_origin);
+		VM_Warning ("setmodel: model '%s' not precached\n", m);
+	}
 }
 
 // #4 void(entity e, vector min, vector max) setsize
@@ -2459,7 +2464,7 @@ void VM_CL_R_PolygonBegin (void)
 		return;
 	}
 	picname = PRVM_G_STRING(OFS_PARM0);
-	polys->begin_texture = picname[0] ? Draw_CachePic(picname, true)->tex : r_texture_white;
+	polys->begin_texture = picname[0] ? Draw_CachePic (picname)->tex : r_texture_white;
 	polys->begin_drawflag = (int)PRVM_G_FLOAT(OFS_PARM1);
 	polys->begin_vertices = 0;
 	polys->begin_active = true;
@@ -2525,7 +2530,7 @@ void Debug_PolygonBegin(const char *picname, int drawflag)
 		Con_Printf("Debug_PolygonBegin: called twice without Debug_PolygonEnd after first\n");
 		return;
 	}
-	debugPolys.begin_texture = picname[0] ? Draw_CachePic(picname, true)->tex : r_texture_white;
+	debugPolys.begin_texture = picname[0] ? Draw_CachePic (picname)->tex : r_texture_white;
 	debugPolys.begin_drawflag = drawflag;
 	debugPolys.begin_vertices = 0;
 	debugPolys.begin_active = true;