spawnpoints = 0;
spawnplaces = 0;
_MapInfo_Map_worldspawn_music = "";
+ mapMins = '0 0 0';
+ mapMaxs = '0 0 0';
for(;;)
{
{
sa = car(s);
if(sa != "")
- if(cvar("g_ctf_win_mode") < 2)
- cvar_set("fraglimit", sa);
+ cvar_set("fraglimit", sa);
s = cdr(s);
}
{
entity e;
for(e = MapInfo_Type_first; e; e = e.enemy)
- if(t == e.weapons)
- return e.message;
+ if(t == e.items)
+ return e.model2;
return "";
}
string sa, k, v;
float p;
string fraglimit_normal;
- string fraglimit_caps;
string fraglimit_teams;
MapInfo_Map_supportedGametypes |= pThisType;
cvar_set("g_race_qualifying_timelimit", cvar_defstring("g_race_qualifying_timelimit"));
fraglimit_normal = string_null;
- fraglimit_caps = string_null;
fraglimit_teams = string_null;
s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s);
{
cvar_set("leadlimit", v);
}
- else if(k == "pointlimit" || k == "fraglimit" || k == "lives" || k == "laplimit")
+ else if(k == "pointlimit" || k == "fraglimit" || k == "lives" || k == "laplimit" || k == "caplimit")
{
fraglimit_normal = v;
}
- else if(k == "caplimit")
- {
- fraglimit_caps = v;
- }
else if(k == "teampointlimit" || k == "teamlaplimit")
{
fraglimit_teams = v;
}
}
- if(pWantedType == MAPINFO_TYPE_CTF && cvar("g_ctf_win_mode") < 2)
- {
- if(fraglimit_caps)
- cvar_set("fraglimit", fraglimit_caps);
- }
- else if(pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2)
+ if(pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2)
{
if(fraglimit_teams)
cvar_set("fraglimit", fraglimit_teams);
float MapInfo_Type_FromString(string t)
{
entity e;
+ if(t == "nexball")
+ {
+ print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+ t = "nb";
+ print("'. Should use '", t, "'.\n");
+ }
+ if(t == "freezetag")
+ {
+ print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+ t = "ft";
+ print("'. Should use '", t, "'.\n");
+ }
+ if(t == "keepaway")
+ {
+ print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+ t = "ka";
+ print("'. Should use '", t, "'.\n");
+ }
if(t == "all")
return MAPINFO_TYPE_ALL;
for(e = MapInfo_Type_first; e; e = e.enemy)
if(t == e.mdl)
- return e.weapons;
+ return e.items;
return 0;
}
if(t == MAPINFO_TYPE_ALL)
return "all";
for(e = MapInfo_Type_first; e; e = e.enemy)
- if(t == e.weapons)
+ if(t == e.items)
return e.mdl;
return "";
}
+string MapInfo_Type_ToText(float t)
+{
+ entity e;
+ for(e = MapInfo_Type_first; e; e = e.enemy)
+ if(t == e.items)
+ return e.message;
+ return _("@!#%'n Tuba Throwing");
+}
+
void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, float recurse)
{
string t;
MapInfo_Map_author = s;
else if(t == "has")
{
- t = car(s); s = cdr(s);
+ t = car(s); // s = cdr(s);
if (t == "weapons") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
else if(t == "turrets") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_TURRETS;
else if(t == "vehicles") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_VEHICLES;
prev = cvar("gamecfg");
for(e = MapInfo_Type_first; e; e = e.enemy)
if(cvar(e.netname))
- if(prev != e.weapons)
- return e.weapons;
+ if(prev != e.items)
+ return e.items;
if(prev)
return prev;
return MAPINFO_TYPE_DEATHMATCH;
{
entity e;
for(e = MapInfo_Type_first; e; e = e.enemy)
- cvar_set(e.netname, (t == e.weapons) ? "1" : "0");
+ cvar_set(e.netname, (t == e.items) ? "1" : "0");
}
void MapInfo_LoadMap(string s, float reinit)