X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fmenu%2Fxonotic%2Fmainwindow.c;h=f9d86c2dd229276aadb7272c9484f165bb1ad606;hb=bfd3892eeb1401e14fc7da982f8b33d77d91384a;hp=9054bef6a778bf349cfa631cb8a80918bdf6230f;hpb=921b827d6b642f26b76b52d6f370ffe63ecd6723;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index 9054bef6a..f9d86c2dd 100644
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -12,6 +12,9 @@ CLASS(MainWindow) EXTENDS(ModalController)
 	ATTRIB(MainWindow, serverInfoDialog, entity, NULL)
 	ATTRIB(MainWindow, cvarsDialog, 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, mainNexposee, entity, NULL)
 	ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND)
@@ -43,18 +46,13 @@ void MainWindow_configureMainWindow(entity me)
 {
 	entity n, i;
 
+	// dialog run upon startup
 	me.firstRunDialog = i = spawnXonoticFirstRunDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
-	i = spawnXonoticTeamSelectDialog();
-	i.configureDialog(i);
-	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
-	i = spawnXonoticSandboxToolsDialog();
-	i.configureDialog(i);
-	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 	
+	
+	// hud_configure dialogs
 	i = spawnXonoticHUDExitDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
@@ -126,11 +124,35 @@ void MainWindow_configureMainWindow(entity me)
 	i = spawnXonoticHUDCenterprintDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
-	me.hudconfirmDialog = i = spawnXonoticHUDConfirmDialog();
+	
+	
+	// dialogs used by settings
+	me.userbindEditDialog = i = spawnXonoticUserbindEditDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
+	
+	me.cvarsDialog = i = spawnXonoticCvarsDialog();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+	
+	
+	// dialog used by singleplayer
+	me.winnerDialog = i = spawnXonoticWinnerDialog();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+	
+	
+	// dialog used by multiplayer/join
+	me.serverInfoDialog = i = spawnXonoticServerInfoDialog();
+	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();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+	
 	me.advancedDialog = i = spawnXonoticAdvancedDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
@@ -138,35 +160,47 @@ void MainWindow_configureMainWindow(entity me)
 	me.mutatorsDialog = i = spawnXonoticMutatorsDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+	
 
-	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.userbindEditDialog = i = spawnXonoticUserbindEditDialog();
+	
+	me.hudDialog = i = spawnXonoticHUDDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-	me.winnerDialog = i = spawnXonoticWinnerDialog();
+	me.hudconfirmDialog = i = spawnXonoticHUDConfirmDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
-	me.weaponsDialog = i = spawnXonoticWeaponsDialog();
+	
+	me.modelDialog = i = spawnXonoticModelDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 	
-	me.serverInfoDialog = i = spawnXonoticServerInfoDialog();
+	me.viewDialog = i = spawnXonoticViewDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 	
-	me.cvarsDialog = i = spawnXonoticCvarsDialog();
+	me.weaponsDialog = i = spawnXonoticWeaponsDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+	
 
-	me.viewDialog = i = spawnXonoticViewDialog();
+	// mutator dialogs
+	i = spawnXonoticSandboxToolsDialog();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z * SKINALPHA_DIALOG_SANDBOXTOOLS);
+	
+	
+	// miscellaneous dialogs
+	i = spawnXonoticTeamSelectDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 	
+	
+	// main dialogs/windows
 	me.mainNexposee = n = spawnXonoticNexposee();
 	/*
 		if(checkextension("DP_GECKO_SUPPORT"))