Add hack from trin to make zak256 sfx/music work again.
Add Makefile changes to Makefile.mingw svn-id: r5000
This commit is contained in:
parent
5d72701c06
commit
c0855df382
2 changed files with 2 additions and 2 deletions
|
@ -19,7 +19,7 @@ RM_REC = $(RM) -r
|
||||||
ZIP = zip -q
|
ZIP = zip -q
|
||||||
CP = cp
|
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 =
|
DEFINES =
|
||||||
LDFLAGS :=
|
LDFLAGS :=
|
||||||
INCLUDES:= -I. -Icommon -Iscumm $(SDL_CFLAGS)
|
INCLUDES:= -I. -Icommon -Iscumm $(SDL_CFLAGS)
|
||||||
|
|
|
@ -530,7 +530,7 @@ int Scumm::loadResource(int type, int idx)
|
||||||
size = _fileHandle.readDwordLE();
|
size = _fileHandle.readDwordLE();
|
||||||
tag = _fileHandle.readWordLE();
|
tag = _fileHandle.readWordLE();
|
||||||
_fileHandle.seek(-6, SEEK_CUR);
|
_fileHandle.seek(-6, SEEK_CUR);
|
||||||
if (type == rtSound)
|
if ((type == rtSound) && (_gameId != GID_ZAK256))
|
||||||
return readSoundResourceSmallHeader(type, idx);
|
return readSoundResourceSmallHeader(type, idx);
|
||||||
} else {
|
} else {
|
||||||
if (type == rtSound) {
|
if (type == rtSound) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue