From 4b706aca434ac7c2753c3d73bcf4022be0b2cde6 Mon Sep 17 00:00:00 2001
From: Sven Hesse <drmccoy@users.sourceforge.net>
Date: Sat, 3 Jun 2006 08:53:10 +0000
Subject: [PATCH] Fixing an endian-issue in setVoice()
svn-id: r22858
---
engines/gob/music.cpp | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/engines/gob/music.cpp b/engines/gob/music.cpp
index 71108cc968d..e7e15cdd75e 100644
--- a/engines/gob/music.cpp
+++ b/engines/gob/music.cpp
@@ -22,6 +22,8 @@
*/
#include "common/file.h"
+#include "common/stdafx.h"
+#include "common/endian.h"
#include "gob/music.h"
#include "gob/gob.h"
@@ -213,13 +215,20 @@ void Music::setVoices() {
}
void Music::setVoice(byte voice, byte instr, bool set) {
- unsigned short *strct;
+ int i;
+ int j;
+ uint16 strct[27];
byte channel;
+ byte *dataPtr;
// i = 0 : 0 1 2 3 4 5 6 7 8 9 10 11 12 26
// i = 1 : 13 14 15 16 17 18 19 20 21 22 23 24 25 27
- for (int i = 0; i < 2; i++) {
- strct = (unsigned short*)(_data + 3 + instr * 0x38 + i * 0x1A);
+ for (i = 0; i < 2; i++) {
+ dataPtr = _data + 3 + instr * 0x38 + i * 0x1A;
+ for (j = 0; j < 27; j++) {
+ strct[j] = READ_LE_UINT16(dataPtr);
+ dataPtr += 2;
+ }
channel = _operators[voice] + i * 3;
writeOPL(0xBD, 0x00);
writeOPL(0x08, 0x00);