From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 10 Nov 2010 06:22:46 +0000 (+0100)
Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.1.0preview~167
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=796dc2cde859d73e914229d8a9163164bfeaca10

Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
---

796dc2cde859d73e914229d8a9163164bfeaca10
diff --cc qcsrc/server/cl_client.qc
index b9acee43c2,0fbf3971df..1438d317c7
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1091,10 -1091,11 +1091,11 @@@ float ClientInit_SendEntity(entity to, 
  		WriteString(MSG_ENTITY, "");
  	WriteByte(MSG_ENTITY, self.count * 255.0); // g_balance_armor_blockpercent
  	WriteByte(MSG_ENTITY, self.cnt * 255.0); // g_balance_weaponswitchdelay
 -	WriteCoord(MSG_ENTITY, self.bouncefactor); // g_balance_grenadelauncher_secondary_bouncefactor
 -	WriteCoord(MSG_ENTITY, self.bouncestop); // g_balance_grenadelauncher_secondary_bouncestop
 +	WriteCoord(MSG_ENTITY, self.bouncefactor); // g_balance_grenadelauncher_bouncefactor
 +	WriteCoord(MSG_ENTITY, self.bouncestop); // g_balance_grenadelauncher_bouncestop
  	WriteByte(MSG_ENTITY, cvar("g_balance_nex_secondary")); // client has to know if it should zoom or not
  	WriteByte(MSG_ENTITY, cvar("g_balance_campingrifle_secondary")); // client has to know if it should zoom or not
+ 	WriteByte(MSG_ENTITY, serverflags); // client has to know if it should zoom or not
  	return TRUE;
  }