X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fmainwindow.c;h=dcc4a8a81729e440fbf042ddc448d4f16a83cbb2;hp=ef98fbd1957765402499c7fe1d4da20d463cf943;hb=b4613e5904114aaa84c02bf0811b8581e7e5f4c6;hpb=3f6354bf7f3019a80e13ca7536b9300226dd86fb

diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index ef98fbd195..dcc4a8a817 100644
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -5,19 +5,21 @@ CLASS(MainWindow) EXTENDS(ModalController)
 	ATTRIB(MainWindow, firstRunDialog, entity, NULL)
 	ATTRIB(MainWindow, advancedDialog, entity, NULL)
 	ATTRIB(MainWindow, mutatorsDialog, entity, NULL)
+	ATTRIB(MainWindow, weaponsDialog, entity, NULL)
 	ATTRIB(MainWindow, mapInfoDialog, entity, NULL)
 	ATTRIB(MainWindow, userbindEditDialog, entity, NULL)
 	ATTRIB(MainWindow, winnerDialog, entity, NULL)
 	ATTRIB(MainWindow, serverInfoDialog, entity, NULL)
 	ATTRIB(MainWindow, cvarsDialog, entity, NULL)
-	ATTRIB(MainWindow, screenshotViewerDialog, entity, NULL)
 	ATTRIB(MainWindow, viewDialog, entity, NULL)
+	ATTRIB(MainWindow, modelDialog, entity, NULL)
+	ATTRIB(MainWindow, crosshairDialog, entity, NULL)
+	ATTRIB(MainWindow, hudDialog, entity, NULL)
 	ATTRIB(MainWindow, hudconfirmDialog, entity, NULL)
+	ATTRIB(MainWindow, languageWarningDialog, entity, NULL)
 	ATTRIB(MainWindow, mainNexposee, entity, NULL)
 	ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND)
 	ATTRIB(MainWindow, dialogToShow, entity, NULL)
-	ATTRIB(MainWindow, demostartconfirmDialog, entity, NULL)
-	ATTRIB(MainWindow, demotimeconfirmDialog, entity, NULL)
 ENDCLASS(MainWindow)
 #endif
 
@@ -115,16 +117,16 @@ void MainWindow_configureMainWindow(entity me)
 	i = spawnXonoticHUDInfoMessagesDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-	
+
 	i = spawnXonoticHUDPhysicsDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-	
-	me.screenshotViewerDialog = i = spawnXonoticScreenshotViewerDialog();
+
+	i = spawnXonoticHUDCenterprintDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-	i = spawnXonoticHUDCenterprintDialog();
+	i = spawnXonoticHUDBuffsDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
@@ -138,7 +140,7 @@ void MainWindow_configureMainWindow(entity me)
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-	me.hudconfirmDialog = i = spawnXonoticHUDConfirmDialog();
+	me.languageWarningDialog = i = spawnXonoticLanguageWarningDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
@@ -153,25 +155,48 @@ void MainWindow_configureMainWindow(entity me)
 	me.serverInfoDialog = i = spawnXonoticServerInfoDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-	
-	me.demostartconfirmDialog = i = spawnXonoticDemoStartConfirmDialog();
+
+
+	// dialogs used by multiplayer/create
+	me.mapInfoDialog = i = spawnXonoticMapInfoDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-	me.demotimeconfirmDialog = i = spawnXonoticDemoTimeConfirmDialog();
+	me.advancedDialog = i = spawnXonoticAdvancedDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
+	me.mutatorsDialog = i = spawnXonoticMutatorsDialog();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-	// dialogs used by multiplayer/create
-	me.mapInfoDialog = i = spawnXonoticMapInfoDialog();
+
+	// dialogs used by multiplayer/player setup
+	me.crosshairDialog = i = spawnXonoticCrosshairDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-	me.mutatorsDialog = i = spawnXonoticMutatorsDialog();
+	me.hudDialog = i = spawnXonoticHUDDialog();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
+	me.hudconfirmDialog = i = spawnXonoticHUDConfirmDialog();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
+	me.modelDialog = i = spawnXonoticModelDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
+	me.viewDialog = i = spawnXonoticViewDialog();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
+	me.weaponsDialog = i = spawnXonoticWeaponsDialog();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
+
 	// mutator dialogs
 	i = spawnXonoticSandboxToolsDialog();
 	i.configureDialog(i);
@@ -231,7 +256,7 @@ void MainWindow_configureMainWindow(entity me)
 
 	me.initializeDialog(me, n);
 
-	if(cvar_string("_cl_name") == "Player")
+	if(cvar_string("_cl_name") == cvar_defstring("_cl_name"))
 		me.dialogToShow = me.firstRunDialog;
 }
 #endif