diff options
| author | Travis Howell | 2002-09-22 03:58:53 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-09-22 03:58:53 +0000 |
| commit | c0855df3820662a91aab184ff15d50c371b4c208 (patch) | |
| tree | c313b8bb1dd786485228030ce1d8d85cd2de2bd1 | |
| parent | 5d72701c06df605f9186735adc4df3e025e48668 (diff) | |
| download | scummvm-rg350-c0855df3820662a91aab184ff15d50c371b4c208.tar.gz scummvm-rg350-c0855df3820662a91aab184ff15d50c371b4c208.tar.bz2 scummvm-rg350-c0855df3820662a91aab184ff15d50c371b4c208.zip | |
Add hack from trin to make zak256 sfx/music work again.
Add Makefile changes to Makefile.mingw
svn-id: r5000
| -rw-r--r-- | Makefile.mingw | 2 | ||||
| -rw-r--r-- | scumm/resource.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.mingw b/Makefile.mingw index 0e32e39fb4..352bb1eed2 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -19,7 +19,7 @@ RM_REC = $(RM) -r ZIP = zip -q CP = cp -CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar +CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Werror DEFINES = LDFLAGS := INCLUDES:= -I. -Icommon -Iscumm $(SDL_CFLAGS) diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 69b9b9e257..d81fe3e315 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -530,7 +530,7 @@ int Scumm::loadResource(int type, int idx) size = _fileHandle.readDwordLE(); tag = _fileHandle.readWordLE(); _fileHandle.seek(-6, SEEK_CUR); - if (type == rtSound) + if ((type == rtSound) && (_gameId != GID_ZAK256)) return readSoundResourceSmallHeader(type, idx); } else { if (type == rtSound) { |