[Scummvm-cvs-logs] scummvm master -> 829847cb8824f073ac34377bc3759134941611d5
clone2727
clone2727 at gmail.com
Wed Apr 24 04:36:10 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
829847cb88 SCI: Fix kMessage REF subop ordering
Commit: 829847cb8824f073ac34377bc3759134941611d5
https://github.com/scummvm/scummvm/commit/829847cb8824f073ac34377bc3759134941611d5
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-04-23T19:34:37-07:00
Commit Message:
SCI: Fix kMessage REF subop ordering
Thanks to waltervn for testing values from running in DOSBox.
Fixes bug #3034704
Changed paths:
engines/sci/engine/kstring.cpp
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 65e139e..15a9f54 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -488,9 +488,9 @@ enum kMessageFunc {
K_MESSAGE_GET,
K_MESSAGE_NEXT,
K_MESSAGE_SIZE,
- K_MESSAGE_REFCOND,
- K_MESSAGE_REFVERB,
K_MESSAGE_REFNOUN,
+ K_MESSAGE_REFVERB,
+ K_MESSAGE_REFCOND,
K_MESSAGE_PUSH,
K_MESSAGE_POP,
K_MESSAGE_LASTMESSAGE
@@ -511,16 +511,10 @@ reg_t kMessage(EngineState *s, int argc, reg_t *argv) {
#ifdef ENABLE_SCI32
if (getSciVersion() >= SCI_VERSION_2) {
// In complete weirdness, SCI32 bumps up subops 3-8 to 4-9 and stubs off subop 3.
- // In addition, SCI32 reorders the REF* subops.
if (func == 3)
error("SCI32 kMessage(3)");
- else if (func > 3) {
+ else if (func > 3)
func--;
- if (func == K_MESSAGE_REFCOND)
- func = K_MESSAGE_REFNOUN;
- else if (func == K_MESSAGE_REFNOUN || func == K_MESSAGE_REFVERB)
- func--;
- }
}
#endif
More information about the Scummvm-git-logs
mailing list