@@ -109,7 +109,7 @@ Game::Game(const std::string &title) : _screen(0), _cursor(0), _lang(0), _states
 	SDL_EnableUNICODE(1);
 
 	// Create display
-	int bpp = 	Options::getBool("useHQXFilter") ? 32 : 8;
+	int bpp = Screen::isHQXEnabled() ? 32 : 8;
 	_screen = new Screen(Options::getInt("displayWidth"), Options::getInt("displayHeight"), bpp, Options::getBool("fullscreen"));
 
 	// Create cursor
 
@@ -336,4 +336,24 @@ void Screen::screenshot(const std::string &filename) const
 	}
 }
 
+
+/** Check whether useHQXFilter is set in Options and a compatible resolution
+ *  has been selected.
+ */
+bool Screen::isHQXEnabled()
+{
+	int w = Options::getInt("displayWidth");
+	int h = Options::getInt("displayHeight");
+
+	if (Options::getBool("useHQXFilter") && (
+		(w == Screen::BASE_WIDTH * 2 && h == Screen::BASE_HEIGHT * 2) || 
+		(w == Screen::BASE_WIDTH * 3 && h == Screen::BASE_HEIGHT * 3) || 
+		(w == Screen::BASE_WIDTH * 4 && h == Screen::BASE_HEIGHT * 4)))
+	{
+		return true;
+	}
+
+	return false;
+}
+
 }
@@ -82,6 +82,8 @@ class Screen
 	double getYScale() const;
 	/// Takes a screenshot.
 	void screenshot(const std::string &filename) const;
+	/// Checks whether HQX is requested and works for the selected resolution
+	static bool isHQXEnabled();
 };
 
 }
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ class Screen`
`82`	`82`	`double getYScale() const;`
`83`	`83`	`/// Takes a screenshot.`
`84`	`84`	`void screenshot(const std::string &filename) const;`
	`85`	`+ /// Checks whether HQX is requested and works for the selected resolution`
	`86`	`+ static bool isHQXEnabled();`
`85`	`87`	`};`
`86`	`88`
`87`	`89`	`}`