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 d443e7b3d4074d747ab157ceb7cdf6346a099a52..3d36b47c1ed0e8a0bd12eba6e45bbc4450375b89 100644 (file)
--- 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 1f293da6d8fe3172dec1495ce3405e62ce08bc7f..052f05ef3b0a46419903eb480b571f946eb79856 100644 (file)
--- 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 fd12f69e4250aa25c6b6d0c261e441b6efcef576..461b05fd931e657f51eba7bd5914976116d68452 100644 (file)
--- 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);