fixes #4692: new configuration option quitConfirmation can skip confi…

…rmation dialogue after pressing in-game option buttons "Quit" or "Host Quit" (patch 2/2)
Warzone2100 · Jan 6, 2018 · 2e2c2a8 · 2e2c2a8
1 parent 3c27440
commit 2e2c2a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/configuration.cpp b/src/configuration.cpp
@@ -37,6 +37,7 @@
 #include "configuration.h"
 #include "difficulty.h"
 #include "display3d.h"
+#include "ingameop.h"
 #include "multiint.h"
 #include "multiplay.h"
 #include "radar.h"
@@ -99,6 +100,7 @@ bool loadConfig()
 	setMiddleClickRotate(ini.value("MiddleClickRotate", false).toBool());
 	rotateRadar = ini.value("rotateRadar", true).toBool();
 	radarRotationArrow = ini.value("radarRotationArrow", true).toBool();
+	quitConfirmation = ini.value("quitConfirmation", true).toBool();
 	war_SetPauseOnFocusLoss(ini.value("PauseOnFocusLoss", false).toBool());
 	NETsetMasterserverName(ini.value("masterserver_name", "lobby.wz2100.net").toString().toUtf8().constData());
 	iV_font(ini.value("fontname", "DejaVu Sans").toString().toUtf8().constData(),
@@ -222,6 +224,7 @@ bool saveConfig()
 	ini.setValue("UPnP", (SDWORD)NetPlay.isUPNP);
 	ini.setValue("rotateRadar", rotateRadar);
 	ini.setValue("radarRotationArrow", radarRotationArrow);
+	ini.setValue("quitConfirmation", quitConfirmation);
 	ini.setValue("PauseOnFocusLoss", war_GetPauseOnFocusLoss());
 	ini.setValue("masterserver_name", NETgetMasterserverName());
 	ini.setValue("masterserver_port", NETgetMasterserverPort());

diff --git a/src/ingameop.cpp b/src/ingameop.cpp
@@ -53,6 +53,7 @@
 #include "main.h"
 #include "warzoneconfig.h"
 
+bool quitConfirmation;
 
 bool	InGameOpUp		= false;
 bool 	isInGamePopupUp = false;
@@ -207,11 +208,11 @@ static bool _intAddInGameOptions()
 	// add 'quit' text
 	if (NetPlay.isHost && bMultiPlayer && NetPlay.bComms)
 	{
-		addIGTextButton(INTINGAMEOP_QUIT , INTINGAMEOP_1_X, s ? INTINGAMEOP_3_Y : INTINGAMEOP_5_Y, INTINGAMEOP_OP_W, _("Host Quit"), OPALIGN);
+		addIGTextButton(quitConfirmation ? INTINGAMEOP_QUIT : INTINGAMEOP_QUIT_CONFIRM, INTINGAMEOP_1_X, s ? INTINGAMEOP_3_Y : INTINGAMEOP_5_Y, INTINGAMEOP_OP_W, _("Host Quit"), OPALIGN);
 	}
 	else
 	{
-		addIGTextButton(INTINGAMEOP_QUIT, INTINGAMEOP_1_X, s ? INTINGAMEOP_3_Y : INTINGAMEOP_5_Y, INTINGAMEOP_OP_W, _("Quit"), OPALIGN);
+		addIGTextButton(quitConfirmation ? INTINGAMEOP_QUIT : INTINGAMEOP_QUIT_CONFIRM, INTINGAMEOP_1_X, s ? INTINGAMEOP_3_Y : INTINGAMEOP_5_Y, INTINGAMEOP_OP_W, _("Quit"), OPALIGN);
 	}
 
 	// add 'resume'

diff --git a/src/ingameop.h b/src/ingameop.h
@@ -32,6 +32,8 @@ bool intRunInGameOptions();
 void intProcessInGameOptions(UDWORD);
 void intAddInGamePopup();
 
+extern bool quitConfirmation;
+
 // status bools.
 extern bool	InGameOpUp;
 extern bool isInGamePopupUp;