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, 2 insertions, 2 deletions

diff --git a/engines/pegasus/menu.cpp b/engines/pegasus/menu.cpp
index 4bbda8fd93..3e9bf540fe 100644
--- a/engines/pegasus/menu.cpp
+++ b/engines/pegasus/menu.cpp
@@ -258,12 +258,12 @@ void MainMenu::handleInput(const Input &input, const Hotspot *cursorSpot) {
 	bool isDemo = vm->isDemo();
 
 	if (input.upButtonDown()) {
-		if (_menuSelection > (isDemo ? kFirstSelectionDemo : kFirstSelection)) {
+		if (_menuSelection > (uint32)(isDemo ? kFirstSelectionDemo : kFirstSelection)) {
 			_menuSelection--;
 			updateDisplay();
 		}
 	} else if (input.downButtonDown()) {
-		if (_menuSelection < (isDemo ? kLastSelectionDemo : kLastSelection)) {
+		if (_menuSelection < (uint32)(isDemo ? kLastSelectionDemo : kLastSelection)) {
 			_menuSelection++;
 			updateDisplay();
 		}