[Scummvm-git-logs] scummvm master -> c7804e96a882248eb5faaccd867d2c883f9cd112

[joostp]

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:
c7804e96a8 ICB: ELDORADO: fix regression in fn_request_speech, add commented out code to be enabled later


Commit: c7804e96a882248eb5faaccd867d2c883f9cd112
    https://github.com/scummvm/scummvm/commit/c7804e96a882248eb5faaccd867d2c883f9cd112
Author: Joost Peters (joostp at 7fc1.org)
Date: 2022-08-05T18:24:40+02:00

Commit Message:
ICB: ELDORADO: fix regression in fn_request_speech, add commented out code to be enabled later

Changed paths:
    engines/icb/speech.cpp


diff --git a/engines/icb/speech.cpp b/engines/icb/speech.cpp
index b3a16a9c310..f1cfd97fc37 100644
--- a/engines/icb/speech.cpp
+++ b/engines/icb/speech.cpp
@@ -131,15 +131,30 @@ mcodeFunctionReturnCodes _game_session::fn_request_speech(int32 &result, int32 *
 			g_oIconMenu->CloseDownIconMenu();
 
 		if ((g_oIconMenu->IsActive()) || (player.player_status == REMORA))
-		return IR_REPEAT;
-
-		// not started yet
-		S.state = __PENDING;
-	} else {
-		if ((g_oIconMenu->IsActive()) || (player.player_status == REMORA/*MAP*/))
 			return IR_REPEAT;
+	} else {
+		//TODO:
+#if 0
+		if ((cur_id == player.Fetch_player_id()) && (player.player_status==MAP))
+			g_oMap.CloseDownMap();
+
+		if ((cur_id == player.Fetch_player_id()) && (g_oIconMenu.IsActive()))
+			g_oIconMenu.CloseDownIconMenu();
+
+		// if object is a mega, check what anim it has and turn its ambient anims off or on depending...
+		if (L->mega) {
+			if (L->cur_anim_type == __STAND) {
+				M->idleAnimsOn = TRUE8;
+				M->idlePhase = NEEDS_INIT;
+			} else
+				M->idleAnimsOn = FALSE8;
+		}
+#endif
 	}
 
+	// not started yet
+	S.state = __PENDING;
+
 	// get the system now - in case another object tries to start a conversation
 	total_convs++; // to 1 ;)