Revert "Fix colormap with copybody (so now, ghost bodies of dead players retain the...

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

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index e4415d631401db434d32e95debbedf5a68718498..5de1be4bc33b0e9cbbf1c351f2d98ad8918f856c 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -124,8 +124,6 @@ void WeaponStats_LogKill(float awep, float abot, float vwep, float vbot)
 .entity pusher;
 .float pushltime;
 
-.float oldcolormap; // also used in cl_client.c:void respawn(void)
-
 .float CopyBody_nextthink;
 .void(void) CopyBody_think;
 void CopyBody_Think(void)
@@ -151,7 +149,7 @@ void CopyBody(float keepvelocity)
        self = spawn();
        self.enemy = oldself;
        self.lip = oldself.lip;
-       self.colormap = oldself.oldcolormap;
+       self.colormap = oldself.colormap;
        self.iscreature = oldself.iscreature;
        self.damagedbycontents = oldself.damagedbycontents;
        self.angles = oldself.angles;