From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 4 Dec 2011 17:07:49 +0000 (+0200)
Subject: Use SOLID_TRIGGER instead of SOLID_NOT for attachments or non-solid object. This... 
X-Git-Tag: xonotic-v0.6.0~35^2~15^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ec0d17bebcfd7caea5f58a72350fef3b1a59438d;p=xonotic%2Fxonotic-data.pk3dir.git

Use SOLID_TRIGGER instead of SOLID_NOT for attachments or non-solid object. This seems to make grabbing non-solid sandbox objects possible, although the dragging itself is based on trace_ent so I don't understand how this can be (given neither SOLID_NOT or SOLID_TRIGGER can get traced, so it shouldn't make a difference). This seems to work though, so I guess it's good SOLID_TRIGGER should also be better for possible changes that might get done in the future.
---

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 59d9fba23..b72042502 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -63,11 +63,10 @@ entity sandbox_ObjectEdit_Get(float permissions)
 {
 	// returns the traced entity if the player can edit it, and world if not
 	// if permissions if FALSE, the object is returned regardless of editing rights
-	// attached objects are SOLID_NOT and don't risk getting traced
-	entity head;
 
 	// Tracing does not work for entities that use SOLID_NOT or SOLID_TRIGGER. Therefore, make all
 	// objects temporarily solid while doing the trace, then revert them to their initial solidity.
+	entity head;
 	for(head = world; (head = find(head, classname, "object")); )
 	{
 		if(head.owner == world) // skip attached objects
@@ -86,6 +85,8 @@ entity sandbox_ObjectEdit_Get(float permissions)
 
 	if(trace_ent.classname != "object")
 		return world; // entity is not an object
+	if(trace_ent.owner != world)
+		return world; // entity is an attached object
 	if(!permissions)
 		return trace_ent; // don't check permissions, anyone can edit this object
 	if(!trace_ent.crypto_idfp)
@@ -117,7 +118,7 @@ void sandbox_ObjectAttach_Set(entity e, entity parent, string s)
 	e.old_solid = e.solid; // persist solidity
 	e.old_movetype = e.movetype; // persist physics
 	e.movetype = MOVETYPE_FOLLOW;
-	e.solid = SOLID_NOT;
+	e.solid = SOLID_TRIGGER;
 	e.takedamage = DAMAGE_NO;
 
 	setattachment(e, parent, s);
@@ -650,7 +651,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 							switch(argv(3))
 							{
 								case "0": // non-solid
-									e.solid = SOLID_NOT;
+									e.solid = SOLID_TRIGGER;
 									break;
 								case "1": // solid
 									e.solid = SOLID_BBOX;