diff options
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 64 | ||||
| -rw-r--r-- | engines/sci/engine/kmisc.cpp | 22 |
2 files changed, 40 insertions, 46 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 9b88ad1bda..438f0fa442 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -632,41 +632,35 @@ reg_t kPortrait(EngineState *s, int argc, reg_t *argv) { uint16 operation = argv[0].toUint16(); switch (operation) { - case 0: // load resource (the corresponding .BIN file from the ACTORS directory) - { - Common::String resName = s->_segMan->getString(argv[1]); - warning("kPortrait, load portrait %s", resName.c_str()); - // TODO - } - break; - case 1: // show portrait - { - Common::String resName = s->_segMan->getString(argv[1]); - - // Show the portrait and sync the sound resource (like kDoSync) - /* - Common::Point portraitPos = Common::Point(argv[2].toUint16(), argv[3].toUint16()); - uint resourceNum = argv[4].toUint16() & 0xff; - uint noun = argv[5].toUint16() & 0xff; - uint verb = argv[6].toUint16() & 0xff; - uint cond = argv[7].toUint16() & 0xff; - uint seq = argv[8].toUint16() & 0xff; - // argv[9] is usually 0 - */ - - warning("kPortrait, show portrait %s", resName.c_str()); - // TODO - } - break; - case 2: // unload resource - { - uint16 portraitId = argv[1].toUint16(); - warning("kPortrait, unload portrait ID %d", portraitId); - // TODO - } - break; - default: - warning("kPortrait(%d), not implemented (argc = %d)", operation, argc); + case 0: { // load resource (the corresponding .BIN file from the ACTORS directory) + Common::String resName = s->_segMan->getString(argv[1]); + warning("kPortrait, load portrait %s", resName.c_str()); + // TODO + } break; + case 1: { // show portrait + Common::String resName = s->_segMan->getString(argv[1]); + + // Show the portrait and sync the sound resource (like kDoSync) + /* + Common::Point portraitPos = Common::Point(argv[2].toUint16(), argv[3].toUint16()); + uint resourceNum = argv[4].toUint16() & 0xff; + uint noun = argv[5].toUint16() & 0xff; + uint verb = argv[6].toUint16() & 0xff; + uint cond = argv[7].toUint16() & 0xff; + uint seq = argv[8].toUint16() & 0xff; + // argv[9] is usually 0 + */ + + warning("kPortrait, show portrait %s", resName.c_str()); + // TODO + } break; + case 2: { // unload resource + uint16 portraitId = argv[1].toUint16(); + warning("kPortrait, unload portrait ID %d", portraitId); + // TODO + } break; + default: + warning("kPortrait(%d), not implemented (argc = %d)", operation, argc); } return NULL_REG; diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index 15b8d637a2..41c36a8bc3 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -253,17 +253,17 @@ reg_t kPlatform(EngineState *s, int argc, reg_t *argv) { uint16 operation = argv[0].toUint16(); switch (operation) { - case kPlatformGetPlatform: - return make_reg(0, (isWindows) ? kSciPlatformWindows : kSciPlatformDOS); - case kPlatformUnk5: - // This case needs to return the opposite of case 6 to get hires graphics - return make_reg(0, !isWindows); - case kPlatformIsHiRes: - return make_reg(0, isWindows); - case kPlatformIsItWindows: - return make_reg(0, isWindows); - default: - warning("Unsupported kPlatform operation %d", operation); + case kPlatformGetPlatform: + return make_reg(0, (isWindows) ? kSciPlatformWindows : kSciPlatformDOS); + case kPlatformUnk5: + // This case needs to return the opposite of case 6 to get hires graphics + return make_reg(0, !isWindows); + case kPlatformIsHiRes: + return make_reg(0, isWindows); + case kPlatformIsItWindows: + return make_reg(0, isWindows); + default: + warning("Unsupported kPlatform operation %d", operation); } return NULL_REG; |