X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=e84c6d696a91e691ccadabf6c68cd927febbc97f;hb=ffc8306348654f791a14dfb6ffe918083067244c;hp=94ba20f10d8320b07f4b1d18e0232cb6dd04bf4d;hpb=719b47d60479f233baa8719e66e73a60bff28176;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 94ba20f10..e84c6d696 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -20,7 +20,7 @@ void sandbox_ObjectFunction_Touch()
 	intensity = vlen(self.velocity) + vlen(other.velocity);
 	if(intensity) // avoid divisions by 0
 		intensity /= 2; // average the two velocities
-	if not(intensity >= autocvar_g_sandbox_object_material_velocity_min)
+	if (!(intensity >= autocvar_g_sandbox_object_material_velocity_min))
 		return; // impact not strong enough to do anything
 	// now offset intensity and apply it to the effects
 	intensity -= autocvar_g_sandbox_object_material_velocity_min; // start from minimum velocity, not actual velocity
@@ -56,6 +56,8 @@ void sandbox_ObjectFunction_Think()
 	}
 
 	self.nextthink = time;
+	
+	CSQCMODEL_AUTOUPDATE();
 }
 
 .float old_solid, old_movetype;
@@ -74,7 +76,7 @@ entity sandbox_ObjectEdit_Get(float permissions)
 		return trace_ent; // don't check permissions, anyone can edit this object
 	if(trace_ent.crypto_idfp == "")
 		return trace_ent; // the player who spawned this object did not have an UID, so anyone can edit it
-	if not(trace_ent.realowner != self && autocvar_g_sandbox_editor_free < 2)
+	if (!(trace_ent.realowner != self && autocvar_g_sandbox_editor_free < 2))
 		return trace_ent; // object does not belong to the player, and players can only edit their own objects on this server
 	return world;
 }
@@ -137,7 +139,7 @@ entity sandbox_ObjectSpawn(float database)
 {
 	// spawn a new object with default properties
 
-	entity e;
+	entity e, oldself;
 	e = spawn();
 	e.classname = "object";
 	e.takedamage = DAMAGE_AIM;
@@ -172,6 +174,11 @@ entity sandbox_ObjectSpawn(float database)
 		setorigin(e, trace_endpos);
 		e.angles_y = self.v_angle_y;
 	}
+	
+	oldself = self;
+	self = e;
+	CSQCMODEL_AUTOINIT();
+	self = oldself;
 
 	object_count += 1;
 	return e;
@@ -484,7 +491,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 					print_to(self, "^1SANDBOX - WARNING: ^7Attempted to spawn an object without specifying a model. Please specify the path to your model file after the 'object_spawn' command");
 					return TRUE;
 				}
-				if not(fexists(argv(2)))
+				if (!(fexists(argv(2))))
 				{
 					print_to(self, "^1SANDBOX - WARNING: ^7Attempted to spawn an object with a non-existent model. Make sure the path to your model file is correct");
 					return TRUE;