[Scummvm-git-logs] scummvm master -> 935b538bb7d5633885e70cf207f492ed293e0e2c

sluicebox noreply at scummvm.org
Wed Apr 10 22:21:04 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:
935b538bb7 AGI: Fix view decoding regression


Commit: 935b538bb7d5633885e70cf207f492ed293e0e2c
    https://github.com/scummvm/scummvm/commit/935b538bb7d5633885e70cf207f492ed293e0e2c
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-04-10T15:20:00-07:00

Commit Message:
AGI: Fix view decoding regression

Fixes bug #15059

Introduced during my refactor last month:
f4201eeda8c289db99ef80b3f0a3f71fec6402d7

Changed paths:
    engines/agi/view.cpp


diff --git a/engines/agi/view.cpp b/engines/agi/view.cpp
index c8e3fbdda77..a3b6a7ebac9 100644
--- a/engines/agi/view.cpp
+++ b/engines/agi/view.cpp
@@ -154,7 +154,7 @@ int AgiEngine::decodeView(byte *resourceData, uint16 resourceSize, int16 viewNr)
 	viewData->loop = loopData;
 
 	for (int16 loopNr = 0; loopNr < headerLoopCount; loopNr++) {
-		int16 loopOffset = READ_LE_UINT16(resourceData + 5 + (loopNr * 2));
+		uint16 loopOffset = READ_LE_UINT16(resourceData + 5 + (loopNr * 2));
 
 		// Check, if at least the loop-header is available
 		if (resourceSize < (loopOffset + 1))
@@ -180,7 +180,7 @@ int AgiEngine::decodeView(byte *resourceData, uint16 resourceSize, int16 viewNr)
 			loopData->cel = celData;
 
 			for (int16 celNr = 0; celNr < loopHeaderCelCount; celNr++) {
-				int16 celOffset = READ_LE_UINT16(resourceData + loopOffset + 1 + (celNr * 2));
+				uint16 celOffset = READ_LE_UINT16(resourceData + loopOffset + 1 + (celNr * 2));
 				celOffset += loopOffset; // cel offset is relative to loop offset, so adjust accordingly
 
 				// Check, if at least the cel-header is available




More information about the Scummvm-git-logs mailing list