[Scummvm-git-logs] scummvm master -> 620e9effec152cf5c971a6a49a2fff71944d8ec0

[whiterandrek]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ab08c29ed6 PETKA: text fixes
620e9effec PETKA: fix dirty rect bug with star


Commit: ab08c29ed67a055e54ad99f5a7189a42623f5bda
    https://github.com/scummvm/scummvm/commit/ab08c29ed67a055e54ad99f5a7189a42623f5bda
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-05T19:18:48+03:00

Commit Message:
PETKA: text fixes

Changed paths:
    engines/petka/objects/text.cpp
    engines/petka/objects/text.h


diff --git a/engines/petka/objects/text.cpp b/engines/petka/objects/text.cpp
index a226110986..c0eed78323 100644
--- a/engines/petka/objects/text.cpp
+++ b/engines/petka/objects/text.cpp
@@ -95,6 +95,10 @@ QText::QText() {
 	_z = 3000;
 }
 
+void QText::update(int) {
+	g_vm->videoSystem()->addDirtyRect(_rect);
+}
+
 QTextPhrase::QTextPhrase(const Common::U32String &text, uint16 textColor, uint16 outlineColor)
 	: QText(text, textColor, outlineColor), _phrase(text), _time(0) {}
 
@@ -107,6 +111,7 @@ void QTextPhrase::draw() {
 void QTextPhrase::update(int time) {
 	DialogInterface &dialog = g_vm->getQSystem()->_mainInterface->_dialog;
 	_time += time;
+	QText::update(time);
 	Sound *sound = dialog.findSound();
 	if (sound) {
 		if (!sound->isPlaying()) {
@@ -170,6 +175,8 @@ QTextChoice::QTextChoice(const Common::Array<Common::U32String> &choices, uint16
 	_rects.resize(choices.size());
 	for (uint i = 0; i < _choices.size(); ++i) {
 		_rects[i] = font->getBoundingBox(_choices[i]);
+		_rects[i].bottom += 5;
+		_rects[i].right += 15;
 		if (_rects[i].width() > w)
 			w = _rects[i].width();
 		h += _rects[i].height();
diff --git a/engines/petka/objects/text.h b/engines/petka/objects/text.h
index 8b60dcfa2c..3ce3d2835d 100644
--- a/engines/petka/objects/text.h
+++ b/engines/petka/objects/text.h
@@ -38,6 +38,7 @@ public:
 	QText(const Common::U32String &text, uint16 textColor, uint16 outlineColor);
 
 	void draw();
+	void update(int time);
 	const Common::Rect &getRect();
 
 protected:


Commit: 620e9effec152cf5c971a6a49a2fff71944d8ec0
    https://github.com/scummvm/scummvm/commit/620e9effec152cf5c971a6a49a2fff71944d8ec0
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-05T19:19:46+03:00

Commit Message:
PETKA: fix dirty rect bug with star

Changed paths:
    engines/petka/objects/object_star.cpp


diff --git a/engines/petka/objects/object_star.cpp b/engines/petka/objects/object_star.cpp
index 8d6287462e..c70cc75062 100644
--- a/engines/petka/objects/object_star.cpp
+++ b/engines/petka/objects/object_star.cpp
@@ -60,7 +60,7 @@ void QObjectStar::onMouseMove(Common::Point p) {
 	uint frame = (findButtonIndex(p.x - _x, p.y - _y) + 1) % 7 + 1;
 	FlicDecoder *flc = g_vm->resMgr()->loadFlic(_resourceId);
 	if (flc && flc->getCurFrame() + 1 != (int32)frame) {
-		g_vm->videoSystem()->addDirtyRect(Common::Point(_x - g_vm->getQSystem()->_xOffset, _y), *flc);
+		g_vm->videoSystem()->addDirtyRect(Common::Point(_x, _y), *flc);
 		flc->setFrame(frame);
 	}
 }