[Scummvm-git-logs] scummvm master -> 36ea7bf30ffc01804287cce99876417c5d27065c

[whiterandrek]

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

Summary:
9ba990fc38 PETKA: added default init to InterfacePanel ctor
91ec72ceb2 PETKA: use hero speed from settings
36ea7bf30f PETKA: use clip instead of min, max in panel interface


Commit: 9ba990fc38033e76933b2b61adfe52f8ea3f308f
    https://github.com/scummvm/scummvm/commit/9ba990fc38033e76933b2b61adfe52f8ea3f308f
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-01T18:33:21+03:00

Commit Message:
PETKA: added default init to InterfacePanel ctor

Changed paths:
    engines/petka/interfaces/panel.cpp


diff --git a/engines/petka/interfaces/panel.cpp b/engines/petka/interfaces/panel.cpp
index 5c66e5f056..6717a43b16 100644
--- a/engines/petka/interfaces/panel.cpp
+++ b/engines/petka/interfaces/panel.cpp
@@ -88,6 +88,11 @@ InterfacePanel::InterfacePanel() {
 	_objectPoints[22] = Common::Point(0, 0);
 	_objectPoints[23] = Common::Point(0, 0);
 
+	_subtitles = false;
+	_speechFrame = 1;
+	_musicFrame = 1;
+	_sfxFrame = 1;
+	_speedFrame = 1;
 }
 
 void InterfacePanel::start(int id) {


Commit: 91ec72ceb21cc286ce7c2e6e88a240ebbfd110b1
    https://github.com/scummvm/scummvm/commit/91ec72ceb21cc286ce7c2e6e88a240ebbfd110b1
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-01T18:49:25+03:00

Commit Message:
PETKA: use hero speed from settings

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


diff --git a/engines/petka/interfaces/panel.cpp b/engines/petka/interfaces/panel.cpp
index 6717a43b16..281984f3f7 100644
--- a/engines/petka/interfaces/panel.cpp
+++ b/engines/petka/interfaces/panel.cpp
@@ -296,4 +296,8 @@ void InterfacePanel::onRightButtonDown(Common::Point p) {
 	stop();
 }
 
+int InterfacePanel::getHeroSpeed() {
+	return (_speedFrame * 100 - 100) / 25;
+}
+
 } // End of namespace Petka
diff --git a/engines/petka/interfaces/panel.h b/engines/petka/interfaces/panel.h
index 66a1f04fb1..9c391391ff 100644
--- a/engines/petka/interfaces/panel.h
+++ b/engines/petka/interfaces/panel.h
@@ -37,6 +37,8 @@ public:
 	void onRightButtonDown(Common::Point p) override;
 	void onMouseMove(Common::Point p) override;
 
+	int getHeroSpeed();
+
 private:
 	void readSettings();
 	void applySettings();
@@ -44,8 +46,8 @@ private:
 	void updateSliders();
 	void updateSubtitles();
 
-public:
-	int _subtitles;
+private:
+	bool _subtitles;
 	int _speechFrame;
 	int _musicFrame;
 	int _sfxFrame;
diff --git a/engines/petka/objects/heroes.cpp b/engines/petka/objects/heroes.cpp
index 8f777a2d3a..b95455a25d 100644
--- a/engines/petka/objects/heroes.cpp
+++ b/engines/petka/objects/heroes.cpp
@@ -29,6 +29,7 @@
 #include "petka/video.h"
 #include "petka/sound.h"
 #include "petka/objects/heroes.h"
+#include "petka/interfaces/panel.h"
 #include "petka/walk.h"
 
 namespace Petka {
@@ -307,7 +308,10 @@ void QObjectPetka::stopWalk() {
 void QObjectPetka::update(int time) {
 	if (!_animate || !_isShown)
 		return;
-	_time += time;
+	if (_isWalking)
+		_time += time * (g_vm->getQSystem()->_panelInterface->getHeroSpeed() + 50) / 50;
+	else
+		_time += time;
 	FlicDecoder *flc = g_vm->resMgr()->loadFlic(_resourceId);
 	if (flc && flc->getFrameCount() != 1) {
 		while (_time >= (int)flc->getDelay()) {


Commit: 36ea7bf30ffc01804287cce99876417c5d27065c
    https://github.com/scummvm/scummvm/commit/36ea7bf30ffc01804287cce99876417c5d27065c
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-01T18:50:06+03:00

Commit Message:
PETKA: use clip instead of min, max in panel interface

Changed paths:
    engines/petka/interfaces/panel.cpp


diff --git a/engines/petka/interfaces/panel.cpp b/engines/petka/interfaces/panel.cpp
index 281984f3f7..7267ae7732 100644
--- a/engines/petka/interfaces/panel.cpp
+++ b/engines/petka/interfaces/panel.cpp
@@ -278,10 +278,10 @@ void InterfacePanel::readSettings() {
 }
 
 void InterfacePanel::applySettings() {
-	_speechFrame = MIN(MAX(1, _speechFrame), 31);
-	_musicFrame = MIN(MAX(1, _musicFrame), 41);
-	_sfxFrame = MIN(MAX(1, _sfxFrame), 31);
-	_speedFrame = MIN(MAX(1, _speedFrame), 26);
+	_speechFrame = CLIP(_speechFrame, 1, 31);
+	_musicFrame = CLIP(_musicFrame, 1, 41);
+	_sfxFrame = CLIP(_sfxFrame, 1, 31);
+	_speedFrame = CLIP(_speedFrame, 1, 26);
 
 	ConfMan.setInt("speech_volume", 255 * (_speechFrame - 1) / (31 - 1));
 	ConfMan.setInt("music_volume", 255 * (_musicFrame - 1) / (41 - 1));