From b6bbd379f7d3ab0a039b7cd9016860a7b99f3dc9 Mon Sep 17 00:00:00 2001 From: z411 Date: Sun, 23 Jan 2022 14:43:35 -0300 Subject: [PATCH] Fixing cvar names --- qcsrc/server/client.qc | 2 +- qcsrc/server/command/vote.qc | 2 +- qcsrc/server/items/items.qc | 2 +- qcsrc/server/world.qc | 6 +++--- qcsrc/server/world.qh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 30565d176..ad1af0280 100644 --- 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 eee028ff3..cf48ca1a7 100644 --- 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 a59d465e8..e09772c32 100644 --- 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 61dbcf707..671e34990 100644 --- 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 d8fc65566..2844a0a66 100644 --- 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(); -- 2.39.2