X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcheats.qc;h=5c08d7bbd0473c2a44ed533e764ae764a65c57a8;hb=1b130c7ceb9f035ba250a879967d8356552bb914;hp=017999d761becfb892d56dc535ff8f2c43a9a148;hpb=5b9c815160b06ce5d741df5fb4497242c3419f9a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 017999d76..5c08d7bbd 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -144,7 +144,7 @@ float CheatImpulse(float i)
 			self.personal.ammo_fuel = self.ammo_fuel;
 			self.personal.health = self.health;
 			self.personal.armorvalue = self.armorvalue;
-			WEPSET_COPY_EE(self.personal, self);
+			self.personal.weapons = self.weapons;
 			self.personal.items = self.items;
 			self.personal.pauserotarmor_finished = self.pauserotarmor_finished;
 			self.personal.pauserothealth_finished = self.pauserothealth_finished;
@@ -201,7 +201,7 @@ float CheatImpulse(float i)
 				self.ammo_fuel = self.personal.ammo_fuel;
 				self.health = self.personal.health;
 				self.armorvalue = self.personal.armorvalue;
-				WEPSET_COPY_EE(self, self.personal);
+				self.weapons = self.personal.weapons;
 				self.items = self.personal.items;
 				self.pauserotarmor_finished = time + self.personal.pauserotarmor_finished - self.personal.teleport_time;
 				self.pauserothealth_finished = time + self.personal.pauserothealth_finished - self.personal.teleport_time;
@@ -236,7 +236,7 @@ float CheatImpulse(float i)
 					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) ? 100 : 100000), 1024, 256))
+			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) ? 100 : 100000), 384, 384))
 			{
 				sprint(self, "Emergency teleport used random location\n");
 				self.angles_x = -self.angles_x;
@@ -260,7 +260,7 @@ float CheatImpulse(float i)
 				e = self;
 
 			pointparticles(particleeffectnum("rocket_explode"), e.origin, '0 0 0', 1);
-			sound(e, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+			sound(e, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
 
 			e2 = spawn();
 			setorigin(e2, e.origin);
@@ -880,7 +880,7 @@ void Drag_Begin(entity dragger, entity draggee, vector touchpoint)
 	draggee.draggravity = draggee.gravity;
 	draggee.movetype = MOVETYPE_WALK;
 	draggee.gravity = 0.00001;
-	draggee.flags &~= FL_ONGROUND;
+	draggee.flags &= ~FL_ONGROUND;
 	draggee.draggedby = dragger;
 
 	dragger.dragentity = draggee;
@@ -985,7 +985,7 @@ void Drag_Update(entity dragger)
 	entity draggee;
 
 	draggee = dragger.dragentity;
-	draggee.flags &~= FL_ONGROUND;
+	draggee.flags &= ~FL_ONGROUND;
 
 	curorigin = gettaginfo(draggee, 0);
 	curorigin = curorigin + v_forward * dragger.draglocalvector_x + v_right * dragger.draglocalvector_y + v_up * dragger.draglocalvector_z;