+#if defined(CSQC)
+ #include "../dpdefs/csprogsdefs.qc"
+ #include "../client/Defs.qc"
+ #include "util.qh"
+ #include "buffs.qh"
+ #include "weapons/weapons.qh"
+ #include "mapinfo.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+ #include "../dpdefs/progsdefs.qc"
+ #include "../dpdefs/dpextensions.qc"
+ #include "../server/sys-post.qh"
+ #include "util.qh"
+ #include "buffs.qh"
+ #include "monsters/monsters.qh"
+ #include "mapinfo.qh"
+#endif
+
// generic string stuff
float _MapInfo_Cache_Active;
_MapInfo_globopen = 0;
}
MapInfo_Cache_Invalidate();
- _MapInfo_globhandle = search_begin("maps/*.bsp", TRUE, TRUE);
+ _MapInfo_globhandle = search_begin("maps/*.bsp", true, true);
if(_MapInfo_globhandle >= 0)
{
_MapInfo_globcount = search_getsize(_MapInfo_globhandle);
return strcasecmp(a, b);
}
-float MapInfo_FilterGametype(float pGametype, float pFeatures, float pFlagsRequired, float pFlagsForbidden, float pAbortOnGenerate)
+float MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, int pFlagsForbidden, bool pAbortOnGenerate)
{
float i, j;
if (!_MapInfo_filtered_allocated)
mapMins = '0 0 0';
mapMaxs = '0 0 0';
- for(;;)
+ for(0;;)
{
if (!((s = fgets(fh))))
break;
if(k == "origin")
{
o = stov(strcat("'", v, "'"));
- mapMins_x = min(mapMins_x, o_x);
- mapMins_y = min(mapMins_y, o_y);
- mapMins_z = min(mapMins_z, o_z);
- mapMaxs_x = max(mapMaxs_x, o_x);
- mapMaxs_y = max(mapMaxs_y, o_y);
- mapMaxs_z = max(mapMaxs_z, o_z);
+ mapMins_x = min(mapMins.x, o.x);
+ mapMins_y = min(mapMins.y, o.y);
+ mapMins_z = min(mapMins.z, o.z);
+ mapMaxs_x = max(mapMaxs.x, o.x);
+ mapMaxs_y = max(mapMaxs.y, o.y);
+ mapMaxs_z = max(mapMaxs.z, o.z);
}
else if(k == "race_place")
{
}
}
-void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, float load_default)
+void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int load_default)
{
string sa;
MapInfo_Map_supportedGametypes |= pThisType;
return;
if(load_default)
- _MapInfo_Map_ApplyGametype(_MapInfo_GetDefault(pThisType), pWantedType, pThisType, FALSE);
+ _MapInfo_Map_ApplyGametype(_MapInfo_GetDefault(pThisType), pWantedType, pThisType, false);
if(pWantedType == MAPINFO_TYPE_ASSAULT || pWantedType == MAPINFO_TYPE_ONSLAUGHT || pWantedType == MAPINFO_TYPE_RACE || pWantedType == MAPINFO_TYPE_CTS) // these modes don't use fraglimit
{
return "";
}
-void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType)
+float _MapInfo_GetTeamPlayBool(float t)
+{
+ entity e;
+ for(e = MapInfo_Type_first; e; e = e.enemy)
+ if(t == e.items)
+ return e.team;
+ return false;
+}
+
+void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
{
string sa, k, v;
float p;
t = "inv";
print("'. Should use '", t, "'.\n");
}
+ if(t == "assault")
+ {
+ print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+ t = "as";
+ print("'. Should use '", t, "'.\n");
+ }
+ if(t == "race")
+ {
+ print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+ t = "rc";
+ print("'. Should use '", t, "'.\n");
+ }
if(t == "all")
return MAPINFO_TYPE_ALL;
for(e = MapInfo_Type_first; e; e = e.enemy)
print("Map ", pFilename, " references not existing config file ", s, "\n");
else
{
- for(;;)
+ for(0;;)
{
if (!((s = fgets(fh))))
break;
t = strreplace("'", "-", t);
if(!strcasecmp(fn, t))
- return TRUE;
+ return true;
// we allow the visible title to have punctuation the file name does
// not, but not vice versa
t = strreplace("-", "", t);
if(!strcasecmp(fn, t))
- return TRUE;
+ return true;
- return FALSE;
+ return false;
}
// load info about a map by name into the MapInfo_Map_* globals
-float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, float pGametypeToSet)
+float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int pGametypeToSet)
{
string fn;
string s, t;
float fh;
- float r, f, n, i, p;
+ int f, i;
+ float r, n, p;
string acl;
acl = MAPINFO_SETTEMP_ACL_USER;
{
n = tokenize_console(cvar_string("g_cdtracks_remaplist"));
s = strcat(" ", cvar_string("g_cdtracks_dontusebydefault"), " ");
- for(;;)
+ for(0;;)
{
i = floor(random() * n);
if(strstrofs(s, strcat(" ", argv(i), " "), 0) < 0)
}
_MapInfo_Map_Reset();
- for(;;)
+ for(0;;)
{
if (!((s = fgets(fh))))
break;
{
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");
+ dprint("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);
+ _MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, true);
else
dprint("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
}
else if(MapInfo_isRedundant(MapInfo_Map_bspname, MapInfo_Map_title))
MapInfo_Map_titlestring = MapInfo_Map_title;
else
- MapInfo_Map_titlestring = sprintf(_("%s: %s"), MapInfo_Map_bspname, MapInfo_Map_title);
+ MapInfo_Map_titlestring = sprintf("%s: %s", MapInfo_Map_bspname, MapInfo_Map_title);
MapInfo_Cache_Store();
if(MapInfo_Map_supportedGametypes != 0)
dprint("Map ", pFilename, " supports no game types, ignored\n");
return 0;
}
-float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametypeToSet)
+float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, int pGametypeToSet)
{
float r = MapInfo_Get_ByName_NoFallbacks(pFilename, pAllowGenerate, pGametypeToSet);
{
if(!(MapInfo_Map_supportedGametypes & pGametypeToSet))
{
- //error("Can't select the requested game type. This should never happen as the caller should prevent it!\n");
- return 0;
+ error("Can't select the requested game type. This should never happen as the caller should prevent it!\n");
//_MapInfo_Map_ApplyGametypeEx("", pGametypeToSet, MAPINFO_TYPE_DEATHMATCH);
//return;
}
float MapInfo_CurrentFeatures()
{
- float req;
- req = 0;
- if(!(cvar("g_lms") || cvar("g_minstagib") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
+ int req = 0;
+ if(!(cvar("g_lms") || cvar("g_instagib") || cvar("g_overkill") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
req |= MAPINFO_FEATURE_WEAPONS;
return req;
}
float MapInfo_CurrentGametype()
{
- float prev;
entity e;
- prev = cvar("gamecfg");
+ int prev = cvar("gamecfg");
for(e = MapInfo_Type_first; e; e = e.enemy)
if(cvar(e.netname))
if(prev != e.items)
{
search_end(_MapInfo_globhandle);
_MapInfo_globhandle = -1;
- _MapInfo_globopen = FALSE;
+ _MapInfo_globopen = false;
}
}
float MapInfo_ForbiddenFlags()
{
- float f;
- f = MAPINFO_FLAG_FORBIDDEN;
+ int f = MAPINFO_FLAG_FORBIDDEN;
#ifndef MENUQC
if (!cvar("g_maplist_allow_hidden"))
float MapInfo_RequiredFlags()
{
- float f;
- f = 0;
+ int f = 0;
if(cvar("g_maplist_allow_frustrating") > 1)
f |= MAPINFO_FLAG_FRUSTRATING;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff