# HG changeset patch
# User mikade
# Date 1315531276 -7200
# Node ID afb988c1a2fe96fee6ca767800f993128a9047c1
# Parent  e23ced69e03db55b34704d91e1af0523661911e9
Allow limited form of SuddenDeath (WaterRise = 0) in both CTF modes
Fix missing case of support for more players in CTF_Blizzard

diff -r e23ced69e03d -r afb988c1a2fe share/hedgewars/Data/Maps/CTF_Blizzard/map.lua
--- a/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua	Fri Sep 09 03:00:03 2011 +0200
+++ b/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua	Fri Sep 09 03:21:16 2011 +0200
@@ -1,5 +1,5 @@
 --------------------------------
--- CTF_BLIZZARD 0.8
+-- CTF_BLIZZARD 0.9
 --------------------------------
 
 ---------
@@ -68,14 +68,14 @@
 -- removed teleport from starting weapons
 -- increased captures to 3
 
------------
+------------
 -- 0.7
 ------------
 
 -- hopefully fixed a bug with the teleporters
 -- added a fix for crate possibly getting imbedded in land when it was near the water line
 
------------
+------------
 -- 0.8
 ------------
 
@@ -84,6 +84,13 @@
 -- changed hog placements code so that they start in the same place for both teams
 -- and hogs move in the same order, not backwards to each other.
 
+-----------
+-- 0.9
+------------
+
+-- add support for more players
+-- re-enable sudden death, but set water rise to 0
+
 loadfile(GetDataPath() .. "Scripts/Locale.lua")()
 
 ---------------------------------------------------------------
@@ -469,7 +476,7 @@
 
 
 	-- make a list of individual team names
-	for i = 0, 5 do
+	for i = 0, (TeamsCount-1) do
 		teamNameArr[i] = i
 		teamSize[i] = 0
 		teamIndex[i] = 0
@@ -566,7 +573,8 @@
 	MinesTime  = 2000
 	Explosives = 0 -- The number of explosives being placed
 	Delay = 10 -- The delay between each round
-	SuddenDeathTurns = 99 -- suddendeath is off, effectively
+	WaterRise = 0 -- I sure hope this works	
+	--SuddenDeathTurns = 99 -- suddendeath is off, effectively
 	Map = "Blizzard" -- The map to be played
 	Theme = "Snow" -- The theme to be used "Nature"
 
diff -r e23ced69e03d -r afb988c1a2fe share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua	Fri Sep 09 03:00:03 2011 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua	Fri Sep 09 03:21:16 2011 +0200
@@ -66,6 +66,7 @@
 --------
 
 -- add support for more players
+-- allow limited sudden death
 -- stop TimeBox ruining my life
 -- profit???
 
@@ -444,7 +445,8 @@
 function onGameInit()
 
 	GameFlags = band(bor(GameFlags, gfDivideTeams), bnot(gfKing + gfForts))
-	SuddenDeathTurns = 999 -- suddendeath is off, effectively
+	--SuddenDeathTurns = 999 -- suddendeath is off, effectively
+	WaterRise = 0	
 	Delay = 10 
 
 end