Merge remote-tracking branch 'origin/samual/no_dead_airshots'

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

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index d7cb0ce629a814894cdba4c23ca8278ff9bf5f88..0cc1563916a035793579d15b412c98f10af3e3df 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -667,7 +667,7 @@ void Ent_ReadEntCS()
        sf = ReadByte();
 
        if(sf & 1)
-               self.sv_entnum = ReadByte() - 1;
+               self.sv_entnum = ReadByte();
        if(sf & 2)
        {
                self.origin_x = ReadShort();
@@ -683,14 +683,9 @@ void Ent_ReadEntCS()
                self.healthvalue = ReadByte() * 10;
        if(sf & 16)
                self.armorvalue = ReadByte() * 10;
-       if(sf & 128) // same team
-               self.sameteam = TRUE;
-       else
-               self.sameteam = FALSE;
 
        entcs_receiver[self.sv_entnum] = self;
        self.entremove = Ent_RemoveEntCS;
-       self.draw2d = Draw_ShowNames;
 
        InterpolateOrigin_Note();
 }
@@ -1100,7 +1095,7 @@ void Ent_Init()
        g_balance_electro_secondary_bouncestop = ReadCoord();
 
        nex_scope = !ReadByte();
-       sniperrifle_scope = !ReadByte();
+       rifle_scope = !ReadByte();
 
        serverflags = ReadByte();