diff options
| author | Paweł Kołodziejski | 2003-03-02 12:35:27 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-03-02 12:35:27 +0000 |
| commit | 0ce6264d11120622bafc5c9d5780227c5e299d18 (patch) | |
| tree | 133dfc00ac48620fd8a48dc06e9ef94fec005b72 /scumm/script_v6.cpp | |
| parent | 9eff1cc3fd62c5752d9155cb98433de0be0e32d9 (diff) | |
| download | scummvm-rg350-0ce6264d11120622bafc5c9d5780227c5e299d18.tar.gz scummvm-rg350-0ce6264d11120622bafc5c9d5780227c5e299d18.tar.bz2 scummvm-rg350-0ce6264d11120622bafc5c9d5780227c5e299d18.zip | |
changed sub_FEE_78D2 func for scumm v7
svn-id: r6658
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index db84cbd0b4..bd91015476 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2970,8 +2970,13 @@ void Scumm_v6::o6_findAllObjects() { static void sub_FEE_78D2(int num, int &arg1, int &arg2) { byte *ptr = g_scumm->getResourceAddress(rtString, num); - arg1 = READ_LE_UINT16(ptr + 4); - arg2 = READ_LE_UINT16(ptr + 2); + if (g_scumm->_features & GF_AFTER_V7) { + arg1 = READ_LE_UINT32(ptr + 8); + arg2 = READ_LE_UINT32(ptr + 4); + } else { + arg1 = READ_LE_UINT16(ptr + 4); + arg2 = READ_LE_UINT16(ptr + 2); + } } static void sub_FEE_7822(int num, int arg1, int arg2) { |