aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2009-04-23 18:46:41 +0000
committerFilippos Karapetis2009-04-23 18:46:41 +0000
commitefc28c1be6b344a72cd1011a20ba2924515de334 (patch)
tree0f21d6d873fb2565aabe84ea3892f42854277116
parentbd2c2b0e500bfa46077978d42e8a8c9e38582f4c (diff)
downloadscummvm-rg350-efc28c1be6b344a72cd1011a20ba2924515de334.tar.gz
scummvm-rg350-efc28c1be6b344a72cd1011a20ba2924515de334.tar.bz2
scummvm-rg350-efc28c1be6b344a72cd1011a20ba2924515de334.zip
Fixed the GetMessage kernel opcode. Eco Quest 1 text is showing up correctly now
svn-id: r40093
-rw-r--r--engines/sci/engine/kstring.cpp1
-rw-r--r--engines/sci/engine/message.cpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index b991f2e1e6..5e98749732 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -782,7 +782,6 @@ reg_t kMessage(EngineState *s, int funct_nr, int argc, reg_t *argv) {
return NULL_REG;
}
-// FIXME: This doesn't always work, sometimes it doesn't find the requested tuple (tested with EcoQuest 1)
reg_t kGetMessage(EngineState *s, int funct_nr, int argc, reg_t *argv) {
if (!state.initialized)
message_state_initialize(s->resmgr, &state);
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index 284129e365..b905c4f418 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -169,8 +169,8 @@ static MessageHandler fixed_handler_old = {
get_talker_trivial,
index_record_get_text_2101,
header_get_index_record_count_2101,
- 10, // FIXME: is this correct?
- 11 // FIXME: is this correct?
+ 6,
+ 4
};
static MessageHandler fixed_handler = {