diff options
| author | Paul Gilbert | 2011-12-30 22:27:14 +1100 |
|---|---|---|
| committer | Strangerke | 2012-04-06 08:18:49 +0200 |
| commit | b4934ea1bf3cdb6703749b33dddf758d8a399e0b (patch) | |
| tree | 4d39947eb18ad0c65793be2ccd21d29d25149dab /engines/mortevielle/mouse.cpp | |
| parent | c1ead19c5d68df4d4acb52426162cd67e84d003b (diff) | |
| download | scummvm-rg350-b4934ea1bf3cdb6703749b33dddf758d8a399e0b.tar.gz scummvm-rg350-b4934ea1bf3cdb6703749b33dddf758d8a399e0b.tar.bz2 scummvm-rg350-b4934ea1bf3cdb6703749b33dddf758d8a399e0b.zip | |
MORTEVIELLE: Compilation fixes and extern prefixes to header file method declarations
Diffstat (limited to 'engines/mortevielle/mouse.cpp')
| -rw-r--r-- | engines/mortevielle/mouse.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
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; |