[Scummvm-git-logs] scummvm master -> 4c9986a41580410efe48cfa75ce19b37c45ffb9d

[AndywinXp]

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:
4c9986a415 SCUMM: Remove obsolete comment from o3_waitForSentence()


Commit: 4c9986a41580410efe48cfa75ce19b37c45ffb9d
    https://github.com/scummvm/scummvm/commit/4c9986a41580410efe48cfa75ce19b37c45ffb9d
Author: Andrea Boscarino (andywinxp at gmail.com)
Date: 2022-04-30T20:08:10+02:00

Commit Message:
SCUMM: Remove obsolete comment from o3_waitForSentence()

I have checked the v3 disasms for both LOOM and Indy3 and this indeed appears to be the correct code

Changed paths:
    engines/scumm/script_v3.cpp


diff --git a/engines/scumm/script_v3.cpp b/engines/scumm/script_v3.cpp
index f9473a7ee4a..a95cd8ec3f4 100644
--- a/engines/scumm/script_v3.cpp
+++ b/engines/scumm/script_v3.cpp
@@ -66,10 +66,6 @@ void ScummEngine_v3::o3_waitForActor() {
 }
 
 void ScummEngine_v3::o3_waitForSentence() {
-	// FIXME/TODO: Can we merge this with o2_waitForSentence? I think
-	// the code here is actually incorrect, and the code in
-	// o2_waitForSentence correct, but somebody should check the
-	// disassembly for Indy and Loom.
 	if (_sentenceNum) {
 		if (_sentence[_sentenceNum - 1].freezeCount && !isScriptInUse(VAR(VAR_SENTENCE_SCRIPT)))
 			return;