X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fgametypelist.c;h=531c761f637d124dccf7b46f0cc24605b2a9d2f5;hb=93735d2e627b843f01841ec565221aa3854a2e6a;hp=ca09a31e35b688e4840e1e0ea02d36fe624ff68e;hpb=40834b45b6e3bc78f74f41fd6a0801bf41170767;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/gametypelist.c b/qcsrc/menu/xonotic/gametypelist.c
index ca09a31e3..531c761f6 100644
--- a/qcsrc/menu/xonotic/gametypelist.c
+++ b/qcsrc/menu/xonotic/gametypelist.c
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticGametypeList) EXTENDS(XonoticListBox)
 	METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity))
-	ATTRIB(XonoticGametypeList, rowsPerItem, float, 1)
+	ATTRIB(XonoticGametypeList, rowsPerItem, float, 2)
 	METHOD(XonoticGametypeList, drawListBoxItem, void(entity, float, vector, float))
 	METHOD(XonoticGametypeList, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(XonoticGametypeList, setSelected, void(entity, float))
@@ -9,7 +9,10 @@ CLASS(XonoticGametypeList) EXTENDS(XonoticListBox)
 	METHOD(XonoticGametypeList, saveCvars, void(entity))
 
 	ATTRIB(XonoticGametypeList, realFontSize, vector, '0 0 0')
-	ATTRIB(XonoticGametypeList, realUpperMargin, float, 0)
+	ATTRIB(XonoticGametypeList, realUpperMargin1, float, 0)
+	ATTRIB(XonoticGametypeList, realUpperMargin2, float, 0)
+	ATTRIB(XonoticGametypeList, columnIconOrigin, float, 0)
+	ATTRIB(XonoticGametypeList, columnIconSize, float, 0)
 	ATTRIB(XonoticGametypeList, columnNameOrigin, float, 0)
 	ATTRIB(XonoticGametypeList, columnNameSize, float, 0)
 ENDCLASS(XonoticGametypeList)
@@ -18,53 +21,6 @@ entity makeXonoticGametypeList();
 
 #ifdef IMPLEMENTATION
 
-#define GAMETYPES \
-	GAMETYPE(MAPINFO_TYPE_ARENA, "Arena") \
-	GAMETYPE(MAPINFO_TYPE_ASSAULT, "Assault") \
-	GAMETYPE(MAPINFO_TYPE_CTF, "Capture The Flag") \
-	GAMETYPE(MAPINFO_TYPE_CA, "Clan Arena") \
-	GAMETYPE(MAPINFO_TYPE_DEATHMATCH, "Deathmatch") \
-	GAMETYPE(MAPINFO_TYPE_DOMINATION, "Domination") \
-	GAMETYPE(MAPINFO_TYPE_FREEZETAG, "Freeze Tag") \
-	GAMETYPE(MAPINFO_TYPE_KEEPAWAY, "Keepaway") \
-	GAMETYPE(MAPINFO_TYPE_KEYHUNT, "Key Hunt") \
-	GAMETYPE(MAPINFO_TYPE_LMS, "Last Man Standing") \
-	GAMETYPE(MAPINFO_TYPE_NEXBALL, "Nexball") \
-	GAMETYPE(MAPINFO_TYPE_ONSLAUGHT, "Onslaught") \
-	GAMETYPE(MAPINFO_TYPE_RACE, "Race") \
-	GAMETYPE(MAPINFO_TYPE_CTS, "Race CTS") \
-	GAMETYPE(MAPINFO_TYPE_RUNEMATCH, "Runematch") \
-	GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH, "Team Deathmatch") \
-	/* 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;
@@ -74,9 +30,15 @@ entity makeXonoticGametypeList(void)
 }
 void XonoticGametypeList_configureXonoticGametypeList(entity me)
 {
-	me.loadCvars(me);
+	float i;
 	me.configureXonoticListBox(me);
 	me.nItems = GameType_GetCount();
+
+	// we want the pics mipmapped
+	for(i = 0; i < GameType_GetCount(); ++i)
+		draw_PreloadPictureWithFlags(GameType_GetIcon(i), PRECACHE_PIC_MIPMAP);
+
+	me.loadCvars(me);
 }
 void XonoticGametypeList_setSelected(entity me, float i)
 {
@@ -115,18 +77,28 @@ void XonoticGametypeList_saveCvars(entity me)
 void XonoticGametypeList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
 	string s;
+	
 	if(isSelected)
 		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+
+	draw_Picture(me.columnIconOrigin * eX, GameType_GetIcon(i), me.columnIconSize * eX + eY, '1 1 1', SKINALPHA_LISTBOX_SELECTED);
 	s = GameType_GetName(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);
+	draw_Text(me.realUpperMargin1 * eY + (me.columnNameOrigin + 0.5 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+	//s = GameType_GetTeams(i);
+	//draw_Text(me.realUpperMargin1 * eY + (me.columnNameOrigin + 1.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
 }
 void XonoticGametypeList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
+	me.itemAbsSize = '0 0 0';
 	SUPER(XonoticServerList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
-	me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight);
-	me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
-	me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
-	me.columnNameOrigin = 0;
-	me.columnNameSize = 1;
+	
+	me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight));
+	me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));
+	me.realUpperMargin1 = 0.5 * (1 - me.realFontSize_y);
+	me.realUpperMargin2 = me.realUpperMargin1 + me.realFontSize_y;
+	me.columnIconOrigin = 0;
+	me.columnIconSize = me.itemAbsSize_y / me.itemAbsSize_x;
+	me.columnNameOrigin = me.columnIconOrigin + me.columnIconSize;
+	me.columnNameSize = 1 - me.columnIconSize - 2 * me.realFontSize_x;
 }
 #endif