ACCESS: MM - Hook scroll functions in takePicture

scummvm · Feb 5, 2015 · 852a6b3 · 852a6b3
1 parent 452c5e5
commit 852a6b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/engines/access/player.h b/engines/access/player.h
@@ -74,10 +74,6 @@ class Player : public ImageEntry, public Manager {
 	void walkUpRight();
 	void walkDownRight();
 	void checkScrollUp();
-	bool scrollUp();
-	bool scrollDown();
-	bool scrollLeft();
-	bool scrollRight();
 public:
 	Direction _playerDirection;
 	SpriteResource *_playerSprites;
@@ -139,6 +135,10 @@ class Player : public ImageEntry, public Manager {
 
 	void calcPlayer();
 
+	bool scrollUp();
+	bool scrollDown();
+	bool scrollLeft();
+	bool scrollRight();
 	void checkScroll();
 
 	void checkMove();

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