[Scummvm-git-logs] scummvm master -> 7832eb429158f45b2e9ed0f913b8b438debf0de0

AndywinXp noreply at scummvm.org
Mon Aug 12 12:09:25 UTC 2024


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:
7832eb4291 SCUMM: HE: Avoid erroring out on invalid control codes


Commit: 7832eb429158f45b2e9ed0f913b8b438debf0de0
    https://github.com/scummvm/scummvm/commit/7832eb429158f45b2e9ed0f913b8b438debf0de0
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-08-12T14:09:20+02:00

Commit Message:
SCUMM: HE: Avoid erroring out on invalid control codes

This now mirrors the original.

Changed paths:
    engines/scumm/string.cpp


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 71871f8d6db..3b74f47ca10 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -529,7 +529,8 @@ bool ScummEngine_v72he::handleNextCharsetCode(Actor *a, int *code) {
 			endLoop = endText = true;
 			break;
 		default:
-			error("handleNextCharsetCode: invalid code %d", c);
+			// Ignore the control code, reset the buffer position...
+			buffer--;
 		}
 	}
 	_charsetBufPos = buffer - _charsetBuffer;




More information about the Scummvm-git-logs mailing list