diff options
| author | Johannes Schickel | 2008-03-18 18:20:13 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-03-18 18:20:13 +0000 |
| commit | 80a73d4ae6b4bc157173b8016cb871adc4fd915d (patch) | |
| tree | 139afbc2b71089051c46d1c87aee5d63e22073fc | |
| parent | 9dc4bcb4073a18f562c921ef31f7c515cae3da00 (diff) | |
| download | scummvm-rg350-80a73d4ae6b4bc157173b8016cb871adc4fd915d.tar.gz scummvm-rg350-80a73d4ae6b4bc157173b8016cb871adc4fd915d.tar.bz2 scummvm-rg350-80a73d4ae6b4bc157173b8016cb871adc4fd915d.zip | |
Renamed opcode 95 to o2_showItemString.
svn-id: r31185
| -rw-r--r-- | engines/kyra/kyra_v2.h | 2 | ||||
| -rw-r--r-- | engines/kyra/script_v2.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index 5f83846382..9417e85fbc 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -1031,7 +1031,7 @@ protected: int o2_blockInRegion(ScriptState *script); int o2_blockOutRegion(ScriptState *script); int o2_setCauldronState(ScriptState *script); - int o2_showPickUpString(ScriptState *script); + int o2_showItemString(ScriptState *script); int o2_getRand(ScriptState *script); int o2_setDeathHandlerFlag(ScriptState *script); int o2_setDrawNoShapeFlag(ScriptState *script); diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp index b7a5965aa0..0f0d1a6731 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -857,8 +857,8 @@ int KyraEngine_v2::o2_setCauldronState(ScriptState *script) { return 0; } -int KyraEngine_v2::o2_showPickUpString(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showPickUpString(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); +int KyraEngine_v2::o2_showItemString(ScriptState *script) { + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showItemString(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); const int item = stackPos(0); int string = 0; @@ -1775,7 +1775,7 @@ void KyraEngine_v2::setupOpcodeTable() { Opcode(o2_blockOutRegion), OpcodeUnImpl(), Opcode(o2_setCauldronState), - Opcode(o2_showPickUpString), + Opcode(o2_showItemString), // 0x60 Opcode(o2_getRand), OpcodeUnImpl(), |