From 2e6d8b54046d1c466a77baa9ff6e09d9dd79a3fc Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 29 Apr 2012 21:47:46 +0200 Subject: [PATCH] fix some more weird stuff --- qcsrc/server/cl_weaponsystem.qc | 1 - qcsrc/server/csqcprojectile.qc | 2 +- qcsrc/server/mutators/gamemode_keyhunt.qc | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index 12b369390..cbbe3d547 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -558,7 +558,6 @@ void CL_Weaponentity_Think() self.angles = '0 0 0'; float f; - f = 0; if (self.state == WS_RAISE && !intermission_running) { f = (self.owner.weapon_nextthink - time) * g_weaponratefactor / autocvar_g_balance_weaponswitchdelay; diff --git a/qcsrc/server/csqcprojectile.qc b/qcsrc/server/csqcprojectile.qc index fea89005a..3554f1ff6 100644 --- a/qcsrc/server/csqcprojectile.qc +++ b/qcsrc/server/csqcprojectile.qc @@ -80,9 +80,9 @@ void CSQCProjectile(entity e, float clientanimate, float type, float docull) else e.gravity = 0; - e.csqcprojectile_type = type; if(!sound_allowed(MSG_BROADCAST, e)) type |= 0x80; + e.csqcprojectile_type = type; } void UpdateCSQCProjectile(entity e) diff --git a/qcsrc/server/mutators/gamemode_keyhunt.qc b/qcsrc/server/mutators/gamemode_keyhunt.qc index d6413d33f..252f1abda 100644 --- a/qcsrc/server/mutators/gamemode_keyhunt.qc +++ b/qcsrc/server/mutators/gamemode_keyhunt.qc @@ -32,11 +32,11 @@ float kh_no_radar_circles; .float siren_time; // time delay the siren //.float stuff_time; // time delay to stuffcmd a cvar -float test[17] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; -//test[0] = status of dropped keys, test[1 - 16] = player # +float kh_keystatus[17]; +//kh_keystatus[0] = status of dropped keys, kh_keystatus[1 - 16] = player # //replace 17 with cvar("maxplayers") or similar !!!!!!!!! //for(i = 0; i < maxplayers; ++i) -// test[i] = "0"; +// kh_keystatus[i] = "0"; float kh_Team_ByID(float t) { @@ -342,7 +342,7 @@ void kh_Key_AssignTo(entity key, entity player) // runs every time a key is pic key.kh_next.kh_prev = key; float i; - i = test[key.owner.playerid]; + i = kh_keystatus[key.owner.playerid]; if(key.netname == "^1red key") i += 1; if(key.netname == "^4blue key") @@ -351,7 +351,7 @@ void kh_Key_AssignTo(entity key, entity player) // runs every time a key is pic i += 4; if(key.netname == "^6pink key") i += 8; - test[key.owner.playerid] = i; + kh_keystatus[key.owner.playerid] = i; kh_Key_Attach(key); -- 2.39.2