fixes #4777: warn about setting antialiasing to a value > 16, which can cause crashes

Forgon2100 · Forgon2100 · commit 6c143786c036 · 2018-05-17T21:39:29.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -10,6 +10,7 @@
    * Change: Factories being destroyed could cause annoying asserts. Now set to quiet warnings (commit:616f142c6a031fc36aceb05f8c40156c563225bb)
    * Change: Improved Windows installers (ticket:4748)
    * Change: Location of configuration directory (commit:54901bcd1672c9e22db35c66741ec2eda123b491)
+   * Change: Warn about setting antialiasing to a value > 16, which can cause crashes (ticket:4777)
    * Fix: Trying not to crash on loading unknown templates (commit:44a1e1085d4811a0ceeeac8406457098f190c4a3, ticket:4581)
    * Fix: Always show template designs (commit:20c70fd00a5f155a5ff465866841591e4a23946e, ticket:4440)
    * Fix: Do not desync when destroying droids with animations (commit:123ded59aedc53dc2344be9807c321774613946f)
diff --git a/src/frontend.cpp b/src/frontend.cpp
@@ -1135,6 +1135,12 @@ static bool startVideoOptionsMenu()
 	addTextButton(FRONTEND_FSAA, FRONTEND_POS5X - 35, FRONTEND_POS6Y, _("Antialiasing*"), WBUT_SECONDARY);
 	addTextButton(FRONTEND_FSAA_R, FRONTEND_POS5M - 55, FRONTEND_POS6Y, videoOptionsAntialiasingString(), WBUT_SECONDARY);
 
+	W_LABEL *antialiasing_label = new W_LABEL(parent);
+	antialiasing_label->setGeometry(FRONTEND_POS1X + 48, FRONTEND_POS1Y - 18, FRONTEND_BUTWIDTH - FRONTEND_POS1X - 48, FRONTEND_BUTHEIGHT);
+	antialiasing_label->setFontColour(WZCOL_YELLOW);
+	antialiasing_label->setString(_("Warning: Antialiasing can cause crashes, especially with values > 16"));
+	antialiasing_label->setTextAlignment(WLAB_ALIGNBOTTOMLEFT);
+
 	// Display Scale
 	if (wzAvailableDisplayScales().size() > 1)
 	{
diff --git a/src/warzoneconfig.cpp b/src/warzoneconfig.cpp
@@ -106,6 +106,10 @@ bool war_getFullscreen()
 
 void war_setAntialiasing(int antialiasing)
 {
+	if (antialiasing > 16)
+	{
+		debug(LOG_WARNING, "Antialising set to value > 16, which can cause crashes.");
+	}
 	warGlobs.antialiasing = antialiasing;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,10 @@ bool war_getFullscreen()`
`106`	`106`
`107`	`107`	`void war_setAntialiasing(int antialiasing)`
`108`	`108`	`{`
	`109`	`+ if (antialiasing > 16)`
	`110`	`+ {`
	`111`	`+ debug(LOG_WARNING, "Antialising set to value > 16, which can cause crashes.");`
	`112`	`+ }`
`109`	`113`	`warGlobs.antialiasing = antialiasing;`
`110`	`114`	`}`
`111`	`115`