3 files changed, 14 insertions, 11 deletions
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 0779c4becd..65e6df0e7d 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -22,16 +22,7 @@
 
 namespace Sci {
 
-#define GAMEOPTION_PREFER_DIGITAL_SFX       GUIO_GAMEOPTIONS1
-#define GAMEOPTION_ORIGINAL_SAVELOAD        GUIO_GAMEOPTIONS2
-#define GAMEOPTION_FB01_MIDI                GUIO_GAMEOPTIONS3
-#define GAMEOPTION_JONES_CDAUDIO            GUIO_GAMEOPTIONS4
-#define GAMEOPTION_KQ6_WINDOWS_CURSORS      GUIO_GAMEOPTIONS5
-#define GAMEOPTION_SQ4_SILVER_CURSORS       GUIO_GAMEOPTIONS6
-#define GAMEOPTION_EGA_UNDITHER             GUIO_GAMEOPTIONS7
-// HIGH_RESOLUTION_GRAPHICS availability is checked for in SciEngine::run()
-#define GAMEOPTION_HIGH_RESOLUTION_GRAPHICS GUIO_GAMEOPTIONS8
-#define GAMEOPTION_ENABLE_BLACK_LINED_VIDEO GUIO_GAMEOPTIONS9
+#include "sci/sci.h"
 
 // SCI3 games have a different script format (in CSC files) and are currently unsupported
 #define ENABLE_SCI3_GAMES
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 1e8eca9a67..9ec8035701 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -252,7 +252,7 @@ Common::Error SciEngine::run() {
 	//  - Police Quest 4 CD
 	// TODO: Check, if Gabriel Knight 1 floppy supports high resolution
 	// TODO: Check, if Gabriel Knight 1 on Mac supports high resolution
-	if (Common::checkGameGUIOption(GUIO_GAMEOPTIONS8, ConfMan.get("guioptions"))) {
+	if (Common::checkGameGUIOption(GAMEOPTION_HIGH_RESOLUTION_GRAPHICS, ConfMan.get("guioptions"))) {
 		// GAMEOPTION_HIGH_RESOLUTION_GRAPHICS is available for the currently detected game,
 		// so read the user option now.
 		// We need to do this, because the option's default is "true", but we don't want "true"
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index a42095259b..0425d21564 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -45,6 +45,18 @@ struct ADGameDescription;
  */
 namespace Sci {
 
+// GUI-options, primarily used by detection_tables.h
+#define GAMEOPTION_PREFER_DIGITAL_SFX       GUIO_GAMEOPTIONS1
+#define GAMEOPTION_ORIGINAL_SAVELOAD        GUIO_GAMEOPTIONS2
+#define GAMEOPTION_FB01_MIDI                GUIO_GAMEOPTIONS3
+#define GAMEOPTION_JONES_CDAUDIO            GUIO_GAMEOPTIONS4
+#define GAMEOPTION_KQ6_WINDOWS_CURSORS      GUIO_GAMEOPTIONS5
+#define GAMEOPTION_SQ4_SILVER_CURSORS       GUIO_GAMEOPTIONS6
+#define GAMEOPTION_EGA_UNDITHER             GUIO_GAMEOPTIONS7
+// HIGH_RESOLUTION_GRAPHICS availability is checked for in SciEngine::run()
+#define GAMEOPTION_HIGH_RESOLUTION_GRAPHICS GUIO_GAMEOPTIONS8
+#define GAMEOPTION_ENABLE_BLACK_LINED_VIDEO GUIO_GAMEOPTIONS9
+
 struct EngineState;
 class Vocabulary;
 class ResourceManager;