From: Samual <samual@xonotic.org>
Date: Sat, 14 Jan 2012 22:12:55 +0000 (-0500)
Subject: Get rid of the old waypoint dialog
X-Git-Tag: xonotic-v0.6.0~169
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=84d2d0a85c529383eb6210ebbbaf89b540a8d4f3;p=xonotic%2Fxonotic-data.pk3dir.git

Get rid of the old waypoint dialog
---

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index c0a978047..428a9020b 100644
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -81,7 +81,6 @@
 #include "xonotic/credits.c"
 #include "xonotic/dialog_multiplayer_playersetup_weapons.c"
 #include "xonotic/weaponslist.c"
-#include "xonotic/dialog_multiplayer_playersetup_waypoint.c"
 #include "xonotic/dialog_multiplayer_demo.c"
 #include "xonotic/demolist.c"
 #include "xonotic/colorpicker.c"
diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc
index e8cfba368..d83e7808e 100644
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -64,7 +64,6 @@ SKINBEGIN
 	SKINVECTOR(COLOR_DIALOG_SINGLEPLAYER, '1 1 0.7');
 	SKINVECTOR(COLOR_DIALOG_CREDITS, '0.7 0.7 1');
 	SKINVECTOR(COLOR_DIALOG_WEAPONS, '1 0.7 0.7');
-	SKINVECTOR(COLOR_DIALOG_WAYPOINTS, '0.7 0.7 1');
 	SKINVECTOR(COLOR_DIALOG_SERVERINFO, '0.7 0.7 1');
 	SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');
 
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
deleted file mode 100644
index 7ded2c505..000000000
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifdef INTERFACE
-CLASS(XonoticWaypointDialog) EXTENDS(XonoticDialog)
-	METHOD(XonoticWaypointDialog, fill, void(entity))
-	METHOD(XonoticWaypointDialog, showNotify, void(entity))
-	ATTRIB(XonoticWaypointDialog, title, string, _("Waypoints"))
-	ATTRIB(XonoticWaypointDialog, color, vector, SKINCOLOR_DIALOG_WAYPOINTS)
-	ATTRIB(XonoticWaypointDialog, intendedWidth, float, 0.5)
-	ATTRIB(XonoticWaypointDialog, rows, float, 5)
-	ATTRIB(XonoticWaypointDialog, columns, float, 3)
-ENDCLASS(XonoticWaypointDialog)
-#endif
-
-#ifdef IMPLEMENTATION
-void XonoticWaypointDialog_showNotify(entity me)
-{
-	loadAllCvars(me);
-}
-void XonoticWaypointDialog_fill(entity me)
-{
-	entity e;
-
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Show base waypoints")));
-	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Waypoint scale:")));
-			me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 1.5, 0.05, "g_waypointsprite_scale"));
-				setDependent(e, "cl_hidewaypoints", 0, 0);
-	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Waypoint alpha:")));
-			me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.05, "g_waypointsprite_alpha"));
-				setDependent(e, "cl_hidewaypoints", 0, 0);
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_shownames", _("Show names above players")));
-	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
-			e.onClick = Dialog_Close;
-			e.onClickEntity = me;
-}
-#endif
diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index 20627c7a5..15c9a2e0c 100644
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -9,7 +9,6 @@ CLASS(MainWindow) EXTENDS(ModalController)
 	ATTRIB(MainWindow, mapInfoDialog, entity, NULL)
 	ATTRIB(MainWindow, userbindEditDialog, entity, NULL)
 	ATTRIB(MainWindow, winnerDialog, entity, NULL)
-	ATTRIB(MainWindow, waypointDialog, entity, NULL)
 	ATTRIB(MainWindow, serverInfoDialog, entity, NULL)
 	ATTRIB(MainWindow, cvarsDialog, entity, NULL)
 	ATTRIB(MainWindow, mainNexposee, entity, NULL)
@@ -149,10 +148,6 @@ void MainWindow_configureMainWindow(entity me)
 	me.weaponsDialog = i = spawnXonoticWeaponsDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
-	me.waypointDialog = i = spawnXonoticWaypointDialog();
-	i.configureDialog(i);
-	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 	
 	me.serverInfoDialog = i = spawnXonoticServerInfoDialog();
 	i.configureDialog(i);
@@ -198,6 +193,7 @@ void MainWindow_configureMainWindow(entity me)
 		n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 		n.setNexposee(n, i, SKINPOSITION_DIALOG_QUIT, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
 		n.pullNexposee(n, i, eY * (SKINHEIGHT_TITLE * SKINFONTSIZE_TITLE / conheight));
+		
 	me.addItem(me, n, '0 0 0', '1 1 0', SKINALPHAS_MAINMENU_z);
 	me.moveItemAfter(me, n, NULL);