[Scummvm-cvs-logs] scummvm master -> 1ca44c076c261dedc605401d39b51603fc0282af

[athrxx]

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:
1ca44c076c SCUMM: fix possible portability issue


Commit: 1ca44c076c261dedc605401d39b51603fc0282af
    https://github.com/scummvm/scummvm/commit/1ca44c076c261dedc605401d39b51603fc0282af
Author: athrxx (athrxx at scummvm.org)
Date: 2011-06-14T15:10:55-07:00

Commit Message:
SCUMM: fix possible portability issue

Changed paths:
    engines/scumm/imuse/imuse.cpp



diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 7d971f5..6813566 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -26,6 +26,7 @@
 
 #include "common/util.h"
 #include "common/system.h"
+#include "common/endian.h"
 
 #include "scumm/imuse/imuse.h"
 #include "scumm/imuse/imuse_internal.h"
@@ -101,8 +102,14 @@ IMuseInternal::~IMuseInternal() {
 
 byte *IMuseInternal::findStartOfSound(int sound, int ct) {	
 	int32 size, pos;
-	static uint32 id[] = { 'MThd', 'FORM', 'MDhd', 'MDpg' };
-
+	
+	static const uint32 id[] = {
+		MKTAG('M', 'T', 'h', 'd'),
+		MKTAG('F', 'O', 'R', 'M'),
+		MKTAG('M', 'D', 'h', 'd'),
+		MKTAG('M', 'D', 'p', 'g')
+	};
+	
 	byte *ptr = g_scumm->_res->_types[rtSound][sound]._address;
 
 	if (ptr == NULL) {