[Scummvm-git-logs] scummvm master -> bf6708eb7eb373deedf565ee4061040d9c4b8fe5

whiterandrek whiterandrek at gmail.com
Thu Oct 1 19:14:46 UTC 2020


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:
bf6708eb7e PETKA: fixed compilation


Commit: bf6708eb7eb373deedf565ee4061040d9c4b8fe5
    https://github.com/scummvm/scummvm/commit/bf6708eb7eb373deedf565ee4061040d9c4b8fe5
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-01T22:14:31+03:00

Commit Message:
PETKA: fixed compilation

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


diff --git a/engines/petka/interfaces/panel.h b/engines/petka/interfaces/panel.h
index 9c391391ff..772b7b1c65 100644
--- a/engines/petka/interfaces/panel.h
+++ b/engines/petka/interfaces/panel.h
@@ -38,6 +38,7 @@ public:
 	void onMouseMove(Common::Point p) override;
 
 	int getHeroSpeed();
+	bool showSubtitles() const { return _subtitles; }
 
 private:
 	void readSettings();
diff --git a/engines/petka/objects/text.cpp b/engines/petka/objects/text.cpp
index afba1aa4a3..d3f51945db 100644
--- a/engines/petka/objects/text.cpp
+++ b/engines/petka/objects/text.cpp
@@ -99,7 +99,7 @@ QTextPhrase::QTextPhrase(const Common::U32String &text, uint16 textColor, uint16
 	: QText(text, textColor, outlineColor), _phrase(text), _time(0) {}
 
 void QTextPhrase::draw() {
-	if (g_vm->getQSystem()->_panelInterface->_subtitles) {
+	if (g_vm->getQSystem()->_panelInterface->showSubtitles()) {
 		QText::draw();
 	}
 }
@@ -113,7 +113,7 @@ void QTextPhrase::update(int time) {
 			_time = 0;
 			dialog.next(-1);
 		}
-	} else if (_time > _phrase.size() * 30 + 1000 || !g_vm->getQSystem()->_panelInterface->_subtitles) {
+	} else if (_time > _phrase.size() * 30 + 1000 || !g_vm->getQSystem()->_panelInterface->showSubtitles()) {
 		_time = 0;
 		dialog.next(-1);
 	}




More information about the Scummvm-git-logs mailing list