Megahealth is not a powerup. Always enable it

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index c3827e2cf6e320354bf8ff0c335144e25d644bd3..bb9f02a83f5f3b2ce6649031023562903be53fa8 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -431,7 +431,6 @@ set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved t
 set g_pinata 0 "if set to 1 you will not only drop your current weapon when you are killed, but you will drop all weapons that you possessed"\r
 set g_weapon_stay 0 "if set to 1 or 2, weapons stay after they were picked up (1: weapons you don't have yet give you ammo of their type and they can not be dropped, 2: weapons don't give ammo, but instead players start with one pickup-load of ammo by default, 3: weapons give ammo, weapons only stay as ammo-less ghosts)"\r
 set g_weapon_throwable 1 "if set to 1, weapons can be dropped"\r
-set g_powerup_superhealth 1 "if set to 0 the mega health powerup will not spawn on the map"\r
 set g_powerup_strength 1 "if set to 0 the strength powerup will not spawn on the map"\r
 set g_powerup_shield 1 "if set to 0 the shield (invincibility) powerup will not spawn on the map"\r
 set g_balance_powerup_timer 1 "if set to 0 the powerups dont wear off"\r
@@ -619,7 +618,7 @@ seta g_arena 0 "Arena: many one-on-one rounds are played to find the winner"
 set g_arena_maxspawned 2       "maximum number of players to spawn at once (the rest is spectating, waiting for their turn)"\r
 set g_arena_roundbased 1       "if disabled, the next player will spawn as soon as someone dies"\r
 set g_arena_warmup 5   "time, newly spawned players have to prepare themselves in round based matches"\r
-set g_arena_powerups 0 "enables powerups (superhealth, strength and shield), which are removed by default"\r
+set g_arena_powerups 0 "enables powerups (strength and shield), which are removed by default"\r
 \r
 // ca\r
 seta g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round."\r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 0c02da266aaa98c3271005403f4a92f36a0d8545..d936ddb7b3267986014254febe3568db8fd2fc21 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -1095,12 +1095,6 @@ void spawnfunc_item_health_large (void) {
 }\r
 \r
 void spawnfunc_item_health_mega (void) {\r
-       if(!cvar("g_powerup_superhealth"))\r
-               return;\r
-\r
-       if((g_arena || g_ca) && !cvar("g_arena_powerups"))\r
-               return;\r
-\r
        if(!self.max_health)\r
                self.max_health = g_pickup_healthmega_max;\r
        if(!self.health)\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 79528ec8b31a183c1a5e02eff65ba457cee17f53..bfe98ac6d05e13a823e610b72ff30aa257e09246 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -170,4 +170,6 @@
 \r
 - 0.8: Why am I not seeing frags and death in the scoreboard in Team Deathmatch?\r
 \r
-- 0.8: If we eat a team mate, then a consumable item, then the tea mate gets out, autodigest won't start digesting the consumable item
\ No newline at end of file
+- 0.8: If we eat a team mate, then a consumable item, then the tea mate gets out, autodigest won't start digesting the consumable item\r
+\r
+- 0.8: Add warmup stage to the menu
\ No newline at end of file