diff options
| -rw-r--r-- | engines/sci/graphics/controls.cpp | 12 | ||||
| -rw-r--r-- | engines/sci/graphics/paint16.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/ports.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/text16.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/graphics/text16.h | 2 | 
5 files changed, 11 insertions, 11 deletions
| diff --git a/engines/sci/graphics/controls.cpp b/engines/sci/graphics/controls.cpp index 66376a793c..f42946fbea 100644 --- a/engines/sci/graphics/controls.cpp +++ b/engines/sci/graphics/controls.cpp @@ -78,9 +78,9 @@ void GfxControls::drawListControl(Common::Rect rect, reg_t obj, int16 maxChars,  	// They "fixed" this in SQ4 by having the arrow character start one pixel line later, we don't adjust there  	if (g_sci->getGameId() != GID_SQ4)  		workerRect.top++; -	_text16->Box(controlListUpArrow, 0, workerRect, SCI_TEXT16_ALIGNMENT_CENTER, 0); +	_text16->Box(controlListUpArrow, false, workerRect, SCI_TEXT16_ALIGNMENT_CENTER, 0);  	workerRect.top = workerRect.bottom - 10; -	_text16->Box(controlListDownArrow, 0, workerRect, SCI_TEXT16_ALIGNMENT_CENTER, 0); +	_text16->Box(controlListDownArrow, false, workerRect, SCI_TEXT16_ALIGNMENT_CENTER, 0);  	// Draw inner lines  	workerRect.top = rect.top + 9; @@ -261,7 +261,7 @@ void GfxControls::kernelTexteditChange(reg_t controlObject, reg_t eventObject) {  			g_sci->getVocabulary()->checkAltInput(text, cursorPos);  		texteditCursorErase();  		_paint16->eraseRect(rect); -		_text16->Box(text.c_str(), 0, rect, SCI_TEXT16_ALIGNMENT_LEFT, -1); +		_text16->Box(text.c_str(), false, rect, SCI_TEXT16_ALIGNMENT_LEFT, -1);  		_paint16->bitsShow(rect);  		texteditCursorDraw(rect, text.c_str(), cursorPos);  		_text16->SetFont(oldFontId); @@ -300,7 +300,7 @@ void GfxControls::kernelDrawButton(Common::Rect rect, reg_t obj, const char *tex  		_paint16->frameRect(rect);  		rect.grow(-2);  		_ports->textGreyedOutput(style & 1 ? false : true); -		_text16->Box(text, 0, rect, SCI_TEXT16_ALIGNMENT_CENTER, fontId); +		_text16->Box(text, false, rect, SCI_TEXT16_ALIGNMENT_CENTER, fontId);  		_ports->textGreyedOutput(false);  		rect.grow(1);  		if (style & SCI_CONTROLS_STYLE_SELECTED) @@ -328,7 +328,7 @@ void GfxControls::kernelDrawText(Common::Rect rect, reg_t obj, const char *text,  		rect.grow(1);  		_paint16->eraseRect(rect);  		rect.grow(-1); -		_text16->Box(text, 0, rect, alignment, fontId); +		_text16->Box(text, false, rect, alignment, fontId);  		if (style & SCI_CONTROLS_STYLE_SELECTED) {  			_paint16->frameRect(rect);  		} @@ -349,7 +349,7 @@ void GfxControls::kernelDrawTextEdit(Common::Rect rect, reg_t obj, const char *t  	_texteditCursorVisible = false;  	texteditCursorErase();  	_paint16->eraseRect(rect); -	_text16->Box(text, 0, textRect, SCI_TEXT16_ALIGNMENT_LEFT, fontId); +	_text16->Box(text, false, textRect, SCI_TEXT16_ALIGNMENT_LEFT, fontId);  	_paint16->frameRect(rect);  	if (style & SCI_CONTROLS_STYLE_SELECTED) {  		_text16->SetFont(fontId); diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp index 9030e1afbe..0bb3fc85c5 100644 --- a/engines/sci/graphics/paint16.cpp +++ b/engines/sci/graphics/paint16.cpp @@ -594,7 +594,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {  		result = bitsSave(rect, GFX_SCREEN_MASK_VISUAL);  	if (colorBack != -1)  		fillRect(rect, GFX_SCREEN_MASK_VISUAL, colorBack, 0, 0); -	_text16->Box(text, 0, rect, alignment, -1); +	_text16->Box(text, false, rect, alignment, -1);  	if (_screen->_picNotValid == 0 && bRedraw)  		bitsShow(rect);  	// restoring port and cursor pos diff --git a/engines/sci/graphics/ports.cpp b/engines/sci/graphics/ports.cpp index 94c5e05b7d..87f0c3d6a2 100644 --- a/engines/sci/graphics/ports.cpp +++ b/engines/sci/graphics/ports.cpp @@ -415,7 +415,7 @@ void GfxPorts::drawWindow(Window *pWnd) {  				if (!pWnd->title.empty()) {  					int16 oldcolor = getPort()->penClr;  					penColor(_screen->getColorWhite()); -					_text16->Box(pWnd->title.c_str(), 1, r, SCI_TEXT16_ALIGNMENT_CENTER, 0); +					_text16->Box(pWnd->title.c_str(), true, r, SCI_TEXT16_ALIGNMENT_CENTER, 0);  					penColor(oldcolor);  				} diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp index 17ad59e35a..21605ccb8e 100644 --- a/engines/sci/graphics/text16.cpp +++ b/engines/sci/graphics/text16.cpp @@ -403,7 +403,7 @@ void GfxText16::Show(const char *text, int16 from, int16 len, GuiResourceId orgF  }  // Draws a text in rect. -void GfxText16::Box(const char *text, int16 bshow, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId) { +void GfxText16::Box(const char *text, bool show, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId) {  	int16 textWidth, maxTextWidth, textHeight, charCount;  	int16 offset = 0;  	int16 hline = 0; @@ -448,7 +448,7 @@ void GfxText16::Box(const char *text, int16 bshow, const Common::Rect &rect, Tex  		}  		_ports->moveTo(rect.left + offset, rect.top + hline); -		if (bshow) { +		if (show) {  			Show(text, 0, charCount, fontId, previousPenColor);  		} else {  			Draw(text, 0, charCount, fontId, previousPenColor); diff --git a/engines/sci/graphics/text16.h b/engines/sci/graphics/text16.h index 19c95f3f13..3ed2361497 100644 --- a/engines/sci/graphics/text16.h +++ b/engines/sci/graphics/text16.h @@ -62,7 +62,7 @@ public:  	int16 Size(Common::Rect &rect, const char *text, GuiResourceId fontId, int16 maxWidth);  	void Draw(const char *text, int16 from, int16 len, GuiResourceId orgFontId, int16 orgPenColor);  	void Show(const char *text, int16 from, int16 len, GuiResourceId orgFontId, int16 orgPenColor); -	void Box(const char *text, int16 bshow, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId); +	void Box(const char *text, bool show, const Common::Rect &rect, TextAlignment alignment, GuiResourceId fontId);  	void DrawString(const char *text);  	void DrawStatus(const char *text); | 
