thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add back HE sound differences for AKOS.

Browse source 
Remove old define
Avoid crash if using demo script in maniac (Enchanced)

svn-id: r13166
This commit is contained in:
Travis Howell 2004-03-03 08:17:21 +00:00
parent 1db5ef710e
commit 306d16441e
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scumm/script_v2.cpp
View file

@ -771,6 +771,10 @@ void ScummEngine_v2::o2_resourceRoutines() {
if ((opcode & 0x0f) == 0 || type == rtNumTypes)
return;
// HACK V2 Maniac Mansion tries to load an invalid sound resource in demo script.
if (_gameId == GID_MANIAC && _version == 2 && vm.slot[_currentScript].number == 9 && type == rtSound && resid == 1)
return;
if ((opcode & 0x0f) == 1) {
ensureResourceLoaded(type, resid);
} else {
@ -1092,10 +1096,6 @@ void ScummEngine_v2::o2_putActor() {
a->putActor(x, y, a->room);
}
#ifndef BYPASS_COPY_PROT
#define BYPASS_COPY_PROT
#endif
void ScummEngine_v2::o2_startScript() {
int script = getVarOrDirectByte(PARAM_1);