X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fgametypelist.qc;h=f04a0d23a60b39b7f6c8b060598e1bbd0ea75867;hp=feb1d89b133d2b4e040db7bd42d2828c500fc89f;hb=c741e6b3f012aa525f23e1df30d1d933b383fbc5;hpb=530e06120a7b41f6175b1144fedf6903da8c13b0

diff --git a/qcsrc/menu/xonotic/gametypelist.qc b/qcsrc/menu/xonotic/gametypelist.qc
index feb1d89b1..f04a0d23a 100644
--- a/qcsrc/menu/xonotic/gametypelist.qc
+++ b/qcsrc/menu/xonotic/gametypelist.qc
@@ -1,14 +1,17 @@
-#ifdef INTERFACE
-CLASS(XonoticGametypeList) EXTENDS(XonoticListBox)
-	METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity))
+#ifndef GAMETYPELIST_H
+#define GAMETYPELIST_H
+#include "listbox.qc"
+CLASS(XonoticGametypeList, XonoticListBox)
+	METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity));
 	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))
-	METHOD(XonoticGametypeList, clickListBoxItem, void(entity, float, vector))
+	METHOD(XonoticGametypeList, drawListBoxItem, void(entity, int, vector, bool, bool));
+	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));
+	METHOD(XonoticGametypeList, clickListBoxItem, void(entity, float, vector));
+	METHOD(XonoticGametypeList, focusedItemChangeNotify, void(entity));
 
 	ATTRIB(XonoticGametypeList, realFontSize, vector, '0 0 0')
 	ATTRIB(XonoticGametypeList, realUpperMargin, float, 0)
@@ -22,22 +25,23 @@ entity makeXonoticGametypeList();
 
 #ifdef IMPLEMENTATION
 
-entity makeXonoticGametypeList(void)
+entity makeXonoticGametypeList()
 {
 	entity me;
-	me = spawnXonoticGametypeList();
+	me = NEW(XonoticGametypeList);
 	me.configureXonoticGametypeList(me);
 	return me;
 }
 void XonoticGametypeList_configureXonoticGametypeList(entity 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);
+	if(SKINBOOL_GAMETYPELIST_ICON_BLUR)
+	{
+		for(int i = 0; i < GameType_GetCount(); ++i)
+			draw_PreloadPictureWithFlags(GameType_GetIcon(i), PRECACHE_PIC_MIPMAP);
+	}
 
 	me.loadCvars(me);
 }
@@ -67,19 +71,27 @@ void XonoticGametypeList_loadCvars(entity me)
 }
 void XonoticGametypeList_saveCvars(entity me)
 {
-	float t;
-	t = GameType_GetID(me.selectedItem);
-	if(t == MapInfo_CurrentGametype())
+	int t = GameType_GetID(me.selectedItem);
+	if (t == MapInfo_CurrentGametype()) {
 		return;
+	}
 	MapInfo_SwitchGameType(t);
-	me.parent.gameTypeChangeNotify(me.parent);
+	entity owner = me.parent;
+	if (owner) { // not set immediately
+		owner.gameTypeChangeNotify(owner);
+	}
 }
-void XonoticGametypeList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+void XonoticGametypeList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused)
 {
 	string s1, s2;
 
 	if(isSelected)
 		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+	else if(isFocused)
+	{
+		me.focusedItemAlpha = getFadedAlpha(me.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
+		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, me.focusedItemAlpha);
+	}
 
 	draw_Picture(me.columnIconOrigin * eX, GameType_GetIcon(i), me.columnIconSize * eX + eY, '1 1 1', SKINALPHA_LISTBOX_SELECTED);
 	s1 = GameType_GetName(i);
@@ -126,4 +138,11 @@ void XonoticGametypeList_clickListBoxItem(entity me, float i, vector where)
 {
 	m_play_click_sound(MENU_SOUND_SELECT);
 }
+void XonoticGametypeList_focusedItemChangeNotify(entity me)
+{
+	if(me.focusedItem >= 0)
+		setZonedTooltip(me, MapInfo_Type_Description(GameType_GetID(me.focusedItem)), string_null);
+	else
+		clearTooltip(me);
+}
 #endif