diff options
| author | Strangerke | 2015-11-30 02:09:54 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:33:44 +0100 |
| commit | 11df8b5cf76bf9e3bbdbb5b264ec318d0e7e2911 (patch) | |
| tree | 55daa07f639b441e9cff43486e7dc962dd420884 /engines | |
| parent | 6cee2eb2be4e6977d659a47809a91454532c0f11 (diff) | |
| download | scummvm-rg350-11df8b5cf76bf9e3bbdbb5b264ec318d0e7e2911.tar.gz scummvm-rg350-11df8b5cf76bf9e3bbdbb5b264ec318d0e7e2911.tar.bz2 scummvm-rg350-11df8b5cf76bf9e3bbdbb5b264ec318d0e7e2911.zip | |
LAB: Make consistent the type of pen number
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lab/graphics.cpp | 8 | ||||
| -rw-r--r-- | engines/lab/intro.cpp | 2 | ||||
| -rw-r--r-- | engines/lab/lab.h | 2 | ||||
| -rw-r--r-- | engines/lab/labfun.h | 8 | ||||
| -rw-r--r-- | engines/lab/vga.cpp | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/engines/lab/graphics.cpp b/engines/lab/graphics.cpp index 9f689bd57c..54bf8809d1 100644 --- a/engines/lab/graphics.cpp +++ b/engines/lab/graphics.cpp @@ -225,8 +225,8 @@ static void getLine(TextFont *tf, char *LineBuffer, const char **MainBuffer, uin /******************************************************************************/ uint32 flowText(void *font, /* the TextAttr pointer */ int16 spacing, /* How much vertical spacing between the lines */ - uint16 pencolor, /* pen number to use for text */ - uint16 backpen, /* the background color */ + byte pencolor, /* pen number to use for text */ + byte backpen, /* the background color */ bool fillback, /* Whether to fill the background */ bool centerh, /* Whether to center the text horizontally */ bool centerv, /* Whether to center the text vertically */ @@ -292,8 +292,8 @@ uint32 flowText(void *font, /* the TextAttr pointer */ /******************************************************************************/ uint32 flowTextToMem(Image *DestIm, void *font, /* the TextAttr pointer */ int16 spacing, /* How much vertical spacing between the lines */ - uint16 pencolor, /* pen number to use for text */ - uint16 backpen, /* the background color */ + byte pencolor, /* pen number to use for text */ + byte backpen, /* the background color */ bool fillback, /* Whether to fill the background */ bool centerh, /* Whether to center the text horizontally */ bool centerv, /* Whether to center the text vertically */ diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp index 36137becf5..7660b29a58 100644 --- a/engines/lab/intro.cpp +++ b/engines/lab/intro.cpp @@ -115,7 +115,7 @@ void Intro::doPictText(const char *filename, bool isscreen) { fade(false, 0); if (isscreen) { - g_lab->setAPen(7L); + g_lab->setAPen(7); g_lab->rectFill(VGAScaleX(10), VGAScaleY(10), VGAScaleX(310), VGAScaleY(190)); Drawn = flowText(_msgfont, (!g_lab->_isHiRes) * -1, 5, 7, false, false, true, true, VGAScaleX(14), VGAScaleY(11), VGAScaleX(306), VGAScaleY(189), (char *)curplace); diff --git a/engines/lab/lab.h b/engines/lab/lab.h index 3c621137a9..2e23ee3a71 100644 --- a/engines/lab/lab.h +++ b/engines/lab/lab.h @@ -125,7 +125,7 @@ private: public: void waitTOF(); - void setAPen(uint16 pennum); + void setAPen(byte pennum); void writeColorRegs(byte *buf, uint16 first, uint16 numreg); byte *getVGABaseAddr(); void readScreenImage(Image *Im, uint16 x, uint16 y); diff --git a/engines/lab/labfun.h b/engines/lab/labfun.h index d20db110a0..77a259a470 100644 --- a/engines/lab/labfun.h +++ b/engines/lab/labfun.h @@ -80,8 +80,8 @@ byte *readPictToMem(const char *filename, uint16 x, uint16 y); uint32 flowText(void *font, /* the TextAttr pointer */ int16 spacing, /* How much vertical spacing between the lines */ - uint16 pencolor, /* pen number to use for text */ - uint16 backpen, /* the background color */ + byte pencolor, /* pen number to use for text */ + byte backpen, /* the background color */ bool fillback, /* Whether to fill the background */ bool centerh, /* Whether to center the text horizontally */ bool centerv, /* Whether to center the text vertically */ @@ -91,8 +91,8 @@ uint32 flowText(void *font, /* the TextAttr pointer */ uint32 flowTextToMem(Image *DestIm, void *font, /* the TextAttr pointer */ int16 spacing, /* How much vertical spacing between the lines */ - uint16 pencolor, /* pen number to use for text */ - uint16 backpen, /* the background color */ + byte pencolor, /* pen number to use for text */ + byte backpen, /* the background color */ bool fillback, /* Whether to fill the background */ bool centerh, /* Whether to center the text horizontally */ bool centerv, /* Whether to center the text vertically */ diff --git a/engines/lab/vga.cpp b/engines/lab/vga.cpp index c7252d4ee5..d3071649c4 100644 --- a/engines/lab/vga.cpp +++ b/engines/lab/vga.cpp @@ -524,8 +524,8 @@ void LabEngine::scrollDisplayY(int16 dy, uint16 x1, uint16 y1, uint16 x2, uint16 /*****************************************************************************/ /* Sets the pen number to use on all the drawing operations. */ /*****************************************************************************/ -void LabEngine::setAPen(uint16 pennum) { - _curapen = (unsigned char)pennum; +void LabEngine::setAPen(byte pennum) { + _curapen = pennum; } /*****************************************************************************/ |