diff options
| author | Filippos Karapetis | 2015-02-17 11:17:59 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2015-12-15 00:05:02 +0100 |
| commit | f9d90934f6e281f40b52ad561d339f26d7d9c0e9 (patch) | |
| tree | e06f295234321c990b62b1a4472da2a2116b90b9 | |
| parent | 80e00c1f54a0d5747156ada22b6daafbf252e833 (diff) | |
| download | scummvm-rg350-f9d90934f6e281f40b52ad561d339f26d7d9c0e9.tar.gz scummvm-rg350-f9d90934f6e281f40b52ad561d339f26d7d9c0e9.tar.bz2 scummvm-rg350-f9d90934f6e281f40b52ad561d339f26d7d9c0e9.zip | |
LAB: Fix signed/unsigned comparison warnings
| -rw-r--r-- | engines/lab/graphics.cpp | 4 | ||||
| -rw-r--r-- | engines/lab/labfile.cpp | 2 | ||||
| -rw-r--r-- | engines/lab/labfun.h | 4 | ||||
| -rw-r--r-- | engines/lab/mouse.cpp | 4 | ||||
| -rw-r--r-- | engines/lab/vga.cpp | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/engines/lab/graphics.cpp b/engines/lab/graphics.cpp index 3d91fd4197..2a43dfe064 100644 --- a/engines/lab/graphics.cpp +++ b/engines/lab/graphics.cpp @@ -242,7 +242,7 @@ static void getLine(TextFont *tf, char *LineBuffer, const char **MainBuffer, uin /* each line less than 255 characters. */ /******************************************************************************/ uint32 flowText(void *font, /* the TextAttr pointer */ - uint16 spacing, /* How much vertical spacing between the lines */ + int16 spacing, /* How much vertical spacing between the lines */ uint16 pencolor, /* pen number to use for text */ uint16 backpen, /* the background color */ bool fillback, /* Whether to fill the background */ @@ -314,7 +314,7 @@ extern byte *VGABASEADDRESS; /* Calls flowText, but flows it to memory. Same restrictions as flowText. */ /******************************************************************************/ uint32 flowTextToMem(Image *DestIm, void *font, /* the TextAttr pointer */ - uint16 spacing, /* How much vertical spacing between the lines */ + int16 spacing, /* How much vertical spacing between the lines */ uint16 pencolor, /* pen number to use for text */ uint16 backpen, /* the background color */ bool fillback, /* Whether to fill the background */ diff --git a/engines/lab/labfile.cpp b/engines/lab/labfile.cpp index 63cc62652f..2f9355444f 100644 --- a/engines/lab/labfile.cpp +++ b/engines/lab/labfile.cpp @@ -45,7 +45,7 @@ static byte *buffer = NULL, *realbufferstart = NULL, *startoffilestorage = NULL; byte **startoffile = &startoffilestorage; static uint32 buffersize, realbuffersize; -uint32 ReadSoFar; +int32 ReadSoFar; bool ReadIsError, ReadIsDone; /*****************************************************************************/ diff --git a/engines/lab/labfun.h b/engines/lab/labfun.h index 6f304d0f9b..bb2ddf81e6 100644 --- a/engines/lab/labfun.h +++ b/engines/lab/labfun.h @@ -92,7 +92,7 @@ byte *readPictToMem(const char *filename, uint16 x, uint16 y); /* Window text stuff */ uint32 flowText(void *font, /* the TextAttr pointer */ - uint16 spacing, /* How much vertical spacing between the lines */ + int16 spacing, /* How much vertical spacing between the lines */ uint16 pencolor, /* pen number to use for text */ uint16 backpen, /* the background color */ bool fillback, /* Whether to fill the background */ @@ -103,7 +103,7 @@ uint32 flowText(void *font, /* the TextAttr pointer */ uint16 y1, uint16 x2, uint16 y2, const char *text); /* The text itself */ uint32 flowTextToMem(Image *DestIm, void *font, /* the TextAttr pointer */ - uint16 spacing, /* How much vertical spacing between the lines */ + int16 spacing, /* How much vertical spacing between the lines */ uint16 pencolor, /* pen number to use for text */ uint16 backpen, /* the background color */ bool fillback, /* Whether to fill the background */ diff --git a/engines/lab/mouse.cpp b/engines/lab/mouse.cpp index 21f0f3d641..1b00c15146 100644 --- a/engines/lab/mouse.cpp +++ b/engines/lab/mouse.cpp @@ -298,8 +298,8 @@ void mouseHideXY(void) { -extern int g_MouseX; -extern int g_MouseY; +extern uint32 g_MouseX; +extern uint32 g_MouseY; /*****************************************************************************/ /* Gets the current mouse co-ordinates. NOTE: On IBM version, will scale */ diff --git a/engines/lab/vga.cpp b/engines/lab/vga.cpp index d2fa002e16..11713da130 100644 --- a/engines/lab/vga.cpp +++ b/engines/lab/vga.cpp @@ -54,8 +54,8 @@ int g_ScreenWasLocked = 0; int g_IgnoreUpdateDisplay = 0; int g_LastWaitTOFTicks = 0; -int g_MouseX = 0; -int g_MouseY = 0; +uint32 g_MouseX = 0; +uint32 g_MouseY = 0; uint16 g_NextKeyIn = 0; uint16 g_KeyBuf[64]; |