From: Debugger <pyngot@hotmail.com>
Date: Thu, 1 Aug 2013 15:17:30 +0000 (+0200)
Subject: seperated file works properly now; moved 'Player Statistics' Label to the mid
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~154^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d38223a9d4dd4be423148b1ec78d7a9c5b8543e3;p=xonotic%2Fxonotic-data.pk3dir.git

seperated file works properly now; moved 'Player Statistics' Label to the mid
---

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index d443e7b3d..3d36b47c1 100644
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -111,3 +111,4 @@
 #include "xonotic/dialog_hudpanel_physics.c"
 #include "xonotic/dialog_hudpanel_centerprint.c"
 #include "xonotic/slider_picmip.c"
+#include "xonotic/dialog_multiplayer_playersetup_notification.c"
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 1f293da6d..052f05ef3 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -58,7 +58,8 @@ void XonoticPlayerSettingsTab_fill(entity me)
 	
 	// Statistic Stuff -Debugger
 	me.TR(me);
-	me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Player Statistics:")));
+	me.TDempty(me, 0.5);
+	me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Player Statistics:")));
 	me.TR(me);
 	me.TR(me);
 	me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Join time:")));
diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index fd12f69e4..461b05fd9 100644
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -19,7 +19,7 @@ CLASS(MainWindow) EXTENDS(ModalController)
 	ATTRIB(MainWindow, mainNexposee, entity, NULL)
 	ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND)
 	ATTRIB(MainWindow, dialogToShow, entity, NULL)
-	ATTRIB(MainWindow, notification, entity, NULL)
+	ATTRIB(MainWindow, notificationDialog, entity, NULL)
 ENDCLASS(MainWindow)
 #endif
 
@@ -188,7 +188,7 @@ void MainWindow_configureMainWindow(entity me)
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 	
-	me.notificationDialog = i spawnXonoticNotificationDialog();
+	me.notificationDialog = i = spawnXonoticNotificationDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);