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

[sluicebox]

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:
ad64b90991 AGI: Fix PreAGI regressions


Commit: ad64b909915c813eda038bb3fe4c8cbcd532af21
    https://github.com/scummvm/scummvm/commit/ad64b909915c813eda038bb3fe4c8cbcd532af21
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-11-07T01:53:02-08:00

Commit Message:
AGI: Fix PreAGI regressions

Changed paths:
    engines/agi/preagi/winnie.cpp
    engines/agi/sound.cpp


diff --git a/engines/agi/preagi/winnie.cpp b/engines/agi/preagi/winnie.cpp
index 918896fa130..489cb3ee4dc 100644
--- a/engines/agi/preagi/winnie.cpp
+++ b/engines/agi/preagi/winnie.cpp
@@ -1119,7 +1119,7 @@ void WinnieEngine::drawRoomPic() {
 
 	// draw room picture
 	_picture->setOffset(IDI_WTP_PIC_X0, IDI_WTP_PIC_Y0);
-	_picture->decodePictureFromBuffer(buffer + roomhdr.ofsPic - _roomOffset, 4096, false, IDI_WTP_PIC_WIDTH, IDI_WTP_PIC_HEIGHT);
+	_picture->decodePictureFromBuffer(buffer + roomhdr.ofsPic - _roomOffset, 4096, true, IDI_WTP_PIC_WIDTH, IDI_WTP_PIC_HEIGHT);
 	_picture->setOffset(0, 0);
 	_picture->showPic(IDI_WTP_PIC_X0, IDI_WTP_PIC_Y0, IDI_WTP_PIC_WIDTH, IDI_WTP_PIC_HEIGHT);
 
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index 98eb38e7007..38db3d2dbad 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -61,7 +61,7 @@ AgiSound *AgiSound::createFromRawResource(uint8 *data, uint32 len, int resnum, i
 	uint16 type = READ_LE_UINT16(data);
 
 	// For V1 sound resources
-	if (type != AGI_SOUND_SAMPLE && (type & 0xFF) == AGI_SOUND_4CHN)
+	if (type != AGI_SOUND_SAMPLE && (type & 0xFF) == AGI_SOUND_SAMPLE)
 		return new PCjrSound(resnum, data, len, AGI_SOUND_4CHN);
 
 	switch (type) { // Create a sound object based on the type