[Scummvm-cvs-logs] scummvm master -> 3de8b25003ad5aafdcb7ae091383339e6313ce8e

Strangerke arnaud.boutonne at gmail.com
Sun Apr 24 23:23:27 CEST 2011


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:
3de8b25003 HUGO: Fix BE issue in getSound(). Thanks wjp for finding that issue.


Commit: 3de8b25003ad5aafdcb7ae091383339e6313ce8e
    https://github.com/scummvm/scummvm/commit/3de8b25003ad5aafdcb7ae091383339e6313ce8e
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-04-24T14:22:39-07:00

Commit Message:
HUGO: Fix BE issue in getSound(). Thanks wjp for finding that issue.

Changed paths:
    engines/hugo/file.cpp



diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp
index dcbc156..3a79ba1 100644
--- a/engines/hugo/file.cpp
+++ b/engines/hugo/file.cpp
@@ -298,7 +298,11 @@ sound_pt FileManager::getSound(const int16 sound, uint16 *size) {
 	}
 
 	if (!has_read_header) {
-		if (fp.read(s_hdr, sizeof(s_hdr)) != sizeof(s_hdr))
+		for (int i = 0; i < kMaxSounds; i++) {
+			s_hdr[i].size = fp.readUint16LE();
+			s_hdr[i].offset = fp.readUint32LE();
+		}
+		if (fp.err())
 			error("Wrong sound file format");
 		has_read_header = true;
 	}






More information about the Scummvm-git-logs mailing list