From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001 From: strangerke Date: Thu, 12 May 2011 01:13:57 +0200 Subject: GIT: Clean up: Suppress SVN tags, now useless --- engines/mohawk/myst.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'engines/mohawk/myst.cpp') diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 655a38b578..f7f1edf4e5 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "common/config-manager.h" -- cgit v1.2.3 From 0127a888fb821a6d9ef761b460cbb541bbfc2650 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sat, 14 May 2011 17:31:22 +0200 Subject: MOHAWK: Fix Myst backgrounds being draw one pixel too low on some cards. Happened in Myst's Generator cave.--- engines/mohawk/myst.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/mohawk/myst.cpp') diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index f7f1edf4e5..44bfd16e12 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -550,7 +550,7 @@ uint16 MohawkEngine_Myst::getCardBackgroundId() { } void MohawkEngine_Myst::drawCardBackground() { - _gfx->copyImageToBackBuffer(getCardBackgroundId(), Common::Rect(0, 0, 544, 333)); + _gfx->copyImageToBackBuffer(getCardBackgroundId(), Common::Rect(0, 0, 544, 332)); } void MohawkEngine_Myst::changeToCard(uint16 card, bool updateScreen) { -- cgit v1.2.3 From c7f3a4f578b86b54572500322cc55cf0893634c9 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sat, 14 May 2011 19:26:33 +0200 Subject: MOHAWK: Implement page drop button for Myst --- engines/mohawk/myst.cpp | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'engines/mohawk/myst.cpp') diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 44bfd16e12..4ee078cfc1 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -340,7 +340,13 @@ Common::Error MohawkEngine_Myst::run() { drawResourceRects(); break; case Common::KEYCODE_F5: + _needsPageDrop = false; runDialog(*_optionsDialog); + + if (_needsPageDrop) { + dropPage(); + _needsPageDrop = false; + } break; default: break; @@ -1178,4 +1184,39 @@ bool MohawkEngine_Myst::canSaveGameStateCurrently() { return false; } +void MohawkEngine_Myst::dropPage() { + uint16 page = _gameState->_globals.heldPage; + bool whitePage = page == 13; + bool bluePage = page - 1 < 6; + bool redPage = page - 7 < 6; + + // Drop page + _gameState->_globals.heldPage = 0; + + // Redraw page area + if (whitePage && _gameState->_globals.currentAge == 2) { + redrawArea(41); + } else if (bluePage) { + if (page == 6) { + if (_gameState->_globals.currentAge == 2) + redrawArea(24); + } else { + redrawArea(103); + } + } else if (redPage) { + if (page == 12) { + if (_gameState->_globals.currentAge == 2) + redrawArea(25); + } else if (page == 10) { + if (_gameState->_globals.currentAge == 1) + redrawArea(35); + } else { + redrawArea(102); + } + } + + setMainCursor(kDefaultMystCursor); + checkCursorHints(); +} + } // End of namespace Mohawk -- cgit v1.2.3 From d72037fb72b876b9cc0ca80d585a1a4939a68bd9 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sun, 15 May 2011 13:24:32 +0200 Subject: MOHAWK: Play a sound when dropping a page --- engines/mohawk/myst.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines/mohawk/myst.cpp') diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 4ee078cfc1..eedaa249ff 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -1190,6 +1190,9 @@ void MohawkEngine_Myst::dropPage() { bool bluePage = page - 1 < 6; bool redPage = page - 7 < 6; + // Play drop page sound + _sound->replaceSoundMyst(800); + // Drop page _gameState->_globals.heldPage = 0; -- cgit v1.2.3 From e0e28aaeb24983b0e0700b5e561f0d9c991bfb4a Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sun, 15 May 2011 14:53:05 +0200 Subject: MOHAWK: Implement "Show Map" feature for Myst ME --- engines/mohawk/myst.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'engines/mohawk/myst.cpp') diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index eedaa249ff..57d52d8394 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -341,12 +341,19 @@ Common::Error MohawkEngine_Myst::run() { break; case Common::KEYCODE_F5: _needsPageDrop = false; + _needsShowMap = false; + runDialog(*_optionsDialog); if (_needsPageDrop) { dropPage(); _needsPageDrop = false; } + + if (_needsShowMap) { + _scriptParser->showMap(); + _needsShowMap = false; + } break; default: break; -- cgit v1.2.3 From af9dc7a29cd982f73fb425776e6c5c0071df6912 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sun, 15 May 2011 17:22:09 +0200 Subject: MOHAWK: Display a black screen while changing stack. Default to an empty cursor. --- engines/mohawk/myst.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'engines/mohawk/myst.cpp') diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 57d52d8394..5a39b933e7 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -71,7 +71,8 @@ MohawkEngine_Myst::MohawkEngine_Myst(OSystem *syst, const MohawkGameDescription // original, including bugs, missing bits etc. :) _tweaksEnabled = true; - _currentCursor = _mainCursor = kDefaultMystCursor; + _currentCursor = 0; + _mainCursor = kDefaultMystCursor; _showResourceRects = false; _curCard = 0; _needsUpdate = false; @@ -415,6 +416,11 @@ void MohawkEngine_Myst::changeToStack(uint16 stack, uint16 card, uint16 linkSrcS _curStack = stack; + // Fill screen with black and empty cursor + _cursor->setCursor(0); + _system->fillScreen(_system->getScreenFormat().RGBToColor(0, 0, 0)); + _system->updateScreen(); + _sound->stopSound(); _sound->stopBackgroundMyst(); if (linkSrcSound) @@ -641,18 +647,18 @@ void MohawkEngine_Myst::changeToCard(uint16 card, bool updateScreen) { // TODO: Handle Script Resources - // Make sure we have the right cursor showing - _dragResource = 0; - _hoverResource = 0; - _curResource = -1; - checkCurrentResource(); - // Make sure the screen is updated if (updateScreen) { _gfx->copyBackBufferToScreen(Common::Rect(544, 333)); _system->updateScreen(); } + // Make sure we have the right cursor showing + _dragResource = 0; + _hoverResource = 0; + _curResource = -1; + checkCurrentResource(); + // Debug: Show resource rects if (_showResourceRects) drawResourceRects(); -- cgit v1.2.3 From 9f05f8805dfda0892b809e268c2c4869ca33d4ff Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sun, 15 May 2011 17:38:47 +0200 Subject: MOHAWK: Fix loading a Myst savegame from the launcher. --- engines/mohawk/myst.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/mohawk/myst.cpp') diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 5a39b933e7..432d1113b3 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -258,6 +258,9 @@ Common::Error MohawkEngine_Myst::run() { _cursor = new MystCursorManager(this); _rnd = new Common::RandomSource(); + // Cursor is visible by default + _cursor->showCursor(); + // Load game from launcher/command line if requested if (ConfMan.hasKey("save_slot") && canLoadGameStateCurrently()) { uint32 gameToLoad = ConfMan.getInt("save_slot"); @@ -286,9 +289,6 @@ Common::Error MohawkEngine_Myst::run() { // Test Load Function... loadHelp(10000); - // Set the cursor - _cursor->setCursor(_currentCursor); - Common::Event event; while (!shouldQuit()) { // Update any background videos -- cgit v1.2.3 From 9ac184bfba36ff35191abb39fa0481f528ae7edb Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 17 May 2011 12:02:53 +0200 Subject: MOHAWK: Name the RandomSource used for myst --- engines/mohawk/myst.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/mohawk/myst.cpp') diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 432d1113b3..4f9c3a893e 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -256,7 +256,7 @@ Common::Error MohawkEngine_Myst::run() { _loadDialog->setSaveMode(false); _optionsDialog = new MystOptionsDialog(this); _cursor = new MystCursorManager(this); - _rnd = new Common::RandomSource(); + _rnd = new Common::RandomSource("myst"); // Cursor is visible by default _cursor->showCursor(); -- cgit v1.2.3