Fixing cvar names

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 30565d1765edbe03619dcfb51ced99e290c0e693..ad1af0280030b41143b3678a2e47fd38a572b0ff 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -409,7 +409,7 @@ void PutObserverInServer(entity this, bool is_forced)
                CS(this).just_joined = false;
        
        // for RJZ
-       if (autocvar_g_count_shards)
+       if (autocvar_rjz_count_shards)
                send_TotalShards(this);
 }
 

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index eee028ff311bbe8128e7620d65d02bf63ffdfc4f..cf48ca1a765f9fe592de06d629ee3e6a34c1a429 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -354,7 +354,7 @@ void reset_map(bool dorespawn, bool is_fake_round_start)
        }
        
        // for RJZ
-       if (autocvar_g_count_shards) {
+       if (autocvar_rjz_count_shards) {
                total_shards = 0;
                send_TotalShardsAll();
        }

diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index a59d465e824465009bbbfcd777e35fe3490a354d..e09772c32b2e668d8a591913ec7f2445aacae9d7 100644 (file)
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@ -531,7 +531,7 @@ bool Item_GiveTo(entity item, entity player)
        pickedup |= Item_GiveAmmoTo(item, player, RES_FUEL, g_pickup_fuel_max);
        
        // for RJZ
-       if (autocvar_g_count_shards && !warmup_stage && item.itemdef == ITEM_ArmorSmall) {
+       if (autocvar_rjz_count_shards && !warmup_stage && item.itemdef == ITEM_ArmorSmall) {
                total_shards++;
                send_TotalShardsAll();
        }

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 61dbcf7078db50c2864aa38397ce7f40e92acc5d..671e349903d40ecc21b14e39e7e77a043f32cc47 100644 (file)
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -104,7 +104,7 @@ const float SPAWNFLAG_NO_WAYPOINTS_FOR_ITEMS = 1;
 void send_TotalShards(entity to) {
        // for RJZ
        // Send total number of picked up shards
-       if(!autocvar_g_count_shards) return;
+       if(!autocvar_rjz_count_shards) return;
        if(!IS_REAL_CLIENT(to)) return;
        
        msg_entity = to;
@@ -115,7 +115,7 @@ void send_TotalShards(entity to) {
 void send_TotalShardsAll() {
        // for RJZ
        // Send total number of picked up shards
-       if(!autocvar_g_count_shards) return;
+       if(!autocvar_rjz_count_shards) return;
        
        FOREACH_CLIENT(IS_REAL_CLIENT(it) && (IS_SPEC(it) || IS_OBSERVER(it)), {
                send_TotalShards(it);
@@ -1065,7 +1065,7 @@ spawnfunc(worldspawn)
                round_handler_Activate(true);
        
        // for RJZ
-       if (autocvar_g_count_shards && warmup_stage) {
+       if (autocvar_rjz_count_shards && warmup_stage) {
                total_shards = -2;
                send_TotalShardsAll();
        }

diff --git a/qcsrc/server/world.qh b/qcsrc/server/world.qh
index d8fc65566bae1c8dea51598823b8cb5946a74aff..2844a0a660b3b17ef408263fc9834eaf8a43958b 100644 (file)
--- a/qcsrc/server/world.qh
+++ b/qcsrc/server/world.qh
@@ -161,7 +161,7 @@ void readlevelcvars();
 void droptofloor(entity this);
 
 /* z411 for RJZ */
-bool autocvar_g_count_shards = false;
+bool autocvar_rjz_count_shards = false;
 int  total_shards = 0;
 void send_TotalShards(entity to);
 void send_TotalShardsAll();