X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=0b851d53b0c5299c7625055d6f470f7925b90564;hb=2718fac2d710f2c4e63a6de3cfe0ffc66dc7d6a3;hp=0e8402979d101a20d769439fbf8c20a442f2114f;hpb=883f46c5e696c230a4b8a4c9c8bbe41ec05d1879;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 0e8402979..0b851d53b 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -1,8 +1,25 @@ +#if defined(CSQC) + #include "../dpdefs/csprogsdefs.qh" + #include "../client/defs.qh" + #include "util.qh" + #include "buffs.qh" + #include "weapons/all.qh" + #include "mapinfo.qh" +#elif defined(MENUQC) +#elif defined(SVQC) + #include "../dpdefs/progsdefs.qh" + #include "../dpdefs/dpextensions.qh" + #include "util.qh" + #include "buffs.qh" + #include "monsters/all.qh" + #include "mapinfo.qh" +#endif + // generic string stuff -float _MapInfo_Cache_Active; -float _MapInfo_Cache_DB_NameToIndex; -float _MapInfo_Cache_Buf_IndexToMapData; +int _MapInfo_Cache_Active; +int _MapInfo_Cache_DB_NameToIndex; +int _MapInfo_Cache_Buf_IndexToMapData; void MapInfo_Cache_Destroy() { @@ -103,7 +120,7 @@ void MapInfo_Enumerate() _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); @@ -170,6 +187,32 @@ float MapInfo_FilterGametype(int pGametype, int pFeatures, int pFlagsRequired, i return 1; } +void MapInfo_FilterString(string sf) +{ + // this function further filters _MapInfo_filtered, which is prepared by MapInfo_FilterGametype by string + float i, j; + string title; + + for(i = 0, j = -1; i < MapInfo_count; ++i) + { + if (MapInfo_Get_ByID(i)) + { + // prepare for keyword filter + if (MapInfo_Map_title && strstrofs(MapInfo_Map_title, "", 0) == -1) + title = MapInfo_Map_title; + else + title = MapInfo_Map_bspname; + // keyword filter + if((strstrofs(strtolower(title), strtolower(sf), 0)) >= 0) + bufstr_set(_MapInfo_filtered, ++j, bufstr_get(_MapInfo_filtered, i)); + } + } + MapInfo_count = j + 1; + MapInfo_ClearTemps(); + + // sometimes the glob isn't sorted nicely, so fix it here... + heapsort(MapInfo_count, _MapInfo_FilterList_swap, _MapInfo_FilterList_cmp, world); +} void MapInfo_Filter_Free() { @@ -255,7 +298,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp mapMins = '0 0 0'; mapMaxs = '0 0 0'; - for(;;) + for (;;) { if (!((s = fgets(fh)))) break; @@ -293,12 +336,12 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp 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") { @@ -442,7 +485,7 @@ void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int lo 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 { @@ -559,20 +602,14 @@ void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int lo string _MapInfo_GetDefaultEx(float t) { - entity e; - for(e = MapInfo_Type_first; e; e = e.enemy) - if(t == e.items) - return e.model2; + FOREACH(MAPINFO_TYPES, it.items == t, LAMBDA(return it.model2)); return ""; } 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; + FOREACH(MAPINFO_TYPES, it.items == t, LAMBDA(return it.team)); + return false; } void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) @@ -672,7 +709,6 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) float MapInfo_Type_FromString(string t) { - entity e; if(t == "nexball") { print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t); @@ -711,38 +747,27 @@ float MapInfo_Type_FromString(string t) } if(t == "all") return MAPINFO_TYPE_ALL; - for(e = MapInfo_Type_first; e; e = e.enemy) - if(t == e.mdl) - return e.items; + FOREACH(MAPINFO_TYPES, it.mdl == t, LAMBDA(return it.items)); return 0; } string MapInfo_Type_Description(float t) { - entity e; - for(e = MapInfo_Type_first; e; e = e.enemy) - if(t == e.items) - return e.gametype_description; + FOREACH(MAPINFO_TYPES, it.items == t, LAMBDA(return it.gametype_description)); return ""; } string MapInfo_Type_ToString(float t) { - entity e; if(t == MAPINFO_TYPE_ALL) return "all"; - for(e = MapInfo_Type_first; e; e = e.enemy) - if(t == e.items) - return e.mdl; + FOREACH(MAPINFO_TYPES, it.items == t, LAMBDA(return it.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; + FOREACH(MAPINFO_TYPES, it.items == t, LAMBDA(return it.message)); /* xgettext:no-c-format */ return _("@!#%'n Tuba Throwing"); } @@ -789,7 +814,7 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, print("Map ", pFilename, " references not existing config file ", s, "\n"); else { - for(;;) + for (;;) { if (!((s = fgets(fh)))) break; @@ -860,16 +885,16 @@ float MapInfo_isRedundant(string fn, string t) 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 @@ -932,7 +957,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p { n = tokenize_console(cvar_string("g_cdtracks_remaplist")); s = strcat(" ", cvar_string("g_cdtracks_dontusebydefault"), " "); - for(;;) + for (;;) { i = floor(random() * n); if(strstrofs(s, strcat(" ", argv(i), " "), 0) < 0) @@ -980,7 +1005,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p } _MapInfo_Map_Reset(); - for(;;) + for (;;) { if (!((s = fgets(fh)))) break; @@ -1039,7 +1064,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p f = MapInfo_Type_FromString(t); 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"); } @@ -1073,12 +1098,12 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p print("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs\n"); else { - MapInfo_Map_mins_x = a; - MapInfo_Map_mins_y = b; - MapInfo_Map_mins_z = c; - MapInfo_Map_maxs_x = d; - MapInfo_Map_maxs_y = e; - MapInfo_Map_maxs_z = f; + MapInfo_Map_mins.x = a; + MapInfo_Map_mins.y = b; + MapInfo_Map_mins.z = c; + MapInfo_Map_maxs.x = d; + MapInfo_Map_maxs.y = e; + MapInfo_Map_maxs.z = f; } } } @@ -1123,7 +1148,13 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p else if(t == "cdtrack") { t = car(s); s = cdr(s); - if(pGametypeToSet) // FIXME is this check right here? + // We do this only if pGametypeToSet even though this + // content is theoretically game type independent, + // because MapInfo_Map_clientstuff contains otherwise + // game type dependent stuff. That way this value stays + // empty when not setting a game type to not set any + // false expectations. + if(pGametypeToSet) { if (!cvar_value_issafe(t)) print("Map ", pFilename, " contains a potentially harmful cdtrack, ignored\n"); @@ -1230,7 +1261,7 @@ string MapInfo_FixName(string s) return MapInfo_FindName_match; } -float MapInfo_CurrentFeatures() +int MapInfo_CurrentFeatures() { 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"))) @@ -1238,16 +1269,11 @@ float MapInfo_CurrentFeatures() return req; } -float MapInfo_CurrentGametype() +int MapInfo_CurrentGametype() { - entity e; int prev = cvar("gamecfg"); - for(e = MapInfo_Type_first; e; e = e.enemy) - if(cvar(e.netname)) - if(prev != e.items) - return e.items; - if(prev) - return prev; + FOREACH(MAPINFO_TYPES, cvar(it.netname) && it.items != prev, LAMBDA(return it.items)); + if (prev) return prev; return MAPINFO_TYPE_DEATHMATCH; } @@ -1270,11 +1296,11 @@ float MapInfo_CheckMap(string s) // returns 0 if the map can't be played with th return r; } -void MapInfo_SwitchGameType(float t) +void MapInfo_SwitchGameType(int t) { - entity e; - for(e = MapInfo_Type_first; e; e = e.enemy) - cvar_set(e.netname, (t == e.items) ? "1" : "0"); + FOREACH(MAPINFO_TYPES, true, LAMBDA( + cvar_set(it.netname, (it.items == t) ? "1" : "0") + )); } void MapInfo_LoadMap(string s, float reinit) @@ -1394,11 +1420,11 @@ void MapInfo_Shutdown() { search_end(_MapInfo_globhandle); _MapInfo_globhandle = -1; - _MapInfo_globopen = FALSE; + _MapInfo_globopen = false; } } -float MapInfo_ForbiddenFlags() +int MapInfo_ForbiddenFlags() { int f = MAPINFO_FLAG_FORBIDDEN; @@ -1413,7 +1439,7 @@ float MapInfo_ForbiddenFlags() return f; } -float MapInfo_RequiredFlags() +int MapInfo_RequiredFlags() { int f = 0;