From 91732239991918b25633cd07d6c5ae834e599115 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 18 Oct 2018 22:25:21 +0100
Subject: SCI: Fix Segfault When Using Console "show_map" Command on SCI32
 games.

The _gfxScreen instance is nullptr for SCI32 games, thus this console
command previously caused a segfault.
---
 engines/sci/console.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 371ed7fc71..91c5d01e87 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -2568,6 +2568,13 @@ bool Console::cmdShowMap(int argc, const char **argv) {
 		return true;
 	}
 
+#ifdef ENABLE_SCI32
+	if (getSciVersion() >= SCI_VERSION_2) {
+		debugPrintf("Command not available / implemented for SCI32 games.\n");
+		return true;
+	}
+#endif
+
 	int map = atoi(argv[1]);
 
 	switch (map) {
@@ -2575,7 +2582,9 @@ bool Console::cmdShowMap(int argc, const char **argv) {
 	case 1:
 	case 2:
 	case 3:
-		_engine->_gfxScreen->debugShowMap(map);
+		if (_engine->_gfxScreen) {
+			_engine->_gfxScreen->debugShowMap(map);
+		}
 		break;
 
 	default:
-- 
cgit v1.2.3