diff options
| author | Filippos Karapetis | 2015-02-17 11:23:22 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2015-12-15 00:05:02 +0100 |
| commit | 4f185f7dd6f82c86ab9b66fc10209fa966654806 (patch) | |
| tree | 9af77edb544baa6cbecdf769c1a6954c9f3b87d8 | |
| parent | 7f80a4ff63f5314d3f9b13d124c279e18ca06d73 (diff) | |
| download | scummvm-rg350-4f185f7dd6f82c86ab9b66fc10209fa966654806.tar.gz scummvm-rg350-4f185f7dd6f82c86ab9b66fc10209fa966654806.tar.bz2 scummvm-rg350-4f185f7dd6f82c86ab9b66fc10209fa966654806.zip | |
LAB: Further fixes to signed/unsigned comparisons and bool assignments
| -rw-r--r-- | engines/lab/special.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp index 038f8b88b6..abdbc735d3 100644 --- a/engines/lab/special.cpp +++ b/engines/lab/special.cpp @@ -126,7 +126,7 @@ static void doCombination(void) { } -extern char *TempScrollData; +extern byte *TempScrollData; /*****************************************************************************/ /* Reads in a backdrop picture. */ @@ -245,7 +245,7 @@ void mouseCombination(uint16 x, uint16 y) { /*----------------------------------------------------------------------------*/ Image *Tiles[16]; -int16 CurTile[4] [4] = { +uint16 CurTile[4] [4] = { { 1, 5, 9, 13 }, { 2, 6, 10, 14 }, { 3, 7, 11, 15 }, @@ -1338,7 +1338,7 @@ static bool processSaveLoad() { if (((Class == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & Qualifier)) || ((Class == RAWKEY) && (Code == 27))) - return -1; + return true; if (Class == RAWKEY) { if (Code == 'l' || Code == 'L') { @@ -1422,7 +1422,7 @@ static bool processSaveLoad() { break; case ID_CANCEL: - return -1; + return true; } } } |