Merge branch 'master' into mirceakitsune/preview_images

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / gametypelist.c

diff --git a/qcsrc/menu/xonotic/gametypelist.c b/qcsrc/menu/xonotic/gametypelist.c
index cfc47311e1270899f2ce09be942e2be41bf20437..cbc239946a70112b25f1818756dbf930b4c63a2a 100644 (file)
--- a/qcsrc/menu/xonotic/gametypelist.c
+++ b/qcsrc/menu/xonotic/gametypelist.c
@@ -18,53 +18,6 @@ entity makeXonoticGametypeList();
 
 #ifdef IMPLEMENTATION
 
-#define GAMETYPES \
-       GAMETYPE(MAPINFO_TYPE_DEATHMATCH, "Deathmatch") \
-       GAMETYPE(MAPINFO_TYPE_LMS, "LMS") \
-       GAMETYPE(MAPINFO_TYPE_ARENA, "Arena") \
-       GAMETYPE(MAPINFO_TYPE_RUNEMATCH, "Runematch") \
-       GAMETYPE(MAPINFO_TYPE_RACE, "Race") \
-       GAMETYPE(MAPINFO_TYPE_CTS, "Race CTS") \
-       GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH, "TDM") \
-       GAMETYPE(MAPINFO_TYPE_CTF, "CTF") \
-       GAMETYPE(MAPINFO_TYPE_CA, "Clan Arena") \
-       GAMETYPE(MAPINFO_TYPE_DOMINATION, "Domination") \
-       GAMETYPE(MAPINFO_TYPE_KEYHUNT, "Key Hunt") \
-       GAMETYPE(MAPINFO_TYPE_ASSAULT, "Assault") \
-       GAMETYPE(MAPINFO_TYPE_ONSLAUGHT, "Onslaught") \
-       GAMETYPE(MAPINFO_TYPE_NEXBALL, "Nexball") \
-       GAMETYPE(MAPINFO_TYPE_FREEZETAG, "Freeze Tag") \
-       GAMETYPE(MAPINFO_TYPE_KEEPAWAY, "Keepaway") \
-       /* nothing */
-
-float GameType_GetID(float cnt)
-{
-       float i;
-       i = 0;
-#define GAMETYPE(id,name) if(i++ == cnt) return id;
-       GAMETYPES
-#undef GAMETYPE
-       return 0;
-}
-string GameType_GetName(float cnt)
-{
-       float i;
-       i = 0;
-#define GAMETYPE(id,name) if(i++ == cnt) return name;
-       GAMETYPES
-#undef GAMETYPE
-       return "@!#%'n Tuba Throwing";
-}
-float GameType_GetCount()
-{
-       float i;
-       i = 0;
-#define GAMETYPE(id,name) ++i;
-       GAMETYPES
-#undef GAMETYPE
-       return i;
-}
-
 entity makeXonoticGametypeList(void)
 {
        entity me;
@@ -76,6 +29,7 @@ void XonoticGametypeList_configureXonoticGametypeList(entity me)
 {
        me.loadCvars(me);
        me.configureXonoticListBox(me);
+       me.nItems = GameType_GetCount();
 }
 void XonoticGametypeList_setSelected(entity me, float i)
 {
@@ -85,9 +39,6 @@ void XonoticGametypeList_setSelected(entity me, float i)
 
 void XonoticGametypeList_loadCvars(entity me)
 {
-       if not(me.cvarName)
-               return;
-
        float t;
        t = MapInfo_CurrentGametype();
        float i;
@@ -95,7 +46,13 @@ void XonoticGametypeList_loadCvars(entity me)
                if(t == GameType_GetID(i))
                        break;
        if(i >= GameType_GetCount())
-               i = 0;
+       {
+               for(i = 0; i < GameType_GetCount(); ++i)
+                       if(t == MAPINFO_TYPE_DEATHMATCH)
+                               break;
+               if(i >= GameType_GetCount())
+                       i = 0;
+       }
        me.setSelected(me, i);
        // do we need this: me.parent.gameTypeChangeNotify(me.parent); // to make sure
 }
@@ -113,7 +70,7 @@ void XonoticGametypeList_drawListBoxItem(entity me, float i, vector absSize, flo
        string s;
        if(isSelected)
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
-       s = GameType_GetName(i);
+       s = MapInfo_Type_ToText(GameType_GetID(i));
        draw_Text(me.realUpperMargin * eY + (me.columnNameOrigin + (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize)) * 0.5) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
 }
 void XonoticGametypeList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)