From b4934ea1bf3cdb6703749b33dddf758d8a399e0b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 30 Dec 2011 22:27:14 +1100
Subject: MORTEVIELLE: Compilation fixes and extern prefixes to header file
 method declarations

---
 engines/mortevielle/mouse.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'engines/mortevielle/mouse.cpp')

diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index 791920f845..a6b1768b96 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -336,7 +336,7 @@ void mov_mouse(bool &funct, char &key) {
 	while (p_key) {
 		input >> kbd >> in1;
 		read_pos_mouse(cx, cy, cd);
-		switch (upcase(in1)) {
+		switch (toupper(in1)) {
 		case '4' :
 			cx = cx - 8;
 			break;
@@ -382,6 +382,13 @@ void mov_mouse(bool &funct, char &key) {
 		break;
 		case '\33' : {
 			p_key = keypressed();
+
+			if ((p_key >= ';') && (p_key <= 'D')) {
+				funct = true;
+				key = in2;
+				return;
+			}
+
 			if (p_key) {
 				input >> kbd >> in2;
 				switch (in2) {
@@ -397,12 +404,6 @@ void mov_mouse(bool &funct, char &key) {
 				case 'H' :
 					cy = pred(int, cy);
 					break;
-				case RANGE_10(';', 'D') : {
-					funct = true;
-					key = in2;
-					return;
-				}
-				break;
 				case 'G' : {
 					cx = cx - 1;
 					cy = cy - 1;
-- 
cgit v1.2.3