diff options
| author | Travis Howell | 2003-10-29 10:24:03 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-10-29 10:24:03 +0000 |
| commit | 2a113835234c316b91846d308eef9cc0fe2d3f72 (patch) | |
| tree | 916afb4170307cad02397096aaa008eea24f85d3 /scumm | |
| parent | 774b847a8754ef3af400631ae9544332b76d85ed (diff) | |
| download | scummvm-rg350-2a113835234c316b91846d308eef9cc0fe2d3f72.tar.gz scummvm-rg350-2a113835234c316b91846d308eef9cc0fe2d3f72.tar.bz2 scummvm-rg350-2a113835234c316b91846d308eef9cc0fe2d3f72.zip | |
Hopefully right this time, last change caused a cheat (Free air travel)
svn-id: r11003
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/object.cpp | 7 | ||||
| -rw-r--r-- | scumm/script_v2.cpp | 13 |
2 files changed, 7 insertions, 13 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 7dbd6685fc..ad336b0aaa 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -143,6 +143,13 @@ int ScummEngine::getState(int obj) { if (_gameId == GID_MANIAC && (obj == 182 || obj == 193)) _objectStateTable[obj] |= 0x08; + + // The Enchanced version of Zak McKracken included in the + // SelectWare Classic Collection bundle has no copy protection + // and doesn't include the codes. + + if (_gameId == GID_ZAK && obj == 213) + _objectStateTable[obj] |= 0x08; #endif return _objectStateTable[obj]; diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 8a5f638ac2..7a1e5e51ae 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -428,25 +428,12 @@ void ScummEngine_v2::decodeParseString() { actorTalk(); } -#ifndef BYPASS_COPY_PROT -#define BYPASS_COPY_PROT -#endif - int ScummEngine_v2::readVar(uint var) { if (var >= 14 && var <= 16) var = _scummVars[var]; checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)"); debug(6, "readvar(%d) = %d", var, _scummVars[var]); - -#if defined(BYPASS_COPY_PROT) - // The Enchanced version of Zak McKracken included in the - // SelectWare Classic Collection bundle has no copy protection - // and doesn't include the codes. - if (_gameId == GID_ZAK && var == 244) - return 0; -#endif - return _scummVars[var]; } |