[Scummvm-git-logs] scummvm master -> 71e5241b5072714577be4d2f434c412de4433930

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
71e5241b50 STARTREK: The demo does not contain bridge computer topics


Commit: 71e5241b5072714577be4d2f434c412de4433930
    https://github.com/scummvm/scummvm/commit/71e5241b5072714577be4d2f434c412de4433930
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-08-16T20:32:49+03:00

Commit Message:
STARTREK: The demo does not contain bridge computer topics

This allows the demo to proceed a bit further, but it still crashes,
as it has differences from the full version which haven't been
implemented yet

Changed paths:
    engines/startrek/awaymission.cpp
    engines/startrek/startrek.cpp


diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp
index a5af5ed9df..5e99cdd0c2 100644
--- a/engines/startrek/awaymission.cpp
+++ b/engines/startrek/awaymission.cpp
@@ -278,7 +278,8 @@ void StarTrekEngine::handleAwayMissionEvents() {
 				// Bridge computer, where the player can ask about various topics.
 				// ENHANCEMENT: Normally, this is only available when in the bridge.
 				// We also show it in missions.
-				handleBridgeComputer();
+				if (!(getFeatures() & GF_DEMO))
+					handleBridgeComputer();
 				break;
 
 			case Common::KEYCODE_p:
diff --git a/engines/startrek/startrek.cpp b/engines/startrek/startrek.cpp
index 95763695c8..4b84474b51 100644
--- a/engines/startrek/startrek.cpp
+++ b/engines/startrek/startrek.cpp
@@ -147,7 +147,9 @@ Common::Error StarTrekEngine::run() {
 
 	initGraphics(SCREEN_WIDTH, SCREEN_HEIGHT);
 	initializeEventsAndMouse();
-	loadBridgeComputerTopics();
+
+	if (!isDemo)
+		loadBridgeComputerTopics();
 
 	_gfx->setMouseBitmap(!isDemo ? "pushbtn" : "cursor");