X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fmainwindow.qc;h=4aa974835a58da15959f2d79e5b7be34d9324e0d;hb=19bd3a4f5fb820b95204b9cd1035f0b5e7a2deb8;hp=89a61fb0d89d2fff669177c4245b5c738d0aad4c;hpb=831988227f322b586569c1d65b5c4a14e1714aa4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc
index 89a61fb0d..4aa974835 100644
--- a/qcsrc/menu/xonotic/mainwindow.qc
+++ b/qcsrc/menu/xonotic/mainwindow.qc
@@ -4,6 +4,7 @@
 
 #include "nexposee.qh"
 #include "inputbox.qh"
+#include "dialog_termsofservice.qh"
 #include "dialog_firstrun.qh"
 #include "dialog_hudsetup_exit.qh"
 #include "dialog_hudpanel_notification.qh"
@@ -58,10 +59,13 @@ void MainWindow_draw(entity me)
 {
 	SUPER(MainWindow).draw(me);
 
-	if(me.dialogToShow)
-	{
-		DialogOpenButton_Click_withCoords(NULL, me.dialogToShow, '0 0 0', eX * conwidth + eY * conheight);
-		me.dialogToShow = NULL;
+	if (me.firstDraw) {
+		if (me.ToSDialog.shouldShow())
+			DialogOpenButton_Click_withCoords(NULL, me.ToSDialog, '0 0 0', eX * conwidth + eY * conheight);
+		else if(me.firstRunDialog.shouldShow())
+			DialogOpenButton_Click_withCoords(NULL, me.firstRunDialog, '0 0 0', eX * conwidth + eY * conheight);
+		
+		me.firstDraw = false;
 	}
 
 	//-------------------------------------
@@ -104,6 +108,11 @@ void MainWindow_configureMainWindow(entity me)
 {
 	entity n, i;
 
+	// terms of service dialog
+	me.ToSDialog = i = NEW(XonoticToSDialog);
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
 	// dialog run upon startup
 	me.firstRunDialog = i = NEW(XonoticFirstRunDialog);
 	i.configureDialog(i);
@@ -281,7 +290,7 @@ void MainWindow_configureMainWindow(entity me)
 
 	// main dialogs/windows
 	me.mainNexposee = n = NEW(XonoticNexposee);
-	
+
 	/*
 		if(checkextension("DP_GECKO_SUPPORT"))
 		{
@@ -291,7 +300,7 @@ void MainWindow_configureMainWindow(entity me)
 			n.setNexposee(n, i, '0.1 0.1 0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
 		}
 	*/
-	
+
 		i = NEW(XonoticSingleplayerDialog);
 		i.configureDialog(i);
 		n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
@@ -332,7 +341,4 @@ void MainWindow_configureMainWindow(entity me)
 
 	me.initializeDialog(me, n);
 	me.disconnectDialogVisibility = 1;
-
-	if(cvar_string("_cl_name") == cvar_defstring("_cl_name"))
-		me.dialogToShow = me.firstRunDialog;
 }