From: MirceaKitsune Date: Sat, 26 Feb 2011 23:10:24 +0000 (+0200) Subject: Remove comments saying armor is not used in VT. Now it is :) X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=91370d78165cc53ce8d6663b8aa1ad873c1216be;p=voretournament%2Fvoretournament.git Remove comments saying armor is not used in VT. Now it is :) --- diff --git a/data/qcsrc/client/csqc_constants.qc b/data/qcsrc/client/csqc_constants.qc index b9627ee1..8c9058d6 100644 --- a/data/qcsrc/client/csqc_constants.qc +++ b/data/qcsrc/client/csqc_constants.qc @@ -45,7 +45,7 @@ const float VF_CL_VIEWANGLES_Z = 36; //(float) const float STAT_HEALTH = 0; const float STAT_WEAPONMODEL = 2; const float STAT_AMMO = 3; -const float STAT_ARMOR = 4; // armor is not used in Vore Tournament by default, but still exists for mods that might want it +const float STAT_ARMOR = 4; const float STAT_WEAPONFRAME = 5; // const float STAT_SHELLS = 6; // const float STAT_NAILS = 7; diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc index 4fdfb77e..33d31f39 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -2928,7 +2928,7 @@ void Sbar_Draw (void) else Sbar_DrawScoreboard(); float armor, health; - armor = getstati(STAT_ARMOR); // armor is not used in Vore Tournament by default, but still exists for mods that might want it + armor = getstati(STAT_ARMOR); health = getstati(STAT_HEALTH); stat_items = getstati(STAT_ITEMS); diff --git a/data/qcsrc/common/items.qh b/data/qcsrc/common/items.qh index 26505458..de400143 100644 --- a/data/qcsrc/common/items.qh +++ b/data/qcsrc/common/items.qh @@ -39,7 +39,7 @@ float IT_HEALTH = 32768; float IT_5HP = 524288; float IT_25HP = 1048576; float IT_ARMOR_SHARD = 2097152; -float IT_ARMOR = 4194304; // armor is not used in Vore Tournament by default, but still exists for mods that might want it +float IT_ARMOR = 4194304; float IT_AMMO = 8064; // IT_FUEL; float IT_PICKUPMASK = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately