libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-21 09:21:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Limit nukeArrays to only location thats requires it for now.

Browse Source 
svn-id: r14803
This commit is contained in:
Travis Howell 2004-08-28 04:14:33 +00:00
parent dc7c03029d
commit 4c732d15c6
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scumm/script.cpp
View File

@ -349,12 +349,14 @@ void ScummEngine::updateScriptPtr() {
/* Nuke arrays based on script */
void ScummEngine::nukeArrays(int script) {
//FIXME
return;
int i;
if (!(_features & GF_HUMONGOUS) || !script)
if (!script)
return;
//FIXME Should be used all the time
// Limited to only location in puttmoon that requires it
if (!(_gameId == GID_PUTTMOON && _roomResource == 22))
return;
for (i = 1; i < _numArray; i++) {

2
scumm/script_v6he.cpp
View File

@ -1138,7 +1138,7 @@ void ScummEngine_v6he::o6_localizeArray() {
int slot = pop();
if (slot < _numArray) {
_arraySlot[slot] = _currentScript;
_arraySlot[slot] = vm.slot[_currentScript].number;
} else {
warning("o6_localizeArray(%d): array slot out of range", slot);
}

2
scumm/scumm.cpp
View File

@ -214,7 +214,7 @@ static const ScummGameSettings scumm_settings[] = {
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_MULTIPLE_VERSIONS, 0, 0},
{"moondemo", "Putt-Putt Goes To The Moon (Demo)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, 0, 0},
{"puttmoon", "Putt-Putt Goes To The Moon", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
{"puttmoon", "Putt-Putt Goes To The Moon", GID_PUTTMOON, 6, 60, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, 0, 0},
{"funpack", "Putt-Putt's Fun Pack", GID_FUNPACK, 6, 60, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},

1
scumm/scumm.h
View File

@ -255,6 +255,7 @@ enum ScummGameId {
GID_MONKEY_SEGA,
GID_HEGAME, // Generic name for all HE games with default behaviour
GID_PUTTDEMO,
GID_PUTTMOON,
GID_FBEAR,
GID_FUNPACK,
GID_PAJAMA,