Merge branch 'master' into terencehill/cursormode

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cheats.qc

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index b3487657de98cdc12b54c7a886db5165db91b697..5ba860940a014344a3338f27551448ddbce0ad31 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -1,4 +1,4 @@
-entity CopyBody(float keepvelocity);
+void CopyBody(float keepvelocity);
 
 #ifdef NOCHEATS
 
@@ -158,18 +158,15 @@ float CheatImpulse(float i)
                case CHIMPULSE_CLONE_MOVING:
                        IS_CHEAT(i, 0, 0);
                        makevectors (self.v_angle);
-                       e = CopyBody(1);
-                       if(e.colormap <= maxclients && e.colormap > 0)
-                               e.colormap = 1024 + self.clientcolors;
-                       e.velocity = e.velocity + v_forward * 300;
+                       self.velocity = self.velocity + v_forward * 300;
+                       CopyBody(1);
                        self.lip += 1;
+                       self.velocity = self.velocity - v_forward * 300;
                        DID_CHEAT();
                        break;
                case CHIMPULSE_CLONE_STANDING:
                        IS_CHEAT(i, 0, 0);
-                       e = CopyBody(0);
-                       if(e.colormap <= maxclients && e.colormap > 0)
-                               e.colormap = 1024 + self.clientcolors;
+                       CopyBody(0);
                        self.lip += 1;
                        DID_CHEAT();
                        break;