[Scummvm-cvs-logs] scummvm master -> 645f51e0799bd7fc58e04c67b49b9d5192b698b4

[m-kiewitz]

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:
645f51e079 SHERLOCK: 3DO: basic UI support


Commit: 645f51e0799bd7fc58e04c67b49b9d5192b698b4
    https://github.com/scummvm/scummvm/commit/645f51e0799bd7fc58e04c67b49b9d5192b698b4
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-12T18:38:26+02:00

Commit Message:
SHERLOCK: 3DO: basic UI support

Changed paths:
    engines/sherlock/scalpel/scalpel_user_interface.cpp



diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index acb648c..80a36fe 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)