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

dreammaster dreammaster at scummvm.org
Tue Apr 10 03:21:57 CEST 2018


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
083f18af93 XEEN: Fix falling from the Dark Side Skyroads
efb1f9219c XEEN: Add warning for invalid cmdFreezeFrequency channel values


Commit: 083f18af933bb528b6388a2814aa44a97a56e27b
    https://github.com/scummvm/scummvm/commit/083f18af933bb528b6388a2814aa44a97a56e27b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-09T21:19:10-04:00

Commit Message:
XEEN: Fix falling from the Dark Side Skyroads

Changed paths:
    engines/xeen/interface.cpp


diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 3da5dc7..8252354 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -765,8 +765,8 @@ void Interface::startFalling(bool flag) {
 			break;
 		}
 	} else {
-		if (party._mazeId > 89 && party._mazeId < 113) {
-			party._mazeId += 168;
+		if (party._mazeId > 88 && party._mazeId < 114) {
+			party._mazeId -= 88;
 		} else {
 			switch (party._mazeId - 25) {
 			case 0:


Commit: efb1f9219cf26835c7e5a7ab2e32a7fadeb31a96
    https://github.com/scummvm/scummvm/commit/efb1f9219cf26835c7e5a7ab2e32a7fadeb31a96
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-09T21:20:40-04:00

Commit Message:
XEEN: Add warning for invalid cmdFreezeFrequency channel values

I got a crash once for an invalid channel when falling to the
Water Elemental Plain from the Dark Side Skyroads, but couldn't
replicate it. So I've put in a warning for now

Changed paths:
    engines/xeen/sound_driver.cpp


diff --git a/engines/xeen/sound_driver.cpp b/engines/xeen/sound_driver.cpp
index e79fcdd..6ce10d9 100644
--- a/engines/xeen/sound_driver.cpp
+++ b/engines/xeen/sound_driver.cpp
@@ -126,7 +126,10 @@ bool SoundDriver::musSkipWord(const byte *&srcP, byte param) {
 
 bool SoundDriver::cmdFreezeFrequency(const byte *&srcP, byte param) {
 	debugC(3, kDebugSound, "cmdFreezeFrequency %d", param);
-	_channels[param]._changeFrequency = false;
+	if (param >= _channels.size())
+		warning("Invalid channel %d in cmdFreezeFrequency call", param);
+	else
+		_channels[param]._changeFrequency = false;
 	return false;
 }
 





More information about the Scummvm-git-logs mailing list