thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LAB: Make consistent the type of pen number

Browse source
This commit is contained in:
Strangerke 2015-11-30 02:09:54 +01:00 • committed by Willem Jan Palenstijn
parent 6cee2eb2be
commit 11df8b5cf7
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/lab/graphics.cpp
View file

@ -225,8 +225,8 @@ static void getLine(TextFont *tf, char *LineBuffer, const char **MainBuffer, uin
/******************************************************************************/ /******************************************************************************/
uint32 flowText(void *font, /* the TextAttr pointer */ uint32 flowText(void *font, /* the TextAttr pointer */
int16 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 */ byte pencolor, /* pen number to use for text */
uint16 backpen, /* the background color */ byte backpen, /* the background color */
bool fillback, /* Whether to fill the background */ bool fillback, /* Whether to fill the background */
bool centerh, /* Whether to center the text horizontally */ bool centerh, /* Whether to center the text horizontally */
bool centerv, /* Whether to center the text vertically */ 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 */ uint32 flowTextToMem(Image *DestIm, void *font, /* the TextAttr pointer */
int16 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 */ byte pencolor, /* pen number to use for text */
uint16 backpen, /* the background color */ byte backpen, /* the background color */
bool fillback, /* Whether to fill the background */ bool fillback, /* Whether to fill the background */
bool centerh, /* Whether to center the text horizontally */ bool centerh, /* Whether to center the text horizontally */
bool centerv, /* Whether to center the text vertically */ bool centerv, /* Whether to center the text vertically */

2
engines/lab/intro.cpp
View file

@ -115,7 +115,7 @@ void Intro::doPictText(const char *filename, bool isscreen) {
fade(false, 0); fade(false, 0);
if (isscreen) { if (isscreen) {
g_lab->setAPen(7L); g_lab->setAPen(7);
g_lab->rectFill(VGAScaleX(10), VGAScaleY(10), VGAScaleX(310), VGAScaleY(190)); 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); Drawn = flowText(_msgfont, (!g_lab->_isHiRes) * -1, 5, 7, false, false, true, true, VGAScaleX(14), VGAScaleY(11), VGAScaleX(306), VGAScaleY(189), (char *)curplace);

2
engines/lab/lab.h
View file

@ -125,7 +125,7 @@ private:
public: public:
void waitTOF(); void waitTOF();
void setAPen(uint16 pennum); void setAPen(byte pennum);
void writeColorRegs(byte *buf, uint16 first, uint16 numreg); void writeColorRegs(byte *buf, uint16 first, uint16 numreg);
byte *getVGABaseAddr(); byte *getVGABaseAddr();
void readScreenImage(Image *Im, uint16 x, uint16 y); void readScreenImage(Image *Im, uint16 x, uint16 y);

8
engines/lab/labfun.h
View file

@ -80,8 +80,8 @@ byte *readPictToMem(const char *filename, uint16 x, uint16 y);
uint32 flowText(void *font, /* the TextAttr pointer */ uint32 flowText(void *font, /* the TextAttr pointer */
int16 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 */ byte pencolor, /* pen number to use for text */
uint16 backpen, /* the background color */ byte backpen, /* the background color */
bool fillback, /* Whether to fill the background */ bool fillback, /* Whether to fill the background */
bool centerh, /* Whether to center the text horizontally */ bool centerh, /* Whether to center the text horizontally */
bool centerv, /* Whether to center the text vertically */ 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 */ uint32 flowTextToMem(Image *DestIm, void *font, /* the TextAttr pointer */
int16 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 */ byte pencolor, /* pen number to use for text */
uint16 backpen, /* the background color */ byte backpen, /* the background color */
bool fillback, /* Whether to fill the background */ bool fillback, /* Whether to fill the background */
bool centerh, /* Whether to center the text horizontally */ bool centerh, /* Whether to center the text horizontally */
bool centerv, /* Whether to center the text vertically */ bool centerv, /* Whether to center the text vertically */

4
engines/lab/vga.cpp
View file

@ -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. */ /* Sets the pen number to use on all the drawing operations. */
/*****************************************************************************/ /*****************************************************************************/
void LabEngine::setAPen(uint16 pennum) { void LabEngine::setAPen(byte pennum) {
_curapen = (unsigned char)pennum; _curapen = pennum;
} }
/*****************************************************************************/ /*****************************************************************************/