X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fgametypelist.c;h=8883e8bbe4aff519e8c020d4295db2e227154a66;hb=935f38b6d41fb6e2579a4ee1e7c6fb0d063e5869;hp=cbc239946a70112b25f1818756dbf930b4c63a2a;hpb=1c2bdc1f0012349f80906e05902ce19bed35be16;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/gametypelist.c b/qcsrc/menu/xonotic/gametypelist.c
index cbc239946..8883e8bbe 100644
--- a/qcsrc/menu/xonotic/gametypelist.c
+++ b/qcsrc/menu/xonotic/gametypelist.c
@@ -1,15 +1,19 @@
 #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))
 	METHOD(XonoticGametypeList, loadCvars, void(entity))
 	METHOD(XonoticGametypeList, saveCvars, void(entity))
+	METHOD(XonoticGametypeList, keyDown, float(entity, float, float, float))
 
 	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)
@@ -27,9 +31,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)
 {
@@ -68,18 +78,39 @@ 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);
-	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);
+
+	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.realUpperMargin1 * eY + (me.columnNameOrigin + 0.5 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, SKINCOLOR_TEXT, 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, SKINCOLOR_TEXT, 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;
+}
+
+float XonoticGametypeList_keyDown(entity me, float scan, float ascii, float shift)
+{
+	if(scan == K_ENTER || scan == K_KP_ENTER)
+	{
+		me.parent.gameTypeSelectNotify(me.parent);
+		return 1;
+	}
+
+	return SUPER(XonoticGametypeList).keyDown(me, scan, ascii, shift);
 }
 #endif