X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fmaplist.qc;h=5184ee1fd546a0f90ad3838462a57c005b7b4a9e;hb=3ac61b98c83be079c61cf525491d2028b2a889dc;hp=e06c3084c34a3696318be1661b0474ff79c46dba;hpb=0561d8c4a32b79f3d19e1af7716f6a49d297825e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/maplist.qc b/qcsrc/menu/xonotic/maplist.qc
index e06c3084c..5184ee1fd 100644
--- a/qcsrc/menu/xonotic/maplist.qc
+++ b/qcsrc/menu/xonotic/maplist.qc
@@ -1,74 +1,21 @@
-#ifdef INTERFACE
-CLASS(XonoticMapList) EXTENDS(XonoticListBox)
-	METHOD(XonoticMapList, configureXonoticMapList, void(entity))
-	ATTRIB(XonoticMapList, rowsPerItem, float, 4)
-	METHOD(XonoticMapList, draw, void(entity))
-	METHOD(XonoticMapList, drawListBoxItem, void(entity, float, vector, float))
-	METHOD(XonoticMapList, clickListBoxItem, void(entity, float, vector))
-	METHOD(XonoticMapList, doubleClickListBoxItem, void(entity, float, vector))
-	METHOD(XonoticMapList, resizeNotify, void(entity, vector, vector, vector, vector))
-	METHOD(XonoticMapList, refilter, void(entity))
-	METHOD(XonoticMapList, refilterCallback, void(entity, entity))
-	METHOD(XonoticMapList, keyDown, float(entity, float, float, float))
-
-	ATTRIB(XonoticMapList, realFontSize, vector, '0 0 0')
-	ATTRIB(XonoticMapList, columnPreviewOrigin, float, 0)
-	ATTRIB(XonoticMapList, columnPreviewSize, float, 0)
-	ATTRIB(XonoticMapList, columnNameOrigin, float, 0)
-	ATTRIB(XonoticMapList, columnNameSize, float, 0)
-	ATTRIB(XonoticMapList, checkMarkOrigin, vector, '0 0 0')
-	ATTRIB(XonoticMapList, checkMarkSize, vector, '0 0 0')
-	ATTRIB(XonoticMapList, realUpperMargin1, float, 0)
-	ATTRIB(XonoticMapList, realUpperMargin2, float, 0)
-
-	ATTRIB(XonoticMapList, lastGametype, float, 0)
-	ATTRIB(XonoticMapList, lastFeatures, float, 0)
-
-	ATTRIB(XonoticMapList, origin, vector, '0 0 0')
-	ATTRIB(XonoticMapList, itemAbsSize, vector, '0 0 0')
-
-	ATTRIB(XonoticMapList, g_maplistCache, string, string_null)
-	METHOD(XonoticMapList, g_maplistCacheToggle, void(entity, float))
-	METHOD(XonoticMapList, g_maplistCacheQuery, float(entity, float))
-
-	ATTRIB(XonoticMapList, stringFilter, string, string_null)
-	ATTRIB(XonoticMapList, stringFilterBox, entity, NULL)
-
-	ATTRIB(XonoticMapList, startButton, entity, NULL)
-
-	METHOD(XonoticMapList, loadCvars, void(entity))
-
-	ATTRIB(XonoticMapList, typeToSearchString, string, string_null)
-	ATTRIB(XonoticMapList, typeToSearchTime, float, 0)
-
-	METHOD(XonoticMapList, destroy, void(entity))
-
-	ATTRIB(XonoticListBox, alphaBG, float, 0)
-ENDCLASS(XonoticMapList)
-entity makeXonoticMapList();
-entity makeXonoticMapListStringFilterBox(entity me, float doEditColorCodes, string theCvar);
-void MapList_StringFilterBox_Change(entity box, entity me);
-float MapList_StringFilterBox_keyDown(entity me, float key, float ascii, float shift);
-void MapList_Add_Shown(entity btn, entity me);
-void MapList_Remove_Shown(entity btn, entity me);
-void MapList_Remove_All(entity btn, entity me);
-void MapList_LoadMap(entity btn, entity me);
-#endif
-
-#ifdef IMPLEMENTATION
+#include "maplist.qh"
+
+#include <common/mapinfo.qh>
+#include "dialog_multiplayer_create_mapinfo.qh"
+#include "mainwindow.qh"
+#include "inputbox.qh"
+
+.bool disabled;
+
 void XonoticMapList_destroy(entity me)
 {
 	MapInfo_Shutdown();
 }
 
