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 b9627ee1e74500a1ce5d1e05451c924edf86194f..8c9058d6b15044684d9592c187296b469cdd775b 100644 (file)
--- 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;\r
 const float            STAT_WEAPONMODEL                                = 2;\r
 const float            STAT_AMMO                                               = 3;\r
 const float            STAT_HEALTH                                             = 0;\r
 const float            STAT_WEAPONMODEL                                = 2;\r
 const float            STAT_AMMO                                               = 3;\r

-const float            STAT_ARMOR                                              = 4;    // armor is not used in Vore Tournament by default, but still exists for mods that might want it\r
+const float            STAT_ARMOR                                              = 4;\r

 const float            STAT_WEAPONFRAME                                = 5;\r
 // const float STAT_SHELLS                                             = 6;\r
 // const float STAT_NAILS                                              = 7;\r
 const float            STAT_WEAPONFRAME                                = 5;\r
 // const float STAT_SHELLS                                             = 6;\r
 // const float STAT_NAILS                                              = 7;\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 4fdfb77e5bfa524a600eec966165fdff9691ab92..33d31f39b276534cd8e8aaa459ab65a4b14d8777 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2928,7 +2928,7 @@ void Sbar_Draw (void)
                else\r
                        Sbar_DrawScoreboard();\r
                float armor, health;\r
                else\r
                        Sbar_DrawScoreboard();\r
                float armor, health;\r

-               armor = getstati(STAT_ARMOR); // armor is not used in Vore Tournament by default, but still exists for mods that might want it\r
+               armor = getstati(STAT_ARMOR);\r

                health = getstati(STAT_HEALTH);\r
 \r
                stat_items = getstati(STAT_ITEMS);\r
                health = getstati(STAT_HEALTH);\r
 \r
                stat_items = getstati(STAT_ITEMS);\r

diff --git a/data/qcsrc/common/items.qh b/data/qcsrc/common/items.qh
index 2650545841ec7af890a0efe3234e9c359a7dbe91..de400143308ffe646b57cb8de4e1259bd21f9b53 100644 (file)
--- a/data/qcsrc/common/items.qh
+++ b/data/qcsrc/common/items.qh
@@ -39,7 +39,7 @@ float IT_HEALTH                               = 32768;
 float  IT_5HP                                  = 524288;\r
 float  IT_25HP                                 = 1048576;\r
 float  IT_ARMOR_SHARD                  = 2097152;\r
 float  IT_5HP                                  = 524288;\r
 float  IT_25HP                                 = 1048576;\r
 float  IT_ARMOR_SHARD                  = 2097152;\r

-float  IT_ARMOR                                = 4194304; // armor is not used in Vore Tournament by default, but still exists for mods that might want it\r
+float  IT_ARMOR                                = 4194304;\r

 \r
 float  IT_AMMO                                 = 8064; // IT_FUEL;\r
 float  IT_PICKUPMASK           = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately\r
 \r
 float  IT_AMMO                                 = 8064; // IT_FUEL;\r
 float  IT_PICKUPMASK           = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately\r