diff options
Diffstat (limited to 'engines/sherlock/scalpel')
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_map.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_user_interface.cpp | 7 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/tsage/logo.cpp | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/engines/sherlock/scalpel/scalpel_map.cpp b/engines/sherlock/scalpel/scalpel_map.cpp index 2177fc5885..efb5e80d0f 100644 --- a/engines/sherlock/scalpel/scalpel_map.cpp +++ b/engines/sherlock/scalpel/scalpel_map.cpp @@ -56,7 +56,7 @@ const byte *MapPaths::getPath(int srcLocation, int destLocation) { /*----------------------------------------------------------------*/ -ScalpelMap::ScalpelMap(SherlockEngine *vm): Map(vm), _topLine(g_system->getWidth(), 12, vm->getPlatform()) { +ScalpelMap::ScalpelMap(SherlockEngine *vm): Map(vm), _topLine(g_system->getWidth(), 12) { _mapCursors = nullptr; _shapes = nullptr; _iconShapes = nullptr; @@ -315,7 +315,7 @@ void ScalpelMap::setupSprites() { _cursorIndex = 0; events.setCursor((*_mapCursors)[_cursorIndex]._frame); - _iconSave.create((*_shapes)[4]._width, (*_shapes)[4]._height, _vm->getPlatform()); + _iconSave.create((*_shapes)[4]._width, (*_shapes)[4]._height); Person &p = people[HOLMES]; p._description = " "; p._type = CHARACTER; diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp index bdb169e707..5ddf2ec07c 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.cpp +++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp @@ -1235,7 +1235,7 @@ void ScalpelUserInterface::doLookControl() { } else { // Looking at an inventory object // Backup the user interface - Surface tempSurface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1, _vm->getPlatform()); + Surface tempSurface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - CONTROLS_Y1); tempSurface.blitFrom(screen._backBuffer2, Common::Point(0, 0), Common::Rect(0, CONTROLS_Y1, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT)); @@ -1803,7 +1803,7 @@ void ScalpelUserInterface::printObjectDesc(const Common::String &str, bool first // If it wasn't a right button click, then we need depress // the look button before we close the window. So save a copy of the // menu area, and draw the controls onto it - Surface tempSurface((*_controls)[0]._frame.w, (*_controls)[0]._frame.h, _vm->getPlatform()); + Surface tempSurface((*_controls)[0]._frame.w, (*_controls)[0]._frame.h); Common::Point pt(MENU_POINTS[0][0], MENU_POINTS[0][1]); offsetButton3DO(pt, 0); @@ -1994,8 +1994,7 @@ void ScalpelUserInterface::summonWindow(bool slideUp, int height) { Screen &screen = *_vm->_screen; // Extract the window that's been drawn on the back buffer - Surface tempSurface(SHERLOCK_SCREEN_WIDTH, - (SHERLOCK_SCREEN_HEIGHT - height), _vm->getPlatform()); + Surface tempSurface(SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT - height); Common::Rect r(0, height, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_HEIGHT); tempSurface.blitFrom(screen._backBuffer1, Common::Point(0, 0), r); diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp index 9026dd7342..4eab01947a 100644 --- a/engines/sherlock/scalpel/tsage/logo.cpp +++ b/engines/sherlock/scalpel/tsage/logo.cpp @@ -104,7 +104,7 @@ void Visage::surfaceFromRes(ObjectSurface &s) { int frameWidth = _stream->readUint16LE(); int frameHeight = _stream->readUint16LE(); Common::Rect r(0, 0, frameWidth, frameHeight); - s.create(r.width(), r.height(), Common::kPlatformDOS); // maybe change this to a bool later? TODO + s.create(r.width(), r.height()); s._centroid.x = _stream->readSint16LE(); s._centroid.y = _stream->readSint16LE(); |