X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcheats.qc;h=5ba860940a014344a3338f27551448ddbce0ad31;hb=1c2bdc1f0012349f80906e05902ce19bed35be16;hp=c03ea7ae0915e07b5b3a1d8c6c0d68554a9b46f1;hpb=12e90348bf3dcdf2feb0753b440f050e23abfb6b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index c03ea7ae0..5ba860940 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -89,10 +89,37 @@ float CheatsAllowed(float i, float argc, float fr) // the cheat gets passed as a
 	ADD_CHEATS(self,cheating); \
 	return attempting
 #define IS_CHEAT(i,argc,fr) \
-	++attempting; \
-	if(!CheatsAllowed(i,argc,fr)) \
+	if((++attempting, !CheatsAllowed(i,argc,fr))) \
 		break
 
+float num_autoscreenshot;
+void info_autoscreenshot_findtarget()
+{
+	entity e;
+	e = find(world, targetname, self.target);
+	if(!e)
+	{
+		objerror("Missing target. FAIL!");
+		return;
+	}
+	vector a = vectoangles(e.origin - self.origin);
+	a_x = -a_x; // don't ask
+	self.angles_x = a_x;
+	self.angles_y = a_y;
+	// we leave Rick Roll alone
+}
+void spawnfunc_info_autoscreenshot()
+{
+	if(++num_autoscreenshot > autocvar_g_max_info_autoscreenshot)
+	{
+		objerror("Too many info_autoscreenshot entitites. FAIL!");
+		return;
+	}
+	if(self.target != "")
+		InitializeEntity(self, info_autoscreenshot_findtarget, INITPRIO_FINDTARGET);
+	// this one just has to exist
+}
+
 float CheatImpulse(float i)
 {
 	BEGIN_CHEAT_FUNCTION();
@@ -215,8 +242,25 @@ float CheatImpulse(float i)
 			break;
 		case CHIMPULSE_TELEPORT:
 			IS_CHEAT(i, 0, 0);
+			if(self.movetype == MOVETYPE_NOCLIP)
+			{
+				e = find(world, classname, "info_autoscreenshot");
+				if(e)
+				{
+					sprint(self, "Emergency teleport used info_autoscreenshot location\n");
+					setorigin(self, e.origin);
+					self.angles = e.angles;
+					remove(e);
+					// should we? self.angles_x = -self.angles_x;
+					self.fixangle = TRUE;
+					self.velocity = '0 0 0';
+					DID_CHEAT();
+					break;
+				}
+			}
 			if(MoveToRandomMapLocation(self, DPCONTENTS_SOLID | DPCONTENTS_CORPSE | DPCONTENTS_PLAYERCLIP, DPCONTENTS_SLIME | DPCONTENTS_LAVA | DPCONTENTS_SKY | DPCONTENTS_BODY | DPCONTENTS_DONOTENTER, Q3SURFACEFLAG_SKY, ((gamestart_sv_cheats >= 2) ? 100000 : 100), 1024, 256))
 			{
+				sprint(self, "Emergency teleport used random location\n");
 				self.angles_x = -self.angles_x;
 				self.fixangle = TRUE;
 				self.velocity = '0 0 0';
@@ -229,7 +273,7 @@ float CheatImpulse(float i)
 			IS_CHEAT(i, 0, 0);
 			FOR_EACH_PLAYER(e)
 			{
-				get_model_parameters(e.playermodel, e.skinindex);
+				get_model_parameters(e.playermodel, e.skin);
 				if(get_model_parameters_sex == "Female")
 				{
 					makevectors(e.angles);
@@ -704,25 +748,27 @@ float CheatFrame()
 				// it goes out of range while slinging it around.
 
 				float drag;
-				makevectors(self.v_angle);
-				WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_grab_range, MOVE_NORMAL, self);
-				switch(trace_ent.grab)
+				crosshair_trace_plusvisibletriggers(self);
+				if(vlen(self.origin - trace_ent.origin) <= autocvar_g_grab_range)
 				{
-					case 0: // can't grab
-						break;
-					case 1: // owner can grab
-						if(trace_ent.owner == self || trace_ent.realowner == self)
-							drag = TRUE;
-						break;
-					case 2: // owner and team mates can grab
-						if(!IsDifferentTeam(trace_ent.owner, self) || !IsDifferentTeam(trace_ent.realowner, self) || trace_ent.team == self.team)
+					switch(trace_ent.grab)
+					{
+						case 0: // can't grab
+							break;
+						case 1: // owner can grab
+							if(trace_ent.owner == self || trace_ent.realowner == self)
+								drag = TRUE;
+							break;
+						case 2: // owner and team mates can grab
+							if(!IsDifferentTeam(trace_ent.owner, self) || !IsDifferentTeam(trace_ent.realowner, self) || trace_ent.team == self.team)
+								drag = TRUE;
+							break;
+						case 3: // anyone can grab
 							drag = TRUE;
-						break;
-					case 3: // anyone can grab
-						drag = TRUE;
-						break;
-					default:
-						break;
+							break;
+						default:
+							break;
+					}
 				}
 				Drag(trace_ent, drag, FALSE); // execute dragging
 			}