X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=58f0cc852a6e07383df3dadd8ce1d4e466c5a15a;hb=9cdc5ecff03fff6fe2feef2341a33806aa110a97;hp=35a827f90035438c33b7a6ce60b25d19e5629008;hpb=9d567c5701a3a4575a3388c71482906baf2e4ce3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 35a827f90..58f0cc852 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -409,7 +409,10 @@ string _MapInfo_GetDefault(float t)
 		case MAPINFO_TYPE_NEXBALL:         return "5 20 0";
 		case MAPINFO_TYPE_CTS:             return "20 0 0";
 		case MAPINFO_TYPE_FREEZETAG:       return "10 20 0";
-		case MAPINFO_TYPE_KEEPAWAY:	   return "30 20 0";
+		// NOTE: DO NOT ADD ANY MORE GAME TYPES HERE
+		// THIS IS JUST LEGACY SUPPORT FOR NEXUIZ MAPS
+		// ONLY ADD NEW STUFF TO _MapInfo_GetDefaultEx
+		// THIS FUNCTION WILL EVENTUALLY BE REMOVED
 		default:                           return "";
 	}
 }
@@ -466,6 +469,7 @@ void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, fl
 		s = cdr(s);
 	}
 
+	/* keepaway wuz here
 	if(pWantedType == MAPINFO_TYPE_KEEPAWAY)
 	{
 		sa = car(s);
@@ -473,7 +477,8 @@ void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, fl
 			cvar_set("fraglimit", sa);
 		s = cdr(s);
 	}
-
+	*/
+	
 	// rc = timelimit timelimit_qualification laps laps_teamplay
 	if(pWantedType == MAPINFO_TYPE_RACE)
 	{
@@ -945,6 +950,7 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype
 		{
 			t = car(s); s = cdr(s);
 			f = MapInfo_Type_FromString(t);
+			print("Map ", pFilename, " contains the legacy 'type' keyword which is deprecated and will be removed in the future. Please migrate the mapinfo file to 'gametype'.\n");
 			if(f)
 				_MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, TRUE);
 			else