aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/message.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2009-12-23 05:10:16 +0000
committerMatthew Hoops2009-12-23 05:10:16 +0000
commit4be2788ffd8b9e8ec8a2ba6080bcd7701bd6c08a (patch)
tree882921d9d01fd3ac682069b643bd32bdb1a394e0 /engines/sci/engine/message.cpp
parentbac7961b3f8f5692fcdd5683866d6e9f935a7ca6 (diff)
downloadscummvm-rg350-4be2788ffd8b9e8ec8a2ba6080bcd7701bd6c08a.tar.gz
scummvm-rg350-4be2788ffd8b9e8ec8a2ba6080bcd7701bd6c08a.tar.bz2
scummvm-rg350-4be2788ffd8b9e8ec8a2ba6080bcd7701bd6c08a.zip
Some SCI32 (minor) String bug fixes and cleanup.
svn-id: r46492
Diffstat (limited to 'engines/sci/engine/message.cpp')
-rw-r--r--engines/sci/engine/message.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index 870341b7da..39c2eb326b 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -153,14 +153,11 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
reader = new MessageReaderV3(res->data, res->size);
break;
case 4:
- reader = new MessageReaderV4(res->data, res->size);
- break;
#ifdef ENABLE_SCI32
- case 5:
- // TODO: Decode this version's format... It's at least used in Torin.
- warning("The SCI 2.1 message format is not supported");
- return false;
+ case 5: // v5 seems to be compatible with v4
#endif
+ reader = new MessageReaderV4(res->data, res->size);
+ break;
default:
warning("Message: unsupported resource version %d", version);
return false;