string unquote(string s)
{
- float i, j, l;
- l = strlen(s);
- j = -1;
- for(i = 0; i < l; ++i)
+ float l = strlen(s);
+ for(float i = 0; i < l; ++i)
{
- string ch;
- ch = substring(s, i, 1);
- if(ch != " ") if(ch != "\"")
+ string ch = substring(s, i, 1);
+ if((ch != " ") && (ch != "\""))
{
- for(j = strlen(s) - i - 1; j > 0; --j)
+ for(float j = l - i - 1; j > 0; --j)
{
ch = substring(s, i+j, 1);
if(ch != " ") if(ch != "\"")
error("... but I just wrote it!");
}
- LOG_WARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo");
+ if(!autocvar_g_mapinfo_ignore_warnings)
+ LOG_WARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo");
}
_MapInfo_Map_Reset();
// MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH.m_flags);
//}
+ LOG_INFO("Switching to map ", s, "\n");
+
cvar_settemp_restore();
if(reinit)
localcmd(strcat("\nmap ", s, "\n"));
string MapInfo_ListAllowedMaps(Gametype type, float pRequiredFlags, float pForbiddenFlags)
{
string out;
- float i;
// to make absolutely sure:
MapInfo_Enumerate();
MapInfo_FilterGametype(type, MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0);
out = "";
- for(i = 0; i < MapInfo_count; ++i)
+ for(float i = 0; i < MapInfo_count; ++i)
out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i)));
return substring(out, 1, strlen(out) - 1);
}
string MapInfo_ListAllAllowedMaps(float pRequiredFlags, float pForbiddenFlags)
{
string out;
- float i;
// to make absolutely sure:
MapInfo_Enumerate();
_MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, pRequiredFlags, pForbiddenFlags, 0);
out = "";
- for(i = 0; i < MapInfo_count; ++i)
+ for(float i = 0; i < MapInfo_count; ++i)
out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i)));
MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0);