diff options
| author | Max Horn | 2008-08-06 09:13:57 +0000 |
|---|---|---|
| committer | Max Horn | 2008-08-06 09:13:57 +0000 |
| commit | eb649983fcc7c05209be30ba6d19b997112dd639 (patch) | |
| tree | d43db6ba91fa8cbea8d9c0a61d8447bb67e52df6 /engines | |
| parent | 4e66938e8c39778422e1d6a7e17f0f1979e6e0df (diff) | |
| download | scummvm-rg350-eb649983fcc7c05209be30ba6d19b997112dd639.tar.gz scummvm-rg350-eb649983fcc7c05209be30ba6d19b997112dd639.tar.bz2 scummvm-rg350-eb649983fcc7c05209be30ba6d19b997112dd639.zip | |
SCUMM: Renamed inventoryScript -> inventoryScriptIndy3Mac
svn-id: r33654
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/script.cpp | 8 | ||||
| -rw-r--r-- | engines/scumm/scumm.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index 9268768f2e..c727b59c64 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -769,14 +769,14 @@ void ScummEngine::runInventoryScript(int i) { args[0] = i; if (VAR(VAR_INVENTORY_SCRIPT)) { if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh) { - inventoryScript(); + inventoryScriptIndy3Mac(); } else { runScript(VAR(VAR_INVENTORY_SCRIPT), 0, 0, args); } } } -void ScummEngine::inventoryScript() { +void ScummEngine::inventoryScriptIndy3Mac() { VerbSlot *vs; int args[24]; int j, slot; @@ -1201,11 +1201,11 @@ void ScummEngine::runInputScript(int clickArea, int val, int mode) { if (clickArea == kVerbClickArea && (val >= 101 && val <= 108)) { if (val == 107) { VAR(67) -= 2; - inventoryScript(); + inventoryScriptIndy3Mac(); return; } else if (val == 108) { VAR(67) += 2; - inventoryScript(); + inventoryScriptIndy3Mac(); return; } else { args[0] = 3; diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 5011781820..2763331420 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -673,7 +673,7 @@ protected: void executeScript(); void updateScriptPtr(); virtual void runInventoryScript(int i); - void inventoryScript(); + void inventoryScriptIndy3Mac(); void checkAndRunSentenceScript(); void runExitScript(); void runEntryScript(); |