Merge remote branch 'origin/fruitiex/loadblackbg'

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

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index d5ffae1e50d33f416fa9d05a30185107eb183e2b..7dc5520abfe036f2065f1acd66b526c0e9734645 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -10,8 +10,19 @@ void send_CSQC_nexvelocity(entity e) {
        msg_entity = e;
        WriteByte(MSG_ONE, SVC_TEMPENTITY);
        WriteByte(MSG_ONE, TE_CSQC_NEX_VELOCITY);
+       WriteByte(MSG_ONE, bound(0, fabs(cvar("g_balance_nex_velocitydependent_halflife")), 1));
        WriteShort(MSG_ONE, cvar("g_balance_nex_velocitydependent_minspeed"));
        WriteShort(MSG_ONE, cvar("g_balance_nex_velocitydependent_maxspeed"));
+       WriteByte(MSG_ONE, cvar("g_balance_nex_velocitydependent_falloff_rate"));
+       WriteByte(MSG_ONE, cvar("g_balance_nex_secondary_charge"));
+       WriteByte(MSG_ONE, cvar("g_balance_nex_secondary_charge_rate"));
+}
+
+void send_CSQC_cr_maxbullets(entity e) {
+       msg_entity = e;
+       WriteByte(MSG_ONE, SVC_TEMPENTITY);
+       WriteByte(MSG_ONE, TE_CSQC_CR_MAXBULLETS);
+       WriteByte(MSG_ONE, cvar("g_balance_campingrifle_magazinecapacity"));
 }
 
 void Announce(string snd) {
@@ -1607,6 +1618,7 @@ void ClientConnect (void)
                send_CSQC_teamnagger();
 
        send_CSQC_nexvelocity(self);
+       send_CSQC_cr_maxbullets(self);
 
        CheatInitClient();
 }