-entity makeXonoticMapListStringFilterBox(entity me, float doEditColorCodes, string theCvar)
-{
-	return makeXonoticInputBox(doEditColorCodes, theCvar);
-}
 entity makeXonoticMapList()
 {
 	entity me;
-	me = spawnXonoticMapList();
+	me = NEW(XonoticMapList);
 	me.configureXonoticMapList(me);
 	return me;
 }
@@ -141,8 +88,10 @@ void XonoticMapList_resizeNotify(entity me, vector relOrigin, vector relSize, ve
 	me.itemAbsSize = '0 0 0';
 	SUPER(XonoticMapList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
-	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.itemAbsSize.y = absSize.y * me.itemHeight;
+	me.itemAbsSize.x = absSize.x * (1 - me.controlWidth);
+	me.realFontSize.y = me.fontSize / me.itemAbsSize.y;
+	me.realFontSize.x = me.fontSize / me.itemAbsSize.x;
 	me.realUpperMargin1 = 0.5 * (1 - 2.5 * me.realFontSize.y);
 	me.realUpperMargin2 = me.realUpperMargin1 + 1.5 * me.realFontSize.y;
 
@@ -177,7 +126,7 @@ void XonoticMapList_doubleClickListBoxItem(entity me, float i, vector where)
 		}
 }
 
-void XonoticMapList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+void XonoticMapList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused)
 {
 	// layout: Ping, Map name, Map name, NP, TP, MP
 	string s;
@@ -195,8 +144,16 @@ void XonoticMapList_drawListBoxItem(entity me, float i, vector absSize, float is
 
 	if(isSelected)
 		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
-	else if(included)
-		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_MAPLIST_INCLUDEDBG, SKINALPHA_MAPLIST_INCLUDEDBG);
+	else
+	{
+		if(included)
+			draw_Fill('0 0 0', '1 1 0', SKINCOLOR_MAPLIST_INCLUDEDBG, SKINALPHA_MAPLIST_INCLUDEDBG);
+		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);
+		}
+	}
 
 	if(draw_PictureSize(strcat("/maps/", MapInfo_Map_bspname)) == '0 0 0')
 		draw_Picture(me.columnPreviewOrigin * eX, "nopreview_map", me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);
