From 645f51e0799bd7fc58e04c67b49b9d5192b698b4 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Fri, 12 Jun 2015 18:38:26 +0200 Subject: [PATCH] SHERLOCK: 3DO: basic UI support --- .../sherlock/scalpel/scalpel_user_interface.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp index acb648c3ade..80a36fe9cb3 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.cpp +++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp @@ -86,8 +86,15 @@ const char *const MUSE[] = { ScalpelUserInterface::ScalpelUserInterface(SherlockEngine *vm): UserInterface(vm) { if (_vm->_interactiveFl) { - _controls = new ImageFile("menu.all"); - _controlPanel = new ImageFile("controls.vgs"); + if (_vm->getPlatform() != Common::kPlatform3DO) { + // PC + _controls = new ImageFile("menu.all"); + _controlPanel = new ImageFile("controls.vgs"); + } else { + // 3DO + _controls = new ImageFile3DO("menu.all", true); + _controlPanel = new ImageFile3DO("controls.vgs", true); + } } else { _controls = nullptr; _controlPanel = nullptr; @@ -122,9 +129,6 @@ void ScalpelUserInterface::reset() { void ScalpelUserInterface::drawInterface(int bufferNum) { Screen &screen = *_vm->_screen; - if (_vm->getPlatform() == Common::kPlatform3DO) - return; // 3DO: don't do anything for now - if (bufferNum & 1) screen._backBuffer1.transBlitFrom((*_controlPanel)[0], Common::Point(0, CONTROLS_Y)); if (bufferNum & 2)