X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qc;h=7299b285d51a6a7caca7f1d6e9d8df38bcb4e742;hb=845401fd312c66c059aaee1772ac5d79555ab4fc;hp=feb0e036420e49d47ce211390463ed8ccd951b9f;hpb=7e9d4404fbd602050e843cb2169f8afab4163b11;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index feb0e0364..7299b285d 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -103,7 +103,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); @@ -138,7 +138,7 @@ float _MapInfo_FilterList_cmp(float i, float j, entity pass) 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) @@ -255,7 +255,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp mapMins = '0 0 0'; mapMaxs = '0 0 0'; - for(;;) + for(0;;) { if (!((s = fgets(fh)))) break; @@ -293,12 +293,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") { @@ -343,6 +343,8 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_TURRETS; else if(startsWith(v, "vehicle_")) MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_VEHICLES; + else if(startsWith(v, "monster_")) + MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS; else if(v == "target_music" || v == "trigger_music") _MapInfo_Map_worldspawn_music = string_null; // don't use regular BGM } @@ -432,7 +434,7 @@ string _MapInfo_GetDefault(float t) } } -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; @@ -440,7 +442,7 @@ void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType, fl 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 { @@ -564,7 +566,16 @@ string _MapInfo_GetDefaultEx(float t) 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; @@ -631,6 +642,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, float pWantedType, float pThisType) cvar_set("g_freezetag_teams", v); cvar_set("g_keyhunt_teams", v); cvar_set("g_domination_default_teams", v); + cvar_set("g_invasion_teams", v); } else if(k == "qualifying_timelimit") { @@ -685,6 +697,18 @@ float MapInfo_Type_FromString(string t) 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) @@ -693,6 +717,15 @@ float MapInfo_Type_FromString(string t) 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; + return ""; +} + string MapInfo_Type_ToString(float t) { entity e; @@ -756,7 +789,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(0;;) { if (!((s = fgets(fh)))) break; @@ -827,25 +860,26 @@ 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 -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; @@ -898,7 +932,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo { 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) @@ -946,7 +980,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo } _MapInfo_Map_Reset(); - for(;;) + for(0;;) { if (!((s = fgets(fh)))) break; @@ -978,6 +1012,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo 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; + else if(t == "monsters") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS; else if(t == "new_toys") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS; else dprint("Map ", pFilename, " supports unknown feature ", t, ", ignored\n"); @@ -1002,9 +1037,9 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo { 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"); } @@ -1108,7 +1143,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo 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) @@ -1116,7 +1151,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, float pAllowGenerate, flo 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); @@ -1197,18 +1232,16 @@ string MapInfo_FixName(string s) 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) @@ -1261,14 +1294,14 @@ void MapInfo_LoadMap(string s, float reinit) localcmd(strcat("\nchangelevel ", s, "\n")); } -string MapInfo_ListAllowedMaps(float pRequiredFlags, float pForbiddenFlags) +string MapInfo_ListAllowedMaps(float type, float pRequiredFlags, float pForbiddenFlags) { string out; float i; // to make absolutely sure: MapInfo_Enumerate(); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0); + MapInfo_FilterGametype(type, MapInfo_CurrentFeatures(), pRequiredFlags, pForbiddenFlags, 0); out = ""; for(i = 0; i < MapInfo_count; ++i) @@ -1361,14 +1394,13 @@ void MapInfo_Shutdown() { 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")) @@ -1383,8 +1415,7 @@ float MapInfo_ForbiddenFlags() float MapInfo_RequiredFlags() { - float f; - f = 0; + int f = 0; if(cvar("g_maplist_allow_frustrating") > 1) f |= MAPINFO_FLAG_FRUSTRATING;