@@ -217,9 +174,8 @@ void XonoticMapList_refilter(entity me)
 {
 	float i, j, n;
 	string s;
-	float gt, f;
-	gt = MapInfo_CurrentGametype();
-	f = MapInfo_CurrentFeatures();
+	Gametype gt = MapInfo_CurrentGametype();
+	int f = MapInfo_CurrentFeatures();
 	MapInfo_FilterGametype(gt, f, MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
 	if (me.stringFilter)
 		MapInfo_FilterString(me.stringFilter);
@@ -227,8 +183,6 @@ void XonoticMapList_refilter(entity me)
 
 	for(i = 0; i < MapInfo_count; ++i)
 		draw_PreloadPicture(strcat("/maps/", MapInfo_BSPName_ByID(i)));
-	if(me.g_maplistCache)
-		strunzone(me.g_maplistCache);
 	s = "0";
 	for(i = 1; i < MapInfo_count; i *= 2)
 		s = strcat(s, s);
@@ -237,13 +191,17 @@ void XonoticMapList_refilter(entity me)
 	{
 		j = MapInfo_FindName(argv(i));
 		if(j >= 0)
-			s = strcat(
-				substring(s, 0, j),
-				"1",
-				substring(s, j+1, MapInfo_count - (j+1))
-			);
+		{
+			// double check that the two mapnames are "identical", not just share the same prefix
+			if (strlen(MapInfo_BSPName_ByID(j)) == strlen(argv(i)))
+				s = strcat(
+					substring(s, 0, j),
+					"1",
+					substring(s, j+1, MapInfo_count - (j+1))
+				);
+		}
 	}
-	me.g_maplistCache = strzone(s);
+	strcpy(me.g_maplistCache, s);
 	if(gt != me.lastGametype || f != me.lastFeatures)
 	{
 		me.lastGametype = gt;
@@ -259,13 +217,10 @@ void XonoticMapList_refilterCallback(entity me, entity cb)
 
 void MapList_StringFilterBox_Change(entity box, entity me)
 {
-	if(me.stringFilter)
-		strunzone(me.stringFilter);
+	strfree(me.stringFilter);
 	if(box.text != "")
 		me.stringFilter = strzone(box.text);
-	else
-		me.stringFilter = string_null;
-	
+
 	me.refilter(me);
 }
 
@@ -293,6 +248,18 @@ void MapList_Remove_Shown(entity btn, entity me)
 	me.refilter(me);
 }
 
+void MapList_Add_All(entity btn, entity me)
+{
+	float i;
+	string s;
+	_MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, MapInfo_ForbiddenFlags(), 0); // all
+	s = "";
+	for(i = 0; i < MapInfo_count; ++i)
+		s = strcat(s, " ", MapInfo_BSPName_ByID(i));
+	cvar_set("g_maplist", substring(s, 1, strlen(s) - 1));
+	me.refilter(me);
+}
+
 void MapList_Remove_All(entity btn, entity me)
 {
 	cvar_set("g_maplist", "");
@@ -318,7 +285,7 @@ void MapList_LoadMap(entity btn, entity me)
 	m = MapInfo_BSPName_ByID(i);
 	if (!m)
 	{
-		print(_("Huh? Can't play this (m is NULL). Refiltering so this won't happen again.\n"));
+		LOG_INFO(_("Huh? Can't play this (m is NULL). Refiltering so this won't happen again."));
 		me.refilter(me);
 		return;
 	}
@@ -331,7 +298,7 @@ void MapList_LoadMap(entity btn, entity me)
 	}
 	else
 	{
-		print(_("Huh? Can't play this (invalid game type). Refiltering so this won't happen again.\n"));
+		LOG_INFO(_("Huh? Can't play this (invalid game type). Refiltering so this won't happen again."));
 		me.refilter(me);
 		return;
 	}
@@ -375,9 +342,7 @@ float XonoticMapList_keyDown(entity me, float scan, float ascii, float shift)
 		if(time < me.typeToSearchTime)
 		{
 			save = substring(me.typeToSearchString, 0, strlen(me.typeToSearchString) - 1);
-			if(me.typeToSearchString)
-				strunzone(me.typeToSearchString);
-			me.typeToSearchString = strzone(save);
+			strcpy(me.typeToSearchString, save);
 			me.typeToSearchTime = time + 0.5;
 			if(strlen(me.typeToSearchString))
 			{
@@ -394,9 +359,7 @@ float XonoticMapList_keyDown(entity me, float scan, float ascii, float shift)
 			save = ch;
 		else
 			save = strcat(me.typeToSearchString, ch);
-		if(me.typeToSearchString)
-			strunzone(me.typeToSearchString);
-		me.typeToSearchString = strzone(save);
+		strcpy(me.typeToSearchString, save);
 		me.typeToSearchTime = time + 0.5;
 		MapInfo_FindName(me.typeToSearchString);
 		if(MapInfo_FindName_firstResult >= 0)
@@ -436,4 +399,3 @@ float MapList_StringFilterBox_keyDown(entity me, float scan, float ascii, float
 	}
 	return SUPER(XonoticInputBox).keyDown(me, scan, ascii, shift);
 }
-#endif