Merge branch 'maint' (early part before Transifex)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapinfo.qh

diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh
index 03ad44870509c12fe652127d059da3a127c86092..22b17d900de78e4e4fb451363d27fd29360e00c8 100644 (file)
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@ -1,44 +1,56 @@
 #ifndef MAPINFO_H
 #define MAPINFO_H
 
+#include "util.qh"
+
+CLASS(Gametype, Object)
+    ATTRIB(Gametype, m_id, int, 0)
+    /** game type ID */
+    ATTRIB(Gametype, items, int, 0)
+    /** game type name as in cvar (with g_ prefix) */
+    ATTRIB(Gametype, netname, string, string_null)
+    /** game type short name */
+    ATTRIB(Gametype, mdl, string, string_null)
+    /** human readable name */
+    ATTRIB(Gametype, message, string, string_null)
+    /** does this gametype support teamplay? */
+    ATTRIB(Gametype, team, bool, false)
+    /** game type defaults */
+    ATTRIB(Gametype, model2, string, string_null)
+    /** game type description */
+    ATTRIB(Gametype, gametype_description, string, string_null)
+    CONSTRUCTOR(Gametype, string hname, string sname, string g_name, bool gteamplay, string defaults, string gdescription)
+    {
+        CONSTRUCT(Gametype);
+        this.netname = g_name;
+        this.mdl = sname;
+        this.message = hname;
+        this.team = gteamplay;
+        this.model2 = defaults;
+        this.gametype_description = gdescription;
+        return this;
+    }
+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;
-entity MapInfo_Type_first;
-entity MapInfo_Type_last;
-.entity enemy; // internal next pointer
-
-.int items; // game type ID
-.string netname; // game type name as in cvar (with g_ prefix)
-.string mdl; // game type short name
-.string message; // human readable name
-.float team; // does this gametype support teamplay?
-.string model2; // game type defaults
-.string gametype_description; // game type description
-
-#define REGISTER_GAMETYPE(hname,sname,g_name,NAME,gteamplay,defaults,gdescription) \
-       int MAPINFO_TYPE_##NAME; \
-       entity MapInfo_Type##g_name; \
-       void RegisterGametypes_##g_name() \
-       { \
-               MAPINFO_TYPE_##NAME = MAPINFO_TYPE_ALL + 1; \
-               MAPINFO_TYPE_ALL |= MAPINFO_TYPE_##NAME; \
-               MapInfo_Type##g_name = spawn(); \
-               MapInfo_Type##g_name.items = MAPINFO_TYPE_##NAME; \
-               MapInfo_Type##g_name.netname = #g_name; \
-               MapInfo_Type##g_name.mdl = #sname; \
-               MapInfo_Type##g_name.message = hname; \
-               MapInfo_Type##g_name.team = gteamplay; \
-               MapInfo_Type##g_name.model2 = defaults; \
-               MapInfo_Type##g_name.gametype_description = gdescription; \
-               if(!MapInfo_Type_first) \
-                       MapInfo_Type_first = MapInfo_Type##g_name; \
-               if(MapInfo_Type_last) \
-                       MapInfo_Type_last.enemy = MapInfo_Type##g_name; \
-               MapInfo_Type_last = MapInfo_Type##g_name; \
-       } \
-       ACCUMULATE_FUNCTION(RegisterGametypes, RegisterGametypes_##g_name)
+
+#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)
 
 #define IS_GAMETYPE(NAME) \
-       (MapInfo_LoadedGametype == MAPINFO_TYPE_##NAME)
+    (MapInfo_LoadedGametype == MAPINFO_TYPE_##NAME)
 
 REGISTER_GAMETYPE(_("Deathmatch"),dm,g_dm,DEATHMATCH,false,"timelimit=20 pointlimit=30 leadlimit=0",_("Kill all enemies"));
 #define g_dm IS_GAMETYPE(DEATHMATCH)
@@ -118,10 +130,11 @@ 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)
+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
-float MapInfo_ForbiddenFlags(); // retrieves current flags from cvars
-float MapInfo_RequiredFlags(); // retrieves current flags from cvars
+int MapInfo_ForbiddenFlags(); // retrieves current flags from cvars
+int MapInfo_RequiredFlags(); // retrieves current flags from cvars
 
 // load info about the i-th map into the MapInfo_Map_* globals
 float MapInfo_Get_ByID(float i); // 1 on success, 0 on failure
@@ -152,7 +165,7 @@ 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(float t);
+void MapInfo_SwitchGameType(int t);
 
 // to be called from worldspawn to set up cvars
 void MapInfo_LoadMapSettings(string s);
@@ -168,4 +181,4 @@ 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
\ No newline at end of file
+#endif