thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ACCESS: MM - Hook scroll functions in takePicture

Browse source
This commit is contained in:
Strangerke 2015-02-05 06:42:58 +01:00
parent 452c5e59c5
commit 852a6b3e81
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/access/player.h
View file

@ -74,10 +74,6 @@ protected:
void walkUpRight(); void walkUpRight();
void walkDownRight(); void walkDownRight();
void checkScrollUp(); void checkScrollUp();
bool scrollUp();
bool scrollDown();
bool scrollLeft();
bool scrollRight();
public: public:
Direction _playerDirection; Direction _playerDirection;
SpriteResource *_playerSprites; SpriteResource *_playerSprites;
@ -139,6 +135,10 @@ public:
void calcPlayer(); void calcPlayer();
bool scrollUp();
bool scrollDown();
bool scrollLeft();
bool scrollRight();
void checkScroll(); void checkScroll();
void checkMove(); void checkMove();

10
engines/access/room.cpp
View file

@ -104,7 +104,6 @@ void Room::takePicture() {
int result = _vm->_events->checkMouseBox1(pictureCoords); int result = _vm->_events->checkMouseBox1(pictureCoords);
if (result == 4) { if (result == 4) {
warning("TODO case 4");
_vm->_events->debounceLeft(); _vm->_events->debounceLeft();
if (_vm->_inventory->_inv[44]._value != ITEM_IN_INVENTORY) { if (_vm->_inventory->_inv[44]._value != ITEM_IN_INVENTORY) {
Common::String msg = "YOU HAVE NO MORE FILM."; Common::String msg = "YOU HAVE NO MORE FILM.";
@ -149,14 +148,13 @@ void Room::takePicture() {
_vm->_player->_scrollFlag = false; _vm->_player->_scrollFlag = false;
if (_vm->_player->_move == UP) if (_vm->_player->_move == UP)
warning("TODO: loc_163E9 2"); _vm->_player->scrollDown();
else if (_vm->_player->_move == DOWN) else if (_vm->_player->_move == DOWN)
warning("TODO: loc_1644A 2"); _vm->_player->scrollUp();
else if (_vm->_player->_move == LEFT) else if (_vm->_player->_move == LEFT)
warning("TODO: loc_1631E 2"); _vm->_player->scrollRight();
else if (_vm->_player->_move == RIGHT) else if (_vm->_player->_move == RIGHT)
warning("TODO: loc_1637F 2"); _vm->_player->scrollLeft();
else return;
} }
void Room::doRoom() { void Room::doRoom() {