X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qh;h=2dd84596e46991e8f3f75daeb63b524273825d01;hp=e6c5ea47d5dd7c4566df236f0f50be116fab9547;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hpb=9071388aa77d6a4cd4ef43970f00fa21c22e3859 diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index e6c5ea47d5..2dd84596e4 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -1,107 +1,484 @@ -#ifndef MAPINFO_H -#define MAPINFO_H +#pragma once #include "util.qh" +// info about a map that MapInfo loads +string MapInfo_Map_bspname; +string MapInfo_Map_title; +string MapInfo_Map_titlestring; // either bspname: title or just title, depending on whether bspname is redundant +string MapInfo_Map_description; +string MapInfo_Map_author; +string MapInfo_Map_clientstuff; // not in cache, only for map load +string MapInfo_Map_fog; // not in cache, only for map load +int MapInfo_Map_supportedGametypes; +int MapInfo_Map_supportedFeatures; +int MapInfo_Map_flags; +vector MapInfo_Map_mins; // these are '0 0 0' if not supported! +vector MapInfo_Map_maxs; // these are '0 0 0' if not specified! + +int MAPINFO_TYPE_ALL; +.int m_flags; + CLASS(Gametype, Object) - ATTRIB(Gametype, m_id, int, 0) + ATTRIB(Gametype, m_id, int, 0); /** game type ID */ - ATTRIB(Gametype, items, int, 0) + ATTRIB(Gametype, items, int, 0); /** game type name as in cvar (with g_ prefix) */ - ATTRIB(Gametype, netname, string, string_null) + ATTRIB(Gametype, netname, string); /** game type short name */ - ATTRIB(Gametype, mdl, string, string_null) + ATTRIB(Gametype, mdl, string); /** human readable name */ - ATTRIB(Gametype, message, string, string_null) + ATTRIB(Gametype, message, string); /** does this gametype support teamplay? */ - ATTRIB(Gametype, team, bool, false) + ATTRIB(Gametype, team, bool, false); /** game type defaults */ - ATTRIB(Gametype, model2, string, string_null) + ATTRIB(Gametype, model2, string); /** game type description */ - ATTRIB(Gametype, gametype_description, string, string_null) + ATTRIB(Gametype, gametype_description, string); +#ifdef CSQC + ATTRIB(Gametype, m_modicons, void(vector pos, vector mySize)); + ATTRIB(Gametype, m_modicons_reset, void()); +#endif + + ATTRIB(Gametype, m_mutators, string); + METHOD(Gametype, m_parse_mapinfo, bool(string k, string v)) + { + return false; + } + METHOD(Gametype, m_generate_mapinfo, void(Gametype this, string v)) + { + TC(Gametype, this); + } + METHOD(Gametype, m_isTwoBaseMode, bool()) + { + return false; + } + METHOD(Gametype, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter)) + { + return false; + } - METHOD(Gametype, describe, string(entity this)) { return this.gametype_description; } + METHOD(Gametype, describe, string(Gametype this)) + { + TC(Gametype, this); + return this.gametype_description; + } - METHOD(Gametype, display, void(entity this, void(string name, string icon) returns)) { + METHOD(Gametype, display, void(Gametype this, void(string name, string icon) returns)) + { + TC(Gametype, this); returns(this.message, strcat("gametype_", this.mdl)); } - CONSTRUCTOR(Gametype, string hname, string sname, string g_name, bool gteamplay, string defaults, string gdescription) + METHOD(Gametype, gametype_init, void(Gametype this, string hname, string sname, string g_name, bool gteamplay, string mutators, string defaults, string gdescription)) { - CONSTRUCT(Gametype); this.netname = g_name; this.mdl = sname; this.message = hname; this.team = gteamplay; + this.m_mutators = cons(sname, mutators); this.model2 = defaults; this.gametype_description = gdescription; + + // same as `1 << m_id` + MAPINFO_TYPE_ALL |= this.items = this.m_flags = (MAPINFO_TYPE_ALL + 1); } ENDCLASS(Gametype) -void RegisterGametypes(); -const int MAX_MAPINFO_TYPES = 24; -entity MAPINFO_TYPES[MAX_MAPINFO_TYPES], MAPINFO_TYPES_first, MAPINFO_TYPES_last; -int MAPINFO_TYPE_COUNT; -int MAPINFO_TYPE_ALL; - -#define REGISTER_GAMETYPE(hname, sname, g_name, NAME, gteamplay, defaults, gdescription) \ - int MAPINFO_TYPE_##NAME; \ - REGISTER(RegisterGametypes, MAPINFO_TYPE, MAPINFO_TYPES, MAPINFO_TYPE_COUNT, 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; \ - } -REGISTER_REGISTRY(RegisterGametypes) +REGISTRY(Gametypes, 24) +#define Gametypes_from(i) _Gametypes_from(i, NULL) +REGISTER_REGISTRY(Gametypes) +REGISTRY_CHECK(Gametypes) +#define REGISTER_GAMETYPE(NAME, inst) REGISTER(Gametypes, MAPINFO_TYPE, NAME, m_id, inst) -#define IS_GAMETYPE(NAME) \ - (MapInfo_LoadedGametype == MAPINFO_TYPE_##NAME) +#define IS_GAMETYPE(NAME) (MapInfo_LoadedGametype == MAPINFO_TYPE_##NAME) -REGISTER_GAMETYPE(_("Deathmatch"),dm,g_dm,DEATHMATCH,false,"timelimit=20 pointlimit=30 leadlimit=0",_("Score as many frags as you can")); -#define g_dm IS_GAMETYPE(DEATHMATCH) +CLASS(Deathmatch, Gametype) + INIT(Deathmatch) + { + this.gametype_init(this, _("Deathmatch"),"dm","g_dm",false,"","timelimit=20 pointlimit=30 leadlimit=0",_("Score as many frags as you can")); + } + METHOD(Deathmatch, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter)) + { + return true; + } +ENDCLASS(Deathmatch) +REGISTER_GAMETYPE(DEATHMATCH, NEW(Deathmatch)); -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")); -#define g_lms IS_GAMETYPE(LMS) +CLASS(LastManStanding, Gametype) + INIT(LastManStanding) + { + this.gametype_init(this, _("Last Man Standing"),"lms","g_lms",false,"","timelimit=20 lives=9 leadlimit=0",_("Survive and kill until the enemies have no lives left")); + } + METHOD(LastManStanding, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter)) + { + return true; + } +ENDCLASS(LastManStanding) +REGISTER_GAMETYPE(LMS, NEW(LastManStanding)); -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")); +#ifdef CSQC +void HUD_Mod_Race(vector pos, vector mySize); +#endif +CLASS(Race, Gametype) + INIT(Race) + { + this.gametype_init(this, _("Race"),"rc","g_race",false,"","timelimit=20 qualifying_timelimit=5 laplimit=7 teamlaplimit=15 leadlimit=0",_("Race against other players to the finish line")); + } + METHOD(Race, m_parse_mapinfo, bool(string k, string v)) + { + 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; + } + return false; + } + METHOD(Race, m_generate_mapinfo, void(Gametype this, string v)) + { + if(v == "trigger_race_checkpoint") + MapInfo_Map_supportedGametypes |= this.m_flags; + } + METHOD(Race, m_isTwoBaseMode, bool()) + { + return true; + } +#ifdef CSQC + ATTRIB(Race, m_modicons, void(vector pos, vector mySize), HUD_Mod_Race); +#endif +ENDCLASS(Race) +REGISTER_GAMETYPE(RACE, NEW(Race)); #define g_race IS_GAMETYPE(RACE) -REGISTER_GAMETYPE(_("Race CTS"),cts,g_cts,CTS,false,"timelimit=20 skill=-1",_("Race for fastest time")); +CLASS(RaceCTS, Gametype) + INIT(RaceCTS) + { + this.gametype_init(this, _("Race CTS"),"cts","g_cts",false,"cloaked","timelimit=20",_("Race for fastest time.")); + } + METHOD(RaceCTS, m_generate_mapinfo, void(Gametype this, string v)) + { + if(v == "target_startTimer") + MapInfo_Map_supportedGametypes |= this.m_flags; + } + METHOD(RaceCTS, m_setTeams, void(string sa)) + { + // this is the skill of the map + // not parsed by anything yet + // for map databases + // cvar_set("fraglimit", sa); + } +#ifdef CSQC + ATTRIB(RaceCTS, m_modicons, void(vector pos, vector mySize), HUD_Mod_Race); +#endif +ENDCLASS(RaceCTS) +REGISTER_GAMETYPE(CTS, NEW(RaceCTS)); #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")); +CLASS(TeamDeathmatch, Gametype) + INIT(TeamDeathmatch) + { + this.gametype_init(this, _("Team Deathmatch"),"tdm","g_tdm",true,"","timelimit=20 pointlimit=50 teams=2 leadlimit=0",_("Help your team score the most frags against the enemy team")); + } + METHOD(TeamDeathmatch, m_parse_mapinfo, bool(string k, string v)) + { + 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; + } + return false; + } + METHOD(TeamDeathmatch, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter)) + { + if(spawnpoints >= 8 && diameter > 4096) + return true; + return false; + } + METHOD(TeamDeathmatch, m_setTeams, void(string sa)) + { + cvar_set("g_tdm_teams", sa); + } +ENDCLASS(TeamDeathmatch) +REGISTER_GAMETYPE(TEAM_DEATHMATCH, NEW(TeamDeathmatch)); #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")); +#ifdef CSQC +void HUD_Mod_CTF(vector pos, vector mySize); +void HUD_Mod_CTF_Reset(); +#endif +CLASS(CaptureTheFlag, Gametype) + INIT(CaptureTheFlag) + { + this.gametype_init(this, _("Capture the Flag"),"ctf","g_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")); + } + METHOD(CaptureTheFlag, m_generate_mapinfo, void(Gametype this, string v)) + { + if(v == "item_flag_team2" || v == "team_CTF_blueflag") + MapInfo_Map_supportedGametypes |= this.m_flags; + } + METHOD(CaptureTheFlag, m_isTwoBaseMode, bool()) + { + return true; + } + METHOD(CaptureTheFlag, m_setTeams, void(string sa)) + { + cvar_set("fraglimit", sa); + } +#ifdef CSQC + ATTRIB(CaptureTheFlag, m_modicons, void(vector pos, vector mySize), HUD_Mod_CTF); + ATTRIB(CaptureTheFlag, m_modicons_reset, void(), HUD_Mod_CTF_Reset); +#endif +ENDCLASS(CaptureTheFlag) +REGISTER_GAMETYPE(CTF, NEW(CaptureTheFlag)); #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")); +#ifdef CSQC +void HUD_Mod_CA(vector pos, vector mySize); +#endif +CLASS(ClanArena, Gametype) + INIT(ClanArena) + { + this.gametype_init(this, _("Clan Arena"),"ca","g_ca",true,"","timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill all enemy teammates to win the round")); + } + METHOD(ClanArena, m_parse_mapinfo, bool(string k, string v)) + { + 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; + } + return false; + } + METHOD(ClanArena, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter)) + { + if(spawnpoints >= 8 && diameter > 4096) + return true; + return false; + } + METHOD(ClanArena, m_setTeams, void(string sa)) + { + cvar_set("g_ca_teams", sa); + } +#ifdef CSQC + ATTRIB(ClanArena, m_modicons, void(vector pos, vector mySize), HUD_Mod_CA); +#endif +ENDCLASS(ClanArena) +REGISTER_GAMETYPE(CA, NEW(ClanArena)); #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")); -#define g_domination IS_GAMETYPE(DOMINATION) +#ifdef CSQC +void HUD_Mod_Dom(vector pos, vector mySize); +#endif +CLASS(Domination, Gametype) + INIT(Domination) + { + this.gametype_init(this, _("Domination"),"dom","g_domination",true,"","timelimit=20 pointlimit=200 teams=2 leadlimit=0",_("Capture and defend all the control points to win")); + } + METHOD(Domination, m_parse_mapinfo, bool(string k, string v)) + { + 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; + } + return false; + } + METHOD(Domination, m_generate_mapinfo, void(Gametype this, string v)) + { + if(v == "dom_controlpoint") + MapInfo_Map_supportedGametypes |= this.m_flags; + } +#ifdef CSQC + ATTRIB(Domination, m_modicons, void(vector pos, vector mySize), HUD_Mod_Dom); +#endif +ENDCLASS(Domination) +REGISTER_GAMETYPE(DOMINATION, NEW(Domination)); -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")); -#define g_keyhunt IS_GAMETYPE(KEYHUNT) +#ifdef CSQC +void HUD_Mod_KH(vector pos, vector mySize); +#endif +CLASS(KeyHunt, Gametype) + INIT(KeyHunt) + { + this.gametype_init(this, _("Key Hunt"),"kh","g_keyhunt",true,"","timelimit=20 pointlimit=1000 teams=3 leadlimit=0",_("Gather all the keys to win the round")); + } + METHOD(KeyHunt, m_parse_mapinfo, bool(string k, string v)) + { + 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; + } + return false; + } + METHOD(KeyHunt, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter)) + { + if(spawnpoints >= 12 && diameter > 5120) + return true; + return false; + } + METHOD(KeyHunt, m_setTeams, void(string sa)) + { + cvar_set("g_keyhunt_teams", sa); + } +#ifdef CSQC + ATTRIB(KeyHunt, m_modicons, void(vector pos, vector mySize), HUD_Mod_KH); +#endif +ENDCLASS(KeyHunt) +REGISTER_GAMETYPE(KEYHUNT, NEW(KeyHunt)); -REGISTER_GAMETYPE(_("Assault"),as,g_assault,ASSAULT,true,"timelimit=20",_("Destroy obstacles to find and destroy the enemy power core before time runs out")); +CLASS(Assault, Gametype) + INIT(Assault) + { + this.gametype_init(this, _("Assault"),"as","g_assault",true,"","timelimit=20",_("Destroy obstacles to find and destroy the enemy power core before time runs out")); + } + METHOD(Assault, m_generate_mapinfo, void(Gametype this, string v)) + { + if(v == "target_assault_roundend") + MapInfo_Map_supportedGametypes |= this.m_flags; + } + METHOD(Assault, m_isTwoBaseMode, bool()) + { + return true; + } +ENDCLASS(Assault) +REGISTER_GAMETYPE(ASSAULT, NEW(Assault)); #define g_assault IS_GAMETYPE(ASSAULT) -REGISTER_GAMETYPE(_("Onslaught"),ons,g_onslaught,ONSLAUGHT,true,"pointlimit=1 timelimit=20",_("Capture control points to reach and destroy the enemy generator")); -#define g_onslaught IS_GAMETYPE(ONSLAUGHT) +CLASS(Onslaught, Gametype) + INIT(Onslaught) + { + this.gametype_init(this, _("Onslaught"),"ons","g_onslaught",true,"","pointlimit=1 timelimit=20",_("Capture control points to reach and destroy the enemy generator")); + } + METHOD(Onslaught, m_generate_mapinfo, void(Gametype this, string v)) + { + if(v == "onslaught_generator") + MapInfo_Map_supportedGametypes |= this.m_flags; + } +ENDCLASS(Onslaught) +REGISTER_GAMETYPE(ONSLAUGHT, NEW(Onslaught)); -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")); +#ifdef CSQC +void HUD_Mod_NexBall(vector pos, vector mySize); +#endif +CLASS(NexBall, Gametype) + INIT(NexBall) + { + this.gametype_init(this, _("Nexball"),"nb","g_nexball",true,"","timelimit=20 pointlimit=5 leadlimit=0",_("Shoot and kick the ball into the enemies goal, keep your goal clean")); + } + METHOD(NexBall, m_generate_mapinfo, void(Gametype this, string v)) + { + if(substring(v, 0, 8) == "nexball_" || substring(v, 0, 4) == "ball") + MapInfo_Map_supportedGametypes |= this.m_flags; + } + METHOD(NexBall, m_isTwoBaseMode, bool()) + { + return true; + } +#ifdef CSQC + ATTRIB(NexBall, m_modicons, void(vector pos, vector mySize), HUD_Mod_NexBall); +#endif +ENDCLASS(NexBall) +REGISTER_GAMETYPE(NEXBALL, NEW(NexBall)); #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")); +CLASS(FreezeTag, Gametype) + INIT(FreezeTag) + { + this.gametype_init(this, _("Freeze Tag"),"ft","g_freezetag",true,"","timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill enemies to freeze them, stand next to frozen teammates to revive them; freeze all enemies to win")); + } + METHOD(FreezeTag, m_parse_mapinfo, bool(string k, string v)) + { + 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; + } + return false; + } + METHOD(FreezeTag, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter)) + { + if(spawnpoints >= 8 && diameter > 4096) + return true; + return false; + } + METHOD(FreezeTag, m_setTeams, void(string sa)) + { + cvar_set("g_freezetag_teams", sa); + } +#ifdef CSQC + ATTRIB(FreezeTag, m_modicons, void(vector pos, vector mySize), HUD_Mod_CA); +#endif +ENDCLASS(FreezeTag) +REGISTER_GAMETYPE(FREEZETAG, NEW(FreezeTag)); #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")); -#define g_keepaway IS_GAMETYPE(KEEPAWAY) +#ifdef CSQC +void HUD_Mod_Keepaway(vector pos, vector mySize); +#endif +CLASS(Keepaway, Gametype) + INIT(Keepaway) + { + this.gametype_init(this, _("Keepaway"),"ka","g_keepaway",false,"","timelimit=20 pointlimit=30",_("Hold the ball to get points for kills")); + } + METHOD(Keepaway, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter)) + { + return true; + } +#ifdef CSQC + ATTRIB(Keepaway, m_modicons, void(vector pos, vector mySize), HUD_Mod_Keepaway); +#endif +ENDCLASS(Keepaway) +REGISTER_GAMETYPE(KEEPAWAY, NEW(Keepaway)); -REGISTER_GAMETYPE(_("Invasion"),inv,g_invasion,INVASION,false,"pointlimit=50 teams=0",_("Survive against waves of monsters")); -#define g_invasion IS_GAMETYPE(INVASION) +CLASS(Invasion, Gametype) + INIT(Invasion) + { + this.gametype_init(this, _("Invasion"),"inv","g_invasion",false,"","pointlimit=50 teams=0 type=0",_("Survive against waves of monsters")); + } + METHOD(Invasion, m_parse_mapinfo, bool(string k, string v)) + { + switch (k) { + case "teams": + cvar_set("g_invasion_teams", v); + return true; + case "type": + cvar_set("g_invasion_type", v); + return true; + } + return false; + } + METHOD(Invasion, m_generate_mapinfo, void(Gametype this, string v)) + { + if(v == "invasion_spawnpoint") + MapInfo_Map_supportedGametypes |= this.m_flags; + } +ENDCLASS(Invasion) +REGISTER_GAMETYPE(INVASION, NEW(Invasion)); const int MAPINFO_FEATURE_WEAPONS = 1; // not defined for instagib-only maps const int MAPINFO_FEATURE_VEHICLES = 2; @@ -115,30 +492,17 @@ const int MAPINFO_FLAG_NOAUTOMAPLIST = 8; // do not include when automaticall float MapInfo_count; -// info about a map that MapInfo loads -string MapInfo_Map_bspname; -string MapInfo_Map_title; -string MapInfo_Map_titlestring; // either bspname: title or just title, depending on whether bspname is redundant -string MapInfo_Map_description; -string MapInfo_Map_author; -string MapInfo_Map_clientstuff; // not in cache, only for map load -string MapInfo_Map_fog; // not in cache, only for map load -int MapInfo_Map_supportedGametypes; -int MapInfo_Map_supportedFeatures; -int MapInfo_Map_flags; -vector MapInfo_Map_mins; // these are '0 0 0' if not supported! -vector MapInfo_Map_maxs; // these are '0 0 0' if not specified! - // load MapInfo_count; generate mapinfo for maps that miss them, and clear the // cache; you need to call MapInfo_FilterGametype afterwards! void MapInfo_Enumerate(); // filter the info by game type mask (updates MapInfo_count) float MapInfo_progress; -float MapInfo_FilterGametype(float gametype, float features, float pFlagsRequired, float pFlagsForbidden, float pAbortOnGenerate); // 1 on success, 0 on temporary failure (call it again next frame then; use MapInfo_progress as progress indicator) +float MapInfo_FilterGametype(Gametype gametypeFlags, float features, float pFlagsRequired, float pFlagsForbidden, float pAbortOnGenerate); // 1 on success, 0 on temporary failure (call it again next frame then; use MapInfo_progress as progress indicator) +float _MapInfo_FilterGametype(int gametypeFlags, float features, float pFlagsRequired, float pFlagsForbidden, float pAbortOnGenerate); // 1 on success, 0 on temporary failure (call it again next frame then; use MapInfo_progress as progress indicator) void MapInfo_FilterString(string sf); // filter _MapInfo_filtered (created by MapInfo_FilterGametype) with keyword int MapInfo_CurrentFeatures(); // retrieves currently required features from cvars -int MapInfo_CurrentGametype(); // retrieves current gametype from cvars +Gametype MapInfo_CurrentGametype(); // retrieves current gametype from cvars int MapInfo_ForbiddenFlags(); // retrieves current flags from cvars int MapInfo_RequiredFlags(); // retrieves current flags from cvars @@ -147,7 +511,7 @@ float MapInfo_Get_ByID(float i); // 1 on success, 0 on failure string MapInfo_BSPName_ByID(float i); // load info about a map by name into the MapInfo_Map_* globals -float MapInfo_Get_ByName(string s, float allowGenerate, float gametypeToSet); // 1 on success, 0 on failure, 2 if it autogenerated a mapinfo file +int MapInfo_Get_ByName(string s, float allowGenerate, Gametype gametypeToSet); // 1 on success, 0 on failure, 2 if it autogenerated a mapinfo file // look for a map by a prefix, returns the actual map name on success, string_null on failure or ambigous match string MapInfo_FindName_match; // the name of the map that was found @@ -160,22 +524,22 @@ float MapInfo_CheckMap(string s); // returns 0 if the map can't be played with t void MapInfo_LoadMap(string s, float reinit); // list all maps for the current game type -string MapInfo_ListAllowedMaps(float type, float pFlagsRequired, float pFlagsForbidden); +string MapInfo_ListAllowedMaps(Gametype type, float pFlagsRequired, float pFlagsForbidden); // list all allowed maps (for any game type) string MapInfo_ListAllAllowedMaps(float pFlagsRequired, float pFlagsForbidden); // gets a gametype from a string -string _MapInfo_GetDefaultEx(float t); -float _MapInfo_GetTeamPlayBool(float t); -float MapInfo_Type_FromString(string t); -string MapInfo_Type_Description(float t); -string MapInfo_Type_ToString(float t); -string MapInfo_Type_ToText(float t); -void MapInfo_SwitchGameType(int t); +string _MapInfo_GetDefaultEx(Gametype t); +float _MapInfo_GetTeamPlayBool(Gametype t); +Gametype MapInfo_Type_FromString(string t); +string MapInfo_Type_Description(Gametype t); +string MapInfo_Type_ToString(Gametype t); +string MapInfo_Type_ToText(Gametype t); +void MapInfo_SwitchGameType(Gametype t); // to be called from worldspawn to set up cvars void MapInfo_LoadMapSettings(string s); -float MapInfo_LoadedGametype; // game type that was active during map load +Gametype MapInfo_LoadedGametype; // game type that was active during map load void MapInfo_Cache_Destroy(); // disable caching void MapInfo_Cache_Create(); // enable caching @@ -187,4 +551,3 @@ void MapInfo_Shutdown(); // call this in the shutdown handler #define MAPINFO_SETTEMP_ACL_USER cvar_string("g_mapinfo_settemp_acl") #define MAPINFO_SETTEMP_ACL_SYSTEM "-g_mapinfo_* -rcon_* -_* -g_ban* +*" -#endif