aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2019-08-04 14:01:51 +0300
committerFilippos Karapetis2019-08-04 14:05:08 +0300
commit8940601413012ab0c2e1423415c4a9cfd4bcf7fa (patch)
tree3ce64fba700a2eb1090a2fbd93aa24478494c442
parent2c31e6cbe547f309268796101459ce110f8e4c15 (diff)
downloadscummvm-rg350-8940601413012ab0c2e1423415c4a9cfd4bcf7fa.tar.gz
scummvm-rg350-8940601413012ab0c2e1423415c4a9cfd4bcf7fa.tar.bz2
scummvm-rg350-8940601413012ab0c2e1423415c4a9cfd4bcf7fa.zip
MADS: Draw the portrait in V2 game dialogs
-rw-r--r--engines/mads/dialogs.cpp27
-rw-r--r--engines/mads/dialogs.h6
2 files changed, 27 insertions, 6 deletions
diff --git a/engines/mads/dialogs.cpp b/engines/mads/dialogs.cpp
index fa656a90c1..33739388f7 100644
--- a/engines/mads/dialogs.cpp
+++ b/engines/mads/dialogs.cpp
@@ -147,7 +147,7 @@ TextDialog::TextDialog(MADSEngine *vm, const Common::String &fontName,
: Dialog(vm) {
_font = _vm->_font->getFont(fontName);
_position = pos;
- _icon = nullptr;
+ _portrait = nullptr;
_edgeSeries = nullptr;
_piecesPerCenter = 0;
_fontSpacing = 0;
@@ -158,10 +158,10 @@ TextDialog::TextDialog(MADSEngine *vm, const Common::String &fontName,
}
TextDialog::TextDialog(MADSEngine *vm, const Common::String &fontName,
- const Common::Point &pos, MSurface *icon, int maxTextChars): Dialog(vm) {
+ const Common::Point &pos, MSurface *portrait, int maxTextChars): Dialog(vm) {
_font = _vm->_font->getFont(fontName);
_position = pos;
- _icon = icon;
+ _portrait = portrait;
_edgeSeries = new SpriteAsset(_vm, "box.ss", PALFLAG_RESERVED);
_vm->_font->setColors(TEXTDIALOG_BLACK, TEXTDIALOG_BLACK, TEXTDIALOG_BLACK, TEXTDIALOG_BLACK);
_piecesPerCenter = _edgeSeries->getFrame(EDGE_UPPER_CENTER)->w / _edgeSeries->getFrame(EDGE_BOTTOM)->w;
@@ -174,6 +174,8 @@ TextDialog::TextDialog(MADSEngine *vm, const Common::String &fontName,
void TextDialog::init(int maxTextChars) {
_innerWidth = (_font->maxWidth() + 1) * maxTextChars;
_width = _innerWidth + 10;
+ if (_portrait != nullptr)
+ _width += _portrait->w + 10;
_lineSize = maxTextChars * 2;
_lineWidth = 0;
_currentX = 0;
@@ -320,6 +322,20 @@ void TextDialog::draw() {
// Draw the underlying dialog
Dialog::draw();
+ // Draw the edges
+ if (_edgeSeries != nullptr) {
+ //_vm->_screen->transBlitFrom(*_edgeSeries->getFrame(EDGE_UPPER_LEFT), _position, 0xFF);
+ //_vm->_screen->transBlitFrom(*_edgeSeries->getFrame(EDGE_UPPER_RIGHT), _position);
+ //_vm->_screen->transBlitFrom(*_edgeSeries->getFrame(EDGE_LOWER_LEFT), Common::Point(_position.x, _position.y + _height));
+ //_vm->_screen->transBlitFrom(*_edgeSeries->getFrame(EDGE_LOWER_RIGHT), _position);
+ }
+
+ // Draw the portrait
+ if (_portrait != nullptr) {
+ Common::Point portraitPos = Common::Point(_position.x + 5, _position.y + 5);
+ _vm->_screen->transBlitFrom(*_portrait, portraitPos, 0xFF);
+ }
+
// Draw the text lines
int lineYp = _position.y + 5;
for (int lineNum = 0; lineNum <= _numLines; ++lineNum) {
@@ -335,6 +351,9 @@ void TextDialog::draw() {
if (_lineXp[lineNum] & 0x40)
++yp;
+ if (_portrait != nullptr)
+ xp += _portrait->w + 5;
+
_font->writeString(_vm->_screen, _lines[lineNum],
Common::Point(xp, yp), 1);
@@ -417,6 +436,8 @@ MessageDialog::MessageDialog(MADSEngine *vm, int maxChars, ...)
Dialogs *Dialogs::init(MADSEngine *vm) {
if (vm->getGameID() == GType_RexNebular)
return new Nebular::DialogsNebular(vm);
+ //else if (vm->getGameID() == GType_Phantom)
+ // return new Phantom::DialogsPhantom(vm);
// Throw a warning for now, since the associated Dialogs class isn't implemented yet
warning("Dialogs: Unknown game");
diff --git a/engines/mads/dialogs.h b/engines/mads/dialogs.h
index 7642b76a3c..e2db2d8940 100644
--- a/engines/mads/dialogs.h
+++ b/engines/mads/dialogs.h
@@ -127,7 +127,7 @@ protected:
Common::String _lines[TEXT_DIALOG_MAX_LINES];
int _lineXp[TEXT_DIALOG_MAX_LINES];
SpriteAsset *_edgeSeries;
- MSurface *_icon;
+ MSurface *_portrait;
int _piecesPerCenter;
int _fontSpacing;
@@ -151,11 +151,11 @@ public:
* @param vm Engine reference
* @param fontName Font to use for display
* @param pos Position for window top-left
- * @param icon Speaker portrait to show in dialog
+ * @param portrait Speaker portrait to show in dialog
* @param maxTextChars Horizontal width of text portion of window in characters
*/
TextDialog(MADSEngine *vm, const Common::String &fontName, const Common::Point &pos,
- MSurface *icon, int maxTextChars);
+ MSurface *portrait, int maxTextChars);
/**
* Destructor