From 9ec64a66fe2f20eb1be0811b5f733332efff1b93 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 13 May 2011 14:48:01 +0200 Subject: SCUMM: Turned ResTypeData into a Common::Array, subsuming its _resource member --- engines/scumm/imuse/imuse.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/scumm/imuse/imuse.cpp') diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index 75cdb2028a..fa154ea024 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -102,7 +102,7 @@ IMuseInternal::~IMuseInternal() { byte *IMuseInternal::findStartOfSound(int sound) { int32 size, pos; - byte *ptr = g_scumm->_res->_types[rtSound]._resources[sound]._address; + byte *ptr = g_scumm->_res->_types[rtSound][sound]._address; if (ptr == NULL) { debug(1, "IMuseInternal::findStartOfSound(): Sound %d doesn't exist", sound); @@ -134,7 +134,7 @@ byte *IMuseInternal::findStartOfSound(int sound) { } bool IMuseInternal::isMT32(int sound) { - byte *ptr = g_scumm->_res->_types[rtSound]._resources[sound]._address; + byte *ptr = g_scumm->_res->_types[rtSound][sound]._address; if (ptr == NULL) return false; @@ -176,7 +176,7 @@ bool IMuseInternal::isMT32(int sound) { } bool IMuseInternal::isMIDI(int sound) { - byte *ptr = g_scumm->_res->_types[rtSound]._resources[sound]._address; + byte *ptr = g_scumm->_res->_types[rtSound][sound]._address; if (ptr == NULL) return false; -- cgit v1.2.3