X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=469c86a2b68f18822121160a4cea454e0540099e;hb=68eeed9d509bed4b50e81f5995065322e23634fa;hp=187bf63be8db373576d92ebc1a320f0527d35dcb;hpb=5ad3d2aadbd5aa4fe80008df07e1f396ca1c832a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 187bf63be..469c86a2b 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -49,6 +49,7 @@ void MapInfo_Cache_Store() // now store all the stuff bufstr_set(_MapInfo_Cache_Buf_IndexToMapData, i, MapInfo_Map_bspname); bufstr_set(_MapInfo_Cache_Buf_IndexToMapData, ++i, MapInfo_Map_title); + bufstr_set(_MapInfo_Cache_Buf_IndexToMapData, ++i, MapInfo_Map_titlestring); bufstr_set(_MapInfo_Cache_Buf_IndexToMapData, ++i, MapInfo_Map_description); bufstr_set(_MapInfo_Cache_Buf_IndexToMapData, ++i, MapInfo_Map_author); bufstr_set(_MapInfo_Cache_Buf_IndexToMapData, ++i, ftos(MapInfo_Map_supportedGametypes)); @@ -71,6 +72,7 @@ float MapInfo_Cache_Retrieve(string map) // now retrieve all the stuff MapInfo_Map_bspname = bufstr_get(_MapInfo_Cache_Buf_IndexToMapData, i); MapInfo_Map_title = bufstr_get(_MapInfo_Cache_Buf_IndexToMapData, ++i); + MapInfo_Map_titlestring = bufstr_get(_MapInfo_Cache_Buf_IndexToMapData, ++i); MapInfo_Map_description = bufstr_get(_MapInfo_Cache_Buf_IndexToMapData, ++i); MapInfo_Map_author = bufstr_get(_MapInfo_Cache_Buf_IndexToMapData, ++i); MapInfo_Map_supportedGametypes = stof(bufstr_get(_MapInfo_Cache_Buf_IndexToMapData, ++i)); @@ -351,6 +353,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp if(spawnpoints >= 8 && diameter > 4096) { MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_TEAM_DEATHMATCH; + MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_FREEZETAG; MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CA; } if( diameter < 4096) @@ -378,6 +381,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp void _MapInfo_Map_Reset() { MapInfo_Map_title = ""; + MapInfo_Map_titlestring = "<TITLE>"; MapInfo_Map_description = "<DESCRIPTION>"; MapInfo_Map_author = "<AUTHOR>"; MapInfo_Map_supportedGametypes = 0; @@ -407,7 +411,11 @@ string _MapInfo_GetDefault(float t) case MAPINFO_TYPE_ONSLAUGHT: return "20 0"; case MAPINFO_TYPE_NEXBALL: return "5 20 0"; case MAPINFO_TYPE_CTS: return "20 0 0"; - case MAPINFO_TYPE_KEEPAWAY: return "30 20 0"; + case MAPINFO_TYPE_FREEZETAG: return "10 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 ""; } } @@ -464,6 +472,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); @@ -471,7 +480,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) { @@ -536,6 +546,7 @@ string _MapInfo_GetDefaultEx(float t) case MAPINFO_TYPE_ONSLAUGHT: return "timelimit=20"; case MAPINFO_TYPE_NEXBALL: return "timelimit=20 pointlimit=5 leadlimit=0"; case MAPINFO_TYPE_CTS: return "timelimit=20 skill=-1"; + case MAPINFO_TYPE_FREEZETAG: return "timelimit=20 pointlimit=10 teams=2 leadlimit=0"; case MAPINFO_TYPE_KEEPAWAY: return "timelimit=20 pointlimit=30"; default: return ""; } @@ -661,6 +672,7 @@ float MapInfo_Type_FromString(string t) else if(t == "rc") return MAPINFO_TYPE_RACE; else if(t == "nexball") return MAPINFO_TYPE_NEXBALL; else if(t == "cts") return MAPINFO_TYPE_CTS; + else if(t == "freezetag") return MAPINFO_TYPE_FREEZETAG; else if(t == "keepaway") return MAPINFO_TYPE_KEEPAWAY; else if(t == "all") return MAPINFO_TYPE_ALL; else return 0; @@ -682,6 +694,7 @@ string MapInfo_Type_ToString(float t) else if(t == MAPINFO_TYPE_RACE) return "rc"; else if(t == MAPINFO_TYPE_NEXBALL) return "nexball"; else if(t == MAPINFO_TYPE_CTS) return "cts"; + else if(t == MAPINFO_TYPE_FREEZETAG) return "freezetag"; else if(t == MAPINFO_TYPE_KEEPAWAY) return "keepaway"; else if(t == MAPINFO_TYPE_ALL) return "all"; else return ""; @@ -787,12 +800,37 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, } } +float MapInfo_isRedundant(string fn, string t) +{ + // normalize file name + fn = strreplace("_", "-", fn); + + // normalize visible title + t = strreplace(": ", "-", t); + t = strreplace(":", "-", t); + t = strreplace(" ", "-", t); + t = strreplace("_", "-", t); + t = strreplace("'", "-", t); + + if(!strcasecmp(fn, t)) + 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 FALSE; +} + // load info about a map by name into the MapInfo_Map_* globals float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametypeToSet) { string fn; string s, t; - float fh, fh2; + float fh; float r, f, n, i, p; string acl; @@ -865,12 +903,8 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype if(MapInfo_Map_supportedGametypes & i) fputs(fh, sprintf("gametype %s // defaults: %s\n", MapInfo_Type_ToString(i), _MapInfo_GetDefaultEx(i))); - fh2 = fopen(strcat("scripts/", pFilename, ".arena"), FILE_READ); - if(fh2 >= 0) - { - fclose(fh2); + if(fexists(strcat("scripts/", pFilename, ".arena"))) fputs(fh, "settemp_for_type all sv_q3acompat_machineshotgunswap 1\n"); - } fputs(fh, "// optional: fog density red green blue alpha mindist maxdist\n"); fputs(fh, "// optional: settemp_for_type (all|gametypename) cvarname value\n"); @@ -940,6 +974,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 @@ -1049,6 +1084,13 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype } } + if(MapInfo_Map_title == "<TITLE>") + MapInfo_Map_titlestring = MapInfo_Map_bspname; + 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_Cache_Store(); if(MapInfo_Map_supportedGametypes != 0) return r; @@ -1147,6 +1189,8 @@ float MapInfo_CurrentGametype() return MAPINFO_TYPE_NEXBALL; else if(cvar("g_cts")) return MAPINFO_TYPE_CTS; + else if(cvar("g_freezetag")) + return MAPINFO_TYPE_FREEZETAG; else if(cvar("g_keepaway")) return MAPINFO_TYPE_KEEPAWAY; else @@ -1176,20 +1220,21 @@ string MapInfo_GetGameTypeCvar(float t) { switch(t) { - case MAPINFO_TYPE_DEATHMATCH: return "g_dm"; - case MAPINFO_TYPE_TEAM_DEATHMATCH: return "g_tdm"; - case MAPINFO_TYPE_DOMINATION: return "g_domination"; - case MAPINFO_TYPE_CTF: return "g_ctf"; - case MAPINFO_TYPE_RUNEMATCH: return "g_runematch"; - case MAPINFO_TYPE_LMS: return "g_lms"; - case MAPINFO_TYPE_ARENA: return "g_arena"; - case MAPINFO_TYPE_CA: return "g_ca"; - case MAPINFO_TYPE_KEYHUNT: return "g_kh"; - case MAPINFO_TYPE_ASSAULT: return "g_assault"; - case MAPINFO_TYPE_ONSLAUGHT: return "g_onslaught"; - case MAPINFO_TYPE_RACE: return "g_race"; - case MAPINFO_TYPE_NEXBALL: return "g_nexball"; - case MAPINFO_TYPE_CTS: return "g_cts"; + case MAPINFO_TYPE_DEATHMATCH: return "g_dm"; + case MAPINFO_TYPE_TEAM_DEATHMATCH: return "g_tdm"; + case MAPINFO_TYPE_DOMINATION: return "g_domination"; + case MAPINFO_TYPE_CTF: return "g_ctf"; + case MAPINFO_TYPE_RUNEMATCH: return "g_runematch"; + case MAPINFO_TYPE_LMS: return "g_lms"; + case MAPINFO_TYPE_ARENA: return "g_arena"; + case MAPINFO_TYPE_CA: return "g_ca"; + case MAPINFO_TYPE_KEYHUNT: return "g_kh"; + case MAPINFO_TYPE_ASSAULT: return "g_assault"; + case MAPINFO_TYPE_ONSLAUGHT: return "g_onslaught"; + case MAPINFO_TYPE_RACE: return "g_race"; + case MAPINFO_TYPE_NEXBALL: return "g_nexball"; + case MAPINFO_TYPE_FREEZETAG: return "g_freezetag"; + case MAPINFO_TYPE_CTS: return "g_cts"; case MAPINFO_TYPE_KEEPAWAY: return "g_keepaway"; default: return ""; } @@ -1212,6 +1257,7 @@ void MapInfo_SwitchGameType(float t) cvar_set("g_race", (t == MAPINFO_TYPE_RACE) ? "1" : "0"); cvar_set("g_nexball", (t == MAPINFO_TYPE_NEXBALL) ? "1" : "0"); cvar_set("g_cts", (t == MAPINFO_TYPE_CTS) ? "1" : "0"); + cvar_set("g_freezetag", (t == MAPINFO_TYPE_FREEZETAG) ? "1" : "0"); cvar_set("g_keepaway", (t == MAPINFO_TYPE_KEEPAWAY) ? "1" : "0"); } @@ -1242,6 +1288,24 @@ string MapInfo_ListAllowedMaps(float pRequiredFlags, float pForbiddenFlags) 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) + out = strcat(out, " ", _MapInfo_GlobItem(MapInfo_FilterList_Lookup(i))); + + MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0); + + return substring(out, 1, strlen(out) - 1); +} + void MapInfo_LoadMapSettings(string s) // to be called from worldspawn { float t, t0; @@ -1284,6 +1348,7 @@ void MapInfo_ClearTemps() { MapInfo_Map_bspname = string_null; MapInfo_Map_title = string_null; + MapInfo_Map_titlestring = string_null; MapInfo_Map_description = string_null; MapInfo_Map_author = string_null; MapInfo_Map_clientstuff = string_null;