Merge branch 'samual/weapons' into Mario/weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / miscfunctions.qc

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 8b674e7826c2ccd6529e46a703d55ee00a21a2ae..fbdbc45f3a3c25a0c5f4f650c7cba9cfe2349b53 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -589,20 +589,6 @@ float getplayeralpha(float pl)
        return 1;
 }
 
        return 1;
 }
 

-vector getcsqcplayercolor(float pl)
-{
-       entity e;
-
-       e = CSQCModel_server2csqc(pl);
-       if(e)
-       {
-               if(e.colormap > 0)
-                       return colormapPaletteColor(((e.colormap >= 1024) ? e.colormap : stof(getplayerkeyvalue(e.colormap - 1, "colors"))) & 0x0F, TRUE);
-       }
-
-       return '1 1 1';
-}
-

 float getplayerisdead(float pl)
 {
        entity e;
 float getplayerisdead(float pl)
 {
        entity e;