From b3ab8a42a6bf77d99b6b349793f1fa7393359d24 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 16 Aug 2014 09:35:38 -0400 Subject: ACCESS: Implementing doCommand --- engines/access/amazon/amazon_game.cpp | 2 +- engines/access/amazon/amazon_room.cpp | 7 ++++++- engines/access/amazon/amazon_room.h | 6 ++++-- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'engines/access/amazon') diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp index 0497dd8d4d..36d6d80e47 100644 --- a/engines/access/amazon/amazon_game.cpp +++ b/engines/access/amazon/amazon_game.cpp @@ -176,7 +176,7 @@ void AmazonEngine::setupGame() { _player->_roomNumber = 4; _player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0]; _player->_playerY = _player->_rawPlayer.y = TRAVEL_POS[_player->_roomNumber][1]; - _selectCommand = -1; + _room->_selectCommand = -1; } } // End of namespace Amazon diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp index 5cb1dfe59c..cb6c8140ef 100644 --- a/engines/access/amazon/amazon_room.cpp +++ b/engines/access/amazon/amazon_room.cpp @@ -22,6 +22,7 @@ #include "common/scummsys.h" #include "access/access.h" +#include "access/resources.h" #include "access/amazon/amazon_resources.h" #include "access/amazon/amazon_room.h" @@ -78,7 +79,7 @@ void AmazonRoom::reloadRoom1() { _vm->_currentCharFlag = false; } - _vm->_selectCommand = -1; + _selectCommand = -1; _vm->_normalMouse = 1; _vm->_mouseMode = 0; _vm->_boxSelect = true; @@ -138,6 +139,10 @@ void AmazonRoom::roomMenu() { delete spr; } +void AmazonRoom::mainAreaClick() { + +} + } // End of namespace Amazon } // End of namespace Access diff --git a/engines/access/amazon/amazon_room.h b/engines/access/amazon/amazon_room.h index 546ea9698a..838b108fb5 100644 --- a/engines/access/amazon/amazon_room.h +++ b/engines/access/amazon/amazon_room.h @@ -38,14 +38,16 @@ private: const byte *_icon; void roomSet(); - - void roomMenu(); protected: virtual void loadRoom(int roomNumber); virtual void reloadRoom(); virtual void reloadRoom1(); + + virtual void roomMenu(); + + virtual void mainAreaClick(); public: AmazonRoom(AccessEngine *vm); -- cgit v1.2.3