aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2008-04-24 21:48:04 +0000
committerJohannes Schickel2008-04-24 21:48:04 +0000
commitc05d16826ddced4a968808ceadedcef2e8f7bd9f (patch)
treedef4fe19cd421ce7c46a5d546c0e080462f818ae
parenta546869dac2b455705c3a6db9a86bc7b523e1ea8 (diff)
downloadscummvm-rg350-c05d16826ddced4a968808ceadedcef2e8f7bd9f.tar.gz
scummvm-rg350-c05d16826ddced4a968808ceadedcef2e8f7bd9f.tar.bz2
scummvm-rg350-c05d16826ddced4a968808ceadedcef2e8f7bd9f.zip
- implemented opcode 90: o3_getScore
- opcode 103 is yet another dummy opcode svn-id: r31710
-rw-r--r--engines/kyra/kyra_v3.h1
-rw-r--r--engines/kyra/script_v3.cpp9
2 files changed, 8 insertions, 2 deletions
diff --git a/engines/kyra/kyra_v3.h b/engines/kyra/kyra_v3.h
index 2184dc8ae9..20b88733c7 100644
--- a/engines/kyra/kyra_v3.h
+++ b/engines/kyra/kyra_v3.h
@@ -711,6 +711,7 @@ private:
int o3_stopMusic(ScriptState *script);
int o3_playMusicTrack(ScriptState *script);
int o3_playSoundEffect(ScriptState *script);
+ int o3_getScore(ScriptState *script);
int o3_blockOutRegion(ScriptState *script);
int o3_getRand(ScriptState *script);
int o3_waitForConfirmationClick(ScriptState *script);
diff --git a/engines/kyra/script_v3.cpp b/engines/kyra/script_v3.cpp
index 18ea960863..6be5da86cc 100644
--- a/engines/kyra/script_v3.cpp
+++ b/engines/kyra/script_v3.cpp
@@ -655,6 +655,11 @@ int KyraEngine_v3::o3_playSoundEffect(ScriptState *script) {
return 0;
}
+int KyraEngine_v3::o3_getScore(ScriptState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_getScore(%p) ()", (const void *)script);
+ return _score;
+}
+
int KyraEngine_v3::o3_blockOutRegion(ScriptState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_blockOutRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
const int x1 = stackPos(0);
@@ -1166,7 +1171,7 @@ void KyraEngine_v3::setupOpcodeTable() {
// 0x58
Opcode(o3_playMusicTrack);
Opcode(o3_playSoundEffect);
- OpcodeUnImpl();
+ Opcode(o3_getScore);
OpcodeUnImpl();
// 0x5c
Opcode(o3_blockOutRegion);
@@ -1182,7 +1187,7 @@ void KyraEngine_v3::setupOpcodeTable() {
OpcodeUnImpl();
OpcodeUnImpl();
Opcode(o3_dummy);
- OpcodeUnImpl();
+ Opcode(o3_dummy);
// 0x68
Opcode(o3_dummy);
Opcode(o3_dummy);