[Scummvm-git-logs] scummvm master -> d139d65c8020f92a96e41d4c05972a2a00bbd7a0
bluegr
bluegr at gmail.com
Sun Aug 20 17:03:07 CEST 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d139d65c80 SAGA: Fix the conversation panel background color in IHNM
Commit: d139d65c8020f92a96e41d4c05972a2a00bbd7a0
https://github.com/scummvm/scummvm/commit/d139d65c8020f92a96e41d4c05972a2a00bbd7a0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2017-08-20T18:02:37+03:00
Commit Message:
SAGA: Fix the conversation panel background color in IHNM
Changed paths:
engines/saga/interface.cpp
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 9dcc8d9..e6b196c 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -2533,10 +2533,12 @@ void Interface::converseDisplayTextLines() {
char bullet[2] = {
(char)0xb7, 0
};
- Rect rect(8, _vm->getDisplayInfo().converseTextLines * _vm->getDisplayInfo().converseTextHeight);
- Point textPoint;
assert(_conversePanel.buttonsCount >= 6);
+ Rect rect(8, _vm->getDisplayInfo().converseTextLines * _vm->getDisplayInfo().converseTextHeight);
+ rect.moveTo(_conversePanel.x + _conversePanel.buttons[0].xOffset, _conversePanel.y + _conversePanel.buttons[0].yOffset);
+
+ Point textPoint;
if (_vm->getGameId() == GID_ITE) {
bulletForegnd = kITEColorGreen;
@@ -2547,13 +2549,11 @@ void Interface::converseDisplayTextLines() {
bullet[0] = '>'; // different bullet in IHNM
}
- rect.moveTo(_conversePanel.x + _conversePanel.buttons[0].xOffset,
- _conversePanel.y + _conversePanel.buttons[0].yOffset);
-
if (_vm->getGameId() == GID_ITE)
- _vm->_gfx->drawRect(rect, kITEColorDarkGrey); //fill bullet place
- else
- _vm->_gfx->drawRect(rect, _vm->KnownColor2ColorId(kKnownColorBlack)); //fill bullet place
+ _vm->_gfx->drawRect(rect, kITEColorDarkGrey); // fill bullet place
+ else if (_vm->getGameId() == GID_IHNM)
+ // TODO: Add these to IHNM_DisplayInfo?
+ _vm->_gfx->drawRect(Common::Rect(118, 345, 603, 463), _vm->KnownColor2ColorId(kKnownColorBlack)); // fill converse rect
for (int i = 0; i < _vm->getDisplayInfo().converseTextLines; i++) {
relPos = _converseStartPos + i;
More information about the Scummvm-git-logs
mailing list