Merge branch 'samual/keepaway_mapinfos' into fruitiex/freezetag_vs_keepaway

Conflicts:
	maps/g-23.mapinfo
	maps/glowplant.mapinfo
	maps/red-planet.mapinfo
	maps/stormkeep.mapinfo

diff --git a/maps/g-23.mapinfo b/maps/g-23.mapinfo
index 72ba59afe01ff81ca76521a2666ac2263638d609..b89a1f0775b929136496be37a83bf65e1f87c1c2 100644 (file)
--- a/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@ -7,4 +7,5 @@ gametype lms
 gametype arena
 gametype rune
 gametype freezetag
+gametype keepaway
 cdtrack 2

diff --git a/maps/glowplant.mapinfo b/maps/glowplant.mapinfo
index 18a4661403f2eb13452bd410dea752fefb4943a7..a64570135401e043fea642bebd9f02272b8f347a 100644 (file)
--- a/maps/glowplant.mapinfo
+++ b/maps/glowplant.mapinfo
@@ -12,6 +12,7 @@ gametype arena
 gametype ca
 gametype kh
 gametype freezetag
+gametype keepaway
 // optional: fog density red green blue alpha mindist maxdist
 // optional: settemp_for_type (all|gametypename) cvarname value
 // optional: clientsettemp_for_type (all|gametypename) cvarname value

diff --git a/maps/red-planet.mapinfo b/maps/red-planet.mapinfo
index 74b9ede65a36f65407b081cde1d7c2ea740e45b9..b947d4d7e9e332c867a898201078f213a840845a 100644 (file)
--- a/maps/red-planet.mapinfo
+++ b/maps/red-planet.mapinfo
@@ -12,3 +12,4 @@ gametype ca
 gametype dom
 gametype kh
 gametype freezetag
+gametype keepaway

diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo
index f684629f52d9c1ffcbceeee96e18d8d82d285083..8800827c7cdcd2231bcbcdb70c1e9f73831ad0aa 100644 (file)
--- a/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@ -12,6 +12,7 @@ gametype rc
 gametype kh
 gametype ca
 gametype freezetag
+gametype keepaway
 cdtrack 5
 // optional: fog density red green blue alpha mindist maxdist
 // optional: settemp_for_type (all|gametypename) cvarname value