Merge branch 'master' into mm

Conflicts:
	engines/access/access.cpp
	engines/access/asurface.h
	engines/access/bubble_box.cpp
	engines/access/bubble_box.h
	engines/access/martian/martian_game.cpp
	engines/access/player.cpp
	engines/access/player.h
	engines/access/resources.cpp
	engines/access/screen.cpp
	engines/access/screen.h
	engines/access/sound.cpp
	engines/access/sound.h

1 files changed, 12 insertions, 7 deletions

diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp
index de4dc3c070..7ba9098935 100644
--- a/engines/mads/events.cpp
+++ b/engines/mads/events.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -41,10 +41,9 @@ EventsManager::EventsManager(MADSEngine *vm) {
 	_mouseReleased = false;
 	_mouseButtons = 0;
 	_mouseStatus = 0;
-	_vD2 = 0;
+	_strokeGoing = 0;
 	_mouseStatusCopy = 0;
 	_mouseMoved = false;
-	_vD8 = 0;
 	_rightMousePressed = false;
 	_eventTarget = nullptr;
 }
@@ -85,8 +84,8 @@ void EventsManager::waitCursor() {
 	CursorType cursorId = (CursorType)MIN(_cursorSprites->getCount(), (int)CURSOR_WAIT);
 	_newCursorId = cursorId;
 	if (_cursorId != _newCursorId) {
-		changeCursor();
 		_cursorId = _newCursorId;
+		changeCursor();
 	}
 }
 
@@ -158,11 +157,17 @@ void EventsManager::pollEvents() {
 				_vm->_debugger->attach();
 				_vm->_debugger->onFrame();
 			} else {
-				_pendingKeys.push(event);
+				_pendingKeys.push(event.kbd);
 			}
 			return;
 		case Common::EVENT_KEYUP:
 			return;
+		case Common::EVENT_WHEELUP:
+			_pendingKeys.push(Common::KeyState(Common::KEYCODE_PAGEUP));
+			return;
+		case Common::EVENT_WHEELDOWN:
+			_pendingKeys.push(Common::KeyState(Common::KEYCODE_PAGEDOWN));
+			return;
 		case Common::EVENT_LBUTTONDOWN:
 		case Common::EVENT_RBUTTONDOWN:
 			_mouseClicked = true;
@@ -261,7 +266,7 @@ void EventsManager::waitForNextFrame() {
 void EventsManager::initVars() {
 	_mousePos = Common::Point(-1, -1);
 	_mouseStatusCopy = _mouseStatus;
-	_vD2 = _vD8 = 0;
+	_strokeGoing = 0;
 }
 
 } // End of namespace MADS