From 06d3f628c5e91ba1dec8016ef082f664e59d2eb6 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 6 Mar 2016 01:40:42 +1000 Subject: [PATCH] Remove a few old TODOs that now have issues --- qcsrc/client/main.qc | 1 - qcsrc/common/effects/qc/globalsound.qh | 2 -- qcsrc/common/mutators/mutator/instagib/instagib.qc | 2 +- qcsrc/common/mutators/mutator/waypoints/all.qh | 1 - qcsrc/common/t_items.qc | 1 - qcsrc/common/t_items.qh | 1 - qcsrc/server/autocvars.qh | 2 +- qcsrc/server/cl_player.qc | 4 ++-- 8 files changed, 4 insertions(+), 10 deletions(-) diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 5984aba93..d787dc0f5 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -940,7 +940,6 @@ bool CSQC_Parse_TempEntity() return false; } -/** TODO somehow thwart prvm_globalset client ... */ string forcefog; void Fog_Force() { diff --git a/qcsrc/common/effects/qc/globalsound.qh b/qcsrc/common/effects/qc/globalsound.qh index 22e04e94a..7cb8fdb3e 100644 --- a/qcsrc/common/effects/qc/globalsound.qh +++ b/qcsrc/common/effects/qc/globalsound.qh @@ -23,8 +23,6 @@ STATIC_INIT(PlayerSounds_renumber) } REGISTRY_CHECK(PlayerSounds) -// TODO implement fall and falling - REGISTER_PLAYERSOUND(death) REGISTER_PLAYERSOUND(drown) REGISTER_PLAYERSOUND(fall) diff --git a/qcsrc/common/mutators/mutator/instagib/instagib.qc b/qcsrc/common/mutators/mutator/instagib/instagib.qc index 640e3d5b6..85e97178c 100644 --- a/qcsrc/common/mutators/mutator/instagib/instagib.qc +++ b/qcsrc/common/mutators/mutator/instagib/instagib.qc @@ -293,7 +293,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerDamage_Calculate) frag_target.armorvalue -= 1; frag_damage = 0; frag_target.damage_dealt += 1; - frag_attacker.damage_dealt += 1; // TODO: change this to a specific hitsound for armor hit + frag_attacker.damage_dealt += 1; Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_INSTAGIB_LIVES_REMAINING, frag_target.armorvalue); } } diff --git a/qcsrc/common/mutators/mutator/waypoints/all.qh b/qcsrc/common/mutators/mutator/waypoints/all.qh index 17a103dd4..2b28784b7 100644 --- a/qcsrc/common/mutators/mutator/waypoints/all.qh +++ b/qcsrc/common/mutators/mutator/waypoints/all.qh @@ -42,7 +42,6 @@ REGISTER_RADARICON(NONE, 0); REGISTER_RADARICON(FLAG, 1); REGISTER_RADARICON(FLAGCARRIER, 1); -// TODO make these 3 and 4, and make images for them REGISTER_RADARICON(HERE, 1); REGISTER_RADARICON(DANGER, 1); diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 9c8c42115..7da52d573 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -902,7 +902,6 @@ void Item_FindTeam() } // Savage: used for item garbage-collection -// TODO: perhaps nice special effect? void RemoveItem() {SELFPARAM(); if(wasfreed(self) || !self) { return; } diff --git a/qcsrc/common/t_items.qh b/qcsrc/common/t_items.qh index 86e5c7c8e..d6c97445f 100644 --- a/qcsrc/common/t_items.qh +++ b/qcsrc/common/t_items.qh @@ -94,7 +94,6 @@ void Item_Reset(entity this); void Item_FindTeam(); // Savage: used for item garbage-collection -// TODO: perhaps nice special effect? bool ItemSend(entity this, entity to, int sf); void ItemUpdate(entity this); diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 654bd2bc9..cd950738e 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -72,7 +72,7 @@ float autocvar_g_antilag_nudge; float autocvar_g_balance_armor_blockpercent; int autocvar_g_balance_armor_limit; float autocvar_g_balance_armor_regen; -float autocvar_g_balance_armor_regenlinear; // TODO: int/bool? +float autocvar_g_balance_armor_regenlinear; int autocvar_g_balance_armor_regenstable; float autocvar_g_balance_armor_rot; float autocvar_g_balance_armor_rotlinear; diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index fe0951e87..69505bcdd 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -435,7 +435,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, { if(deathtype == DEATH_FALL.m_id) PlayerSound(this, playersound_fall, CH_PAIN, VOICETYPE_PLAYERSOUND); - else if(this.health > 75) // TODO make a "gentle" version? + else if(this.health > 75) PlayerSound(this, playersound_pain100, CH_PAIN, VOICETYPE_PLAYERSOUND); else if(this.health > 50) PlayerSound(this, playersound_pain75, CH_PAIN, VOICETYPE_PLAYERSOUND); @@ -514,7 +514,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, if(valid_damage_for_weaponstats) WeaponStats_LogKill(awep.m_id, abot, PS(this).m_weapon.m_id, vbot); - if(autocvar_sv_gentle < 1) // TODO make a "gentle" version? + if(autocvar_sv_gentle < 1) if(sound_allowed(MSG_BROADCAST, attacker)) { if(deathtype == DEATH_DROWN.m_id) -- 2.39.2