[Scummvm-git-logs] scummvm master -> 8ec93852adc93bfc9ef2a12983cba063e837534f

[whiterandrek]

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

Summary:
114bd5367c PINK: fixed uninitialized field in InventoryMgr
600049ce4d PINK: added assert for possible division by zero
7e3c586412 PINK: changed dynamic_cast to static_cast
8ec93852ad PINK: fixed stopping audioInfo before starting walk


Commit: 114bd5367cac52401d88e548fb0bc84e4ec8627c
    https://github.com/scummvm/scummvm/commit/114bd5367cac52401d88e548fb0bc84e4ec8627c
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-02T11:47:22+03:00

Commit Message:
PINK: fixed uninitialized field in InventoryMgr

Changed paths:
    engines/pink/objects/inventory.cpp


diff --git a/engines/pink/objects/inventory.cpp b/engines/pink/objects/inventory.cpp
index c99e6c6..ff685d1 100644
--- a/engines/pink/objects/inventory.cpp
+++ b/engines/pink/objects/inventory.cpp
@@ -34,8 +34,8 @@ namespace Pink {
 
 InventoryMgr::InventoryMgr()
 	: _lead(nullptr), _window(nullptr), _itemActor(nullptr),
-	_rightArrow(nullptr), _leftArrow(nullptr), _state(kIdle),
-	_isClickedOnItem(false) {}
+	_rightArrow(nullptr), _leftArrow(nullptr), _item(nullptr),
+	_state(kIdle), _isClickedOnItem(false) {}
 
 void InventoryItem::deserialize(Archive &archive) {
 	NamedObject::deserialize(archive);


Commit: 600049ce4dc746ba49dec8859c02649338bb5f4c
    https://github.com/scummvm/scummvm/commit/600049ce4dc746ba49dec8859c02649338bb5f4c
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-02T11:47:22+03:00

Commit Message:
PINK: added assert for possible division by zero

Changed paths:
    engines/pink/objects/actions/action_still.cpp


diff --git a/engines/pink/objects/actions/action_still.cpp b/engines/pink/objects/actions/action_still.cpp
index d0b2758..345b42e 100644
--- a/engines/pink/objects/actions/action_still.cpp
+++ b/engines/pink/objects/actions/action_still.cpp
@@ -66,7 +66,7 @@ void ActionStill::setFrame(uint frame) {
 }
 
 void ActionStill::nextFrameLooped() {
-	assert(_decoder.getCurFrame() != -1);
+	assert(_decoder.getFrameCount() != 0);
 	setFrame((_decoder.getCurFrame() + 1) % _decoder.getFrameCount());
 }
 


Commit: 7e3c586412c63c9a26a206a41b4e2d449906b8aa
    https://github.com/scummvm/scummvm/commit/7e3c586412c63c9a26a206a41b4e2d449906b8aa
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-02T11:47:22+03:00

Commit Message:
PINK: changed dynamic_cast to static_cast

Changed paths:
    engines/pink/pda_mgr.cpp


diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp
index 0877b0b..050daab 100644
--- a/engines/pink/pda_mgr.cpp
+++ b/engines/pink/pda_mgr.cpp
@@ -25,7 +25,7 @@
 #include "pink/objects/actors/pda_button_actor.h"
 #include "pink/objects/actors/lead_actor.h"
 #include "pink/objects/pages/pda_page.h"
-#include "pink/objects/actions/action_still.h"
+#include "pink/objects/actions/action_play_with_sfx.h"
 
 namespace Pink {
 
@@ -215,14 +215,14 @@ void PDAMgr::updateWheels(bool playSfx) {
 	Actor *wheel = _page->findActor(kCountryWheel);
 	if (playSfx && wheel->getAction()->getName() != g_countries[_countryIndex]) {
 		wheel->setAction(Common::String(g_countries[_countryIndex]) + kSfx);
-		dynamic_cast<ActionCEL*>(wheel->getAction())->update(); // hack
+		static_cast<ActionPlayWithSfx*>(wheel->getAction())->update(); // hack
 	}
 	wheel->setAction(g_countries[_countryIndex]);
 
 	wheel = _page->findActor(kDomainWheel);
 	if (playSfx && wheel->getAction()->getName() != g_domains[_domainIndex]) {
 		wheel->setAction(Common::String(g_domains[_domainIndex]) + kSfx);
-		dynamic_cast<ActionCEL*>(wheel->getAction())->update(); // hack
+		static_cast<ActionPlayWithSfx*>(wheel->getAction())->update(); // hack
 	}
 	wheel->setAction(g_domains[_domainIndex]);
 }


Commit: 8ec93852adc93bfc9ef2a12983cba063e837534f
    https://github.com/scummvm/scummvm/commit/8ec93852adc93bfc9ef2a12983cba063e837534f
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-07-02T11:47:22+03:00

Commit Message:
PINK: fixed stopping audioInfo before starting walk

Changed paths:
    engines/pink/objects/actors/lead_actor.cpp


diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index 357d739..7e75c8a 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -221,8 +221,8 @@ void LeadActor::onLeftButtonClick(const Common::Point point) {
 		} else if (clickedActor->isSupporting()) {
 			if (isInteractingWith(clickedActor)) {
 				_recipient = clickedActor;
+				_audioInfoMgr.stop();
 				if (!startWalk()) {
-					_audioInfoMgr.stop();
 					if (_isHaveItem)
 						sendUseClickMessage(clickedActor);
 					else