Merge remote branch 'refs/remotes/origin/terencehill/dom_points'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / mainwindow.c

diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index 00da54b59e45aabec936b3fe48141f9dce0b9fea..72e5faac36fa62d140a0d52b95e55853b2b24252 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -25,7 +25,7 @@ void DemoButton_Click(entity me, entity other)
                me.setText(me, "Do not press this button again!");
 }
 
-void configureMainWindowMainWindow(entity me)
+void MainWindow_configureMainWindow(entity me)
 {
        entity n, i;
 
@@ -41,7 +41,7 @@ void configureMainWindowMainWindow(entity me)
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
        
-       i = spawnXonoticHUDInventoryDialog();
+       i = spawnXonoticHUDAmmoDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
        
@@ -85,7 +85,15 @@ void configureMainWindowMainWindow(entity me)
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
        
-       i = spawnXonoticHUDWeaponIconsDialog();
+       i = spawnXonoticHUDWeaponsDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
+       i = spawnXonoticHUDEngineInfoDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
+       i = spawnXonoticHUDInfoMessagesDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);