From ef75cb5626f391707d0142c2423e477af1fdf97d Mon Sep 17 00:00:00 2001 From: TimePath Date: Thu, 15 Oct 2015 09:33:38 +1100 Subject: [PATCH] Mapinfo: decentralise mapinfo parsing --- qcsrc/common/mapinfo.qc | 110 ++++++++++++++++------------------------ qcsrc/common/mapinfo.qh | 96 +++++++++++++++++++++++++++++++---- 2 files changed, 130 insertions(+), 76 deletions(-) diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 1daf862b6..46c2edc9e 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -611,13 +611,8 @@ float _MapInfo_GetTeamPlayBool(float t) void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) { - string sa, k, v; - float p; - string fraglimit_normal; - string fraglimit_teams; - MapInfo_Map_supportedGametypes |= pThisType; - if(!(pThisType & pWantedType)) + if (!(pThisType & pWantedType)) return; // reset all the cvars to their defaults @@ -625,74 +620,55 @@ void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType) cvar_set("timelimit", cvar_defstring("timelimit")); cvar_set("leadlimit", cvar_defstring("leadlimit")); cvar_set("fraglimit", cvar_defstring("fraglimit")); - cvar_set("g_tdm_teams", cvar_defstring("g_tdm_teams")); - cvar_set("g_ca_teams", cvar_defstring("g_ca_teams")); - cvar_set("g_freezetag_teams", cvar_defstring("g_freezetag_teams")); - cvar_set("g_keyhunt_teams", cvar_defstring("g_keyhunt_teams")); - cvar_set("g_domination_default_teams", cvar_defstring("g_domination_default_teams")); - cvar_set("g_race_qualifying_timelimit", cvar_defstring("g_race_qualifying_timelimit")); - - fraglimit_normal = string_null; - fraglimit_teams = string_null; - - s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s); - while(s != "") - { - sa = car(s); - s = cdr(s); + FOREACH(Gametypes, true, LAMBDA(it.m_parse_mapinfo(string_null, string_null))); - if(sa == "") - continue; + string fraglimit_normal = string_null; + string fraglimit_teams = string_null; - p = strstrofs(sa, "=", 0); - if(p < 0) - { - LOG_INFO("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n"); + for (s = strcat(_MapInfo_GetDefaultEx(pWantedType), " ", s); s != ""; s = cdr(s)) { + string sa = car(s); + if (sa == "") continue; + int p = strstrofs(sa, "=", 0); + if (p < 0) { + LOG_WARNINGF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa); continue; } - k = substring(sa, 0, p); - v = substring(sa, p+1, -1); - - if(k == "timelimit") - { - cvar_set("timelimit", v); - } - else if(k == "leadlimit") - { - cvar_set("leadlimit", v); - } - else if(k == "pointlimit" || k == "fraglimit" || k == "lives" || k == "laplimit" || k == "caplimit") - { - fraglimit_normal = v; - } - else if(k == "teampointlimit" || k == "teamlaplimit") - { - fraglimit_teams = v; - } - else if(k == "teams") - { - cvar_set("g_tdm_teams", v); - cvar_set("g_ca_teams", v); - 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") - { - cvar_set("g_race_qualifying_timelimit", v); - } - else if(k == "skill") - { - // ignore - } - else - { - LOG_INFO("Invalid gametype setting in mapinfo for gametype ", MapInfo_Type_ToString(pWantedType), ": ", sa, "\n"); + string k = substring(sa, 0, p); + string v = substring(sa, p + 1, -1); + bool handled = true; + switch (k) { + case "timelimit": + { + cvar_set("timelimit", v); + } + case "leadlimit": + { + cvar_set("leadlimit", v); + } + case "pointlimit": + case "fraglimit": + case "lives": + case "laplimit": + case "caplimit": + { + fraglimit_normal = v; + } + case "teampointlimit": + case "teamlaplimit": + { + fraglimit_teams = v; + } + default: + { + handled = false; + } } + FOREACH(Gametypes, true, LAMBDA(handled |= it.m_parse_mapinfo(k, v))); + if (!handled) + LOG_WARNINGF("Invalid gametype setting in mapinfo for gametype %s: %s\n", MapInfo_Type_ToString(pWantedType), sa); } - if(pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2) + if (pWantedType == MAPINFO_TYPE_RACE && cvar("g_race_teams") >= 2) { if(fraglimit_teams) cvar_set("fraglimit", fraglimit_teams); diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index 1238bfe4b..5ff8040f0 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -20,6 +20,8 @@ CLASS(Gametype, Object) /** game type description */ ATTRIB(Gametype, gametype_description, string, string_null) + ATTRIB(Gametype, m_parse_mapinfo, bool(string k, string v), func_null) + METHOD(Gametype, describe, string(entity this)) { return this.gametype_description; } METHOD(Gametype, display, void(entity this, void(string name, string icon) returns)) { @@ -43,13 +45,16 @@ REGISTER_REGISTRY(RegisterGametypes) int MAPINFO_TYPE_ALL; #define REGISTER_GAMETYPE(hname, sname, g_name, NAME, gteamplay, defaults, gdescription) \ int MAPINFO_TYPE_##NAME; \ + bool NAME##_mapinfo(string k, string v) { return = false; } \ REGISTER(RegisterGametypes, MAPINFO_TYPE, Gametypes, g_name, m_id, \ NEW(Gametype, hname, #sname, #g_name, gteamplay, defaults, gdescription) \ ) { \ /* same as `1 << m_id` */ \ MAPINFO_TYPE_##NAME = MAPINFO_TYPE_ALL + 1; MAPINFO_TYPE_ALL |= MAPINFO_TYPE_##NAME; \ this.items = MAPINFO_TYPE_##NAME; \ - } + this.m_parse_mapinfo = NAME##_mapinfo; \ + } \ + [[accumulate]] bool NAME##_mapinfo(string k, string v) #define IS_GAMETYPE(NAME) \ (MapInfo_LoadedGametype == MAPINFO_TYPE_##NAME) @@ -58,24 +63,79 @@ REGISTER_GAMETYPE(_("Deathmatch"),dm,g_dm,DEATHMATCH,false,"timelimit=20 pointli REGISTER_GAMETYPE(_("Last Man Standing"),lms,g_lms,LMS,false,"timelimit=20 lives=9 leadlimit=0",_("Survive and kill until the enemies have no lives left.")); -REGISTER_GAMETYPE(_("Race"),rc,g_race,RACE,false,"timelimit=20 qualifying_timelimit=5 laplimit=7 teamlaplimit=15 leadlimit=0",_("Race against other players to the finish line.")); +REGISTER_GAMETYPE(_("Race"),rc,g_race,RACE,false,"timelimit=20 qualifying_timelimit=5 laplimit=7 teamlaplimit=15 leadlimit=0",_("Race against other players to the finish line.")) +{ + if (!k) { + cvar_set("g_race_qualifying_timelimit", cvar_defstring("g_race_qualifying_timelimit")); + return true; + } + switch (k) { + case "qualifying_timelimit": + cvar_set("g_race_qualifying_timelimit", v); + return true; + } +} #define g_race IS_GAMETYPE(RACE) -REGISTER_GAMETYPE(_("Race CTS"),cts,g_cts,CTS,false,"timelimit=20 skill=-1",_("Race for fastest time.")); +REGISTER_GAMETYPE(_("Race CTS"),cts,g_cts,CTS,false,"timelimit=20",_("Race for fastest time.")); #define g_cts IS_GAMETYPE(CTS) -REGISTER_GAMETYPE(_("Team Deathmatch"),tdm,g_tdm,TEAM_DEATHMATCH,true,"timelimit=20 pointlimit=50 teams=2 leadlimit=0",_("Help your team score the most frags against the enemy team.")); +REGISTER_GAMETYPE(_("Team Deathmatch"),tdm,g_tdm,TEAM_DEATHMATCH,true,"timelimit=20 pointlimit=50 teams=2 leadlimit=0",_("Help your team score the most frags against the enemy team.")) +{ + if (!k) { + cvar_set("g_tdm_teams", cvar_defstring("g_tdm_teams")); + return true; + } + switch (k) { + case "teams": + cvar_set("g_tdm_teams", v); + return true; + } +} #define g_tdm IS_GAMETYPE(TEAM_DEATHMATCH) REGISTER_GAMETYPE(_("Capture the Flag"),ctf,g_ctf,CTF,true,"timelimit=20 caplimit=10 leadlimit=6",_("Find and bring the enemy flag to your base to capture it, defend your base from the other team.")); #define g_ctf IS_GAMETYPE(CTF) -REGISTER_GAMETYPE(_("Clan Arena"),ca,g_ca,CA,true,"timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill all enemy teammates to win the round.")); +REGISTER_GAMETYPE(_("Clan Arena"),ca,g_ca,CA,true,"timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill all enemy teammates to win the round.")) +{ + if (!k) { + cvar_set("g_ca_teams", cvar_defstring("g_ca_teams")); + return true; + } + switch (k) { + case "teams": + cvar_set("g_ca_teams", v); + return true; + } +} #define g_ca IS_GAMETYPE(CA) -REGISTER_GAMETYPE(_("Domination"),dom,g_domination,DOMINATION,true,"timelimit=20 pointlimit=200 teams=2 leadlimit=0",_("Capture and defend all the control points to win.")); +REGISTER_GAMETYPE(_("Domination"),dom,g_domination,DOMINATION,true,"timelimit=20 pointlimit=200 teams=2 leadlimit=0",_("Capture and defend all the control points to win.")) +{ + if (!k) { + cvar_set("g_domination_default_teams", cvar_defstring("g_domination_default_teams")); + return true; + } + switch (k) { + case "teams": + cvar_set("g_domination_default_teams", v); + return true; + } +} -REGISTER_GAMETYPE(_("Key Hunt"),kh,g_keyhunt,KEYHUNT,true,"timelimit=20 pointlimit=1000 teams=3 leadlimit=0",_("Gather all the keys to win the round.")); +REGISTER_GAMETYPE(_("Key Hunt"),kh,g_keyhunt,KEYHUNT,true,"timelimit=20 pointlimit=1000 teams=3 leadlimit=0",_("Gather all the keys to win the round.")) +{ + if (!k) { + cvar_set("g_keyhunt_teams", cvar_defstring("g_keyhunt_teams")); + return true; + } + switch (k) { + case "teams": + cvar_set("g_keyhunt_teams", v); + return true; + } +} REGISTER_GAMETYPE(_("Assault"),as,g_assault,ASSAULT,true,"timelimit=20",_("Destroy obstacles to find and destroy the enemy power core before time runs out.")); #define g_assault IS_GAMETYPE(ASSAULT) @@ -85,12 +145,30 @@ REGISTER_GAMETYPE(_("Onslaught"),ons,g_onslaught,ONSLAUGHT,true,"pointlimit=1 ti REGISTER_GAMETYPE(_("Nexball"),nb,g_nexball,NEXBALL,true,"timelimit=20 pointlimit=5 leadlimit=0",_("Shoot and kick the ball into the enemies goal, keep your goal clean.")); #define g_nexball IS_GAMETYPE(NEXBALL) -REGISTER_GAMETYPE(_("Freeze Tag"),ft,g_freezetag,FREEZETAG,true,"timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill enemies to freeze them, stand next to teammates to revive them, freeze the most enemies to win.")); +REGISTER_GAMETYPE(_("Freeze Tag"),ft,g_freezetag,FREEZETAG,true,"timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill enemies to freeze them, stand next to teammates to revive them, freeze the most enemies to win.")) +{ + if (!k) { + cvar_set("g_freezetag_teams", cvar_defstring("g_freezetag_teams")); + return true; + } + switch (k) { + case "teams": + cvar_set("g_freezetag_teams", v); + return true; + } +} #define g_freezetag IS_GAMETYPE(FREEZETAG) REGISTER_GAMETYPE(_("Keepaway"),ka,g_keepaway,KEEPAWAY,true,"timelimit=20 pointlimit=30",_("Hold the ball to get points for kills.")); -REGISTER_GAMETYPE(_("Invasion"),inv,g_invasion,INVASION,false,"pointlimit=50 teams=0",_("Survive against waves of monsters.")); +REGISTER_GAMETYPE(_("Invasion"),inv,g_invasion,INVASION,false,"pointlimit=50 teams=0",_("Survive against waves of monsters.")) +{ + switch (k) { + case "teams": + cvar_set("g_invasion_teams", v); + return true; + } +} const int MAPINFO_FEATURE_WEAPONS = 1; // not defined for instagib-only maps const int MAPINFO_FEATURE_VEHICLES = 2; -- 2.39.2