From: Samual <samual@xonotic.org>
Date: Tue, 17 Jan 2012 04:01:18 +0000 (-0500)
Subject: Decolorize author and title name of maps in the maplist, better layout for demos... 
X-Git-Tag: xonotic-v0.6.0~148
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=32b87a8dd28a8ef1d397780fd8930c22a5cf605e;p=xonotic%2Fxonotic-data.pk3dir.git

Decolorize author and title name of maps in the maplist, better layout for demos tab, and fix and issue with v_idlescale
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 7ad286476..d4b2fb86f 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1452,6 +1452,7 @@ seta r_subdivisions_tolerance $r_subdivisions_tolerance
 seta vid_gl20 $vid_gl20
 seta vid_gl13 $vid_gl13
 seta r_drawviewmodel $r_drawviewmodel
+seta v_idlescale $v_idlescale
 
 // ticrate
 //sys_ticrate 0.0166667
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.c b/qcsrc/menu/xonotic/dialog_multiplayer_create.c
index 6fee70f6e..f86a18678 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.c
@@ -33,8 +33,7 @@ void XonoticServerCreateTab_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Game type:")));
 	me.TR(me);
-		me.TD(me, 9, 3, e = makeXonoticGametypeList());
-	me.TR(me);
+		me.TD(me, 8, 3, e = makeXonoticGametypeList());
 	me.TR(me);
 	me.TR(me);
 	me.TR(me);
@@ -67,8 +66,7 @@ void XonoticServerCreateTab_fill(entity me)
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Number of bots:")));
 		me.TD(me, 1, 2, makeXonoticSlider(0, 9, 1, "bot_number"));
 	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Bot skill:")));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Bot skill:")));
 			setDependent(e, "bot_number", 0, -1);
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("skill"));
 			e.addValue(e, _("Botlike"), "0");
@@ -84,6 +82,7 @@ void XonoticServerCreateTab_fill(entity me)
 			e.addValue(e, _("Godlike"), "10");
 			e.configureXonoticTextSliderValues(e);
 			setDependent(e, "bot_number", 0, -1);
+	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticButton(_("Mutators..."), '0 0 0'));
 			e.onClick = DialogOpenButton_Click;
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
index 169e9734b..8e4bc5a23 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
@@ -43,8 +43,8 @@ void XonoticMapInfoDialog_loadMapInfo(entity me, float i, entity mlb)
 		strunzone(me.currentMapFeaturesText);
 	}
 	me.currentMapBSPName = strzone(MapInfo_Map_bspname);
-	me.currentMapTitle = strzone(MapInfo_Map_title);
-	me.currentMapAuthor = strzone(MapInfo_Map_author);
+	me.currentMapTitle = strzone(strdecolorize(MapInfo_Map_title));
+	me.currentMapAuthor = strzone(strdecolorize(MapInfo_Map_author));
 	me.currentMapDescription = strzone(MapInfo_Map_description);
 	me.currentMapFeaturesText = strzone((MapInfo_Map_supportedFeatures & MAPINFO_FEATURE_WEAPONS) ? _("Full item placement") : _("MinstaGib only"));
 	me.currentMapPreviewImage = strzone(strcat("/maps/", MapInfo_Map_bspname));
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_demo.c b/qcsrc/menu/xonotic/dialog_multiplayer_demo.c
index 99f5a179b..be0ba2679 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_demo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_demo.c
@@ -4,7 +4,7 @@ CLASS(XonoticDemoBrowserTab) EXTENDS(XonoticTab)
 	ATTRIB(XonoticDemoBrowserTab, title, string, _("Demo"))
 	ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9)
 	ATTRIB(XonoticDemoBrowserTab, rows, float, 22)
-	ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5)
+	ATTRIB(XonoticDemoBrowserTab, columns, float, 4)
 	ATTRIB(XonoticDemoBrowserTab, name, string, "DemoBroswer")	
 ENDCLASS(XonoticDemoBrowserTab)
 entity makeXonoticDemoBrowserTab();
@@ -24,21 +24,23 @@ void XonoticDemoBrowserTab_fill(entity me)
 	entity btn;
 	entity dlist;
 
-	me.TR(me);
-		me.TD(me, 1, me.columns, e = makeXonoticCheckBox(0, "cl_autodemo", _("Record demos while playing")));
-	me.TR(me);
-	dlist = makeXonoticDemoList();
 	me.TR(me);
 		me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, _("Filter:")));
 		me.TD(me, 1, 0.5, btn = makeXonoticButton(_("Clear"), '0 0 0'));
-			btn.onClick = InputBox_Clear_Click;
-		me.TD(me, 1, me.columns - 1, e = makeXonoticInputBox(0, string_null));
+			btn.onClick = InputBox_Clear_Click;	
+		me.TD(me, 1, 3, e = makeXonoticInputBox(0, string_null));
+			dlist = makeXonoticDemoList();
 			e.onChange = DemoList_Filter_Change;
 			e.onChangeEntity = dlist;
 			btn.onClickEntity = e;
 			dlist.controlledTextbox = e;
+			
 	me.TR(me);
 		me.TD(me, me.rows - 4, me.columns, dlist);
+
+	me.gotoRC(me, me.rows - 3, 0);
+			me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "cl_autodemo", _("Automatically record demos while playing")));
+		
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns / 2, e = makeXonoticButton(_("Timedemo"), '0 0 0'));
 			e.onClick = TimeDemo_Click;
diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c
index 14bf48ec9..54b9554a8 100644
--- a/qcsrc/menu/xonotic/maplist.c
+++ b/qcsrc/menu/xonotic/maplist.c
@@ -193,9 +193,9 @@ void XonoticMapList_drawListBoxItem(entity me, float i, vector absSize, float is
 
 	if(included)
 		draw_Picture(me.checkMarkOrigin, "checkmark", me.checkMarkSize, '1 1 1', 1);
-	s = draw_TextShortenToWidth(MapInfo_Map_titlestring, me.columnNameSize, 0, me.realFontSize);
+	s = draw_TextShortenToWidth(strdecolorize(MapInfo_Map_titlestring), me.columnNameSize, 0, me.realFontSize);
 	draw_Text(me.realUpperMargin1 * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, SKINCOLOR_MAPLIST_TITLE, theAlpha, 0);
-	s = draw_TextShortenToWidth(MapInfo_Map_author, me.columnNameSize, 0,  me.realFontSize);
+	s = draw_TextShortenToWidth(strdecolorize(MapInfo_Map_author), me.columnNameSize, 0,  me.realFontSize);
 	draw_Text(me.realUpperMargin2 * eY + (me.columnNameOrigin + 1.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, SKINCOLOR_MAPLIST_AUTHOR, theAlpha, 0);
 
 	MapInfo_ClearTemps();