[Scummvm-git-logs] scummvm master -> 6fde729266a4c7fa5456eb13c6dae403a873cb34
whiterandrek
whiterandrek at gmail.com
Fri Jun 29 15:35:07 CEST 2018
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:
6ff1db5dfd PINK: renamed function parameter
4a4692a5dd PINK: removed onClick virtual function
6fde729266 PINK: added missing breaks
Commit: 6ff1db5dfd56de2b681bfe528078f33999f1c804
https://github.com/scummvm/scummvm/commit/6ff1db5dfd56de2b681bfe528078f33999f1c804
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-06-29T16:26:09+03:00
Commit Message:
PINK: renamed function parameter
Changed paths:
engines/pink/objects/actors/lead_actor.cpp
engines/pink/objects/actors/lead_actor.h
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index b7b4222..2649b2f 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -85,13 +85,13 @@ void LeadActor::saveState(Archive &archive) {
_audioInfoMgr.saveState(archive);
}
-void LeadActor::init(bool unk) {
+void LeadActor::init(bool paused) {
if (_state == kUndefined)
_state = kReady;
getInventoryMgr()->setLeadActor(this);
_page->getGame()->setLeadActor(this);
- Actor::init(unk);
+ Actor::init(paused);
}
void LeadActor::start(bool isHandler) {
diff --git a/engines/pink/objects/actors/lead_actor.h b/engines/pink/objects/actors/lead_actor.h
index 2bcd8a1..e6b0292 100644
--- a/engines/pink/objects/actors/lead_actor.h
+++ b/engines/pink/objects/actors/lead_actor.h
@@ -60,7 +60,7 @@ public:
void loadState(Archive &archive);
void saveState(Archive &archive);
- virtual void init(bool unk);
+ virtual void init(bool paused);
void start(bool isHandler);
Commit: 4a4692a5ddcc6f8631e71ac26f52282f4dbb62b9
https://github.com/scummvm/scummvm/commit/4a4692a5ddcc6f8631e71ac26f52282f4dbb62b9
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-06-29T16:30:39+03:00
Commit Message:
PINK: removed onClick virtual function
Changed paths:
engines/pink/objects/actors/actor.h
engines/pink/objects/actors/lead_actor.cpp
engines/pink/objects/actors/lead_actor.h
engines/pink/objects/actors/pda_button_actor.cpp
engines/pink/objects/actors/pda_button_actor.h
engines/pink/pda_mgr.cpp
diff --git a/engines/pink/objects/actors/actor.h b/engines/pink/objects/actors/actor.h
index ab84c6d..294beb9 100644
--- a/engines/pink/objects/actors/actor.h
+++ b/engines/pink/objects/actors/actor.h
@@ -66,8 +66,6 @@ public:
virtual void onMouseOver(const Common::Point point, CursorMgr *mgr);
virtual void onMouseOverWithItem(const Common::Point point, const Common::String &itemName, CursorMgr *cursorMgr);
- virtual void onClick() {}
-
virtual void onTimerMessage() {}
virtual void onLeftClickMessage() {}
virtual void onUseClickMessage(InventoryItem *item, InventoryMgr *mgr) {}
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index 2649b2f..1d26c4d 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -214,7 +214,7 @@ void LeadActor::onLeftButtonClick(const Common::Point point) {
if (this == clickedActor) {
_audioInfoMgr.stop();
- onClick();
+ onLeftClickMessage();
} else if (clickedActor->isSupporting()) {
if (isInteractingWith(clickedActor)) {
_recipient = clickedActor;
@@ -272,7 +272,7 @@ void LeadActor::onMouseOver(const Common::Point point, CursorMgr *mgr) {
Actor::onMouseOver(point, mgr);
}
-void LeadActor::onClick() {
+void LeadActor::onLeftClickMessage() {
if (_isHaveItem) {
assert(_state != kMoving);
_isHaveItem = false;
@@ -454,9 +454,9 @@ void PubPink::toConsole() {
}
}
-void PubPink::onClick() {
+void PubPink::onLeftClickMessage() {
if (!playingMiniGame())
- LeadActor::onClick();
+ LeadActor::onLeftClickMessage();
}
void PubPink::onVariableSet() {
diff --git a/engines/pink/objects/actors/lead_actor.h b/engines/pink/objects/actors/lead_actor.h
index e6b0292..ff38ef9 100644
--- a/engines/pink/objects/actors/lead_actor.h
+++ b/engines/pink/objects/actors/lead_actor.h
@@ -77,7 +77,7 @@ public:
void onMouseOverWithItem(const Common::Point point, const Common::String &itemName, Pink::CursorMgr *cursorMgr) override;
void onMouseOver(const Common::Point point, CursorMgr *mgr) override;
- virtual void onClick();
+ virtual void onLeftClickMessage() override;
virtual void onVariableSet() {}
void onInventoryClosed(bool isItemClicked);
void onWalkEnd(const Common::String &stopName);
@@ -141,7 +141,7 @@ public:
void toConsole() override;
- void onClick() override;
+ void onLeftClickMessage() override;
void onVariableSet() override;
protected:
diff --git a/engines/pink/objects/actors/pda_button_actor.cpp b/engines/pink/objects/actors/pda_button_actor.cpp
index 240d51a..972dc28 100644
--- a/engines/pink/objects/actors/pda_button_actor.cpp
+++ b/engines/pink/objects/actors/pda_button_actor.cpp
@@ -46,7 +46,7 @@ void PDAButtonActor::toConsole() {
_name.c_str(), _x, _y, _hideOnStop, _opaque, (int)_command.type, _command.arg.c_str());
}
-void PDAButtonActor::onClick() {
+void PDAButtonActor::onLeftClickMessage() {
if (isActive()) {
_page->getGame()->getPdaMgr().execute(_command);
}
diff --git a/engines/pink/objects/actors/pda_button_actor.h b/engines/pink/objects/actors/pda_button_actor.h
index c7bfdd1..c10f2ef 100644
--- a/engines/pink/objects/actors/pda_button_actor.h
+++ b/engines/pink/objects/actors/pda_button_actor.h
@@ -46,7 +46,7 @@ public:
void onMouseOver(const Common::Point point, CursorMgr *mgr) override;
- void onClick() override;
+ void onLeftClickMessage() override;
private:
bool isActive();
diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp
index 257a7de..1623b55 100644
--- a/engines/pink/pda_mgr.cpp
+++ b/engines/pink/pda_mgr.cpp
@@ -72,7 +72,7 @@ void PDAMgr::goToPage(const Common::String &pageName) {
void PDAMgr::onLeftButtonClick(Common::Point point) {
Actor *actor = _game->getDirector()->getActorByPoint(point);
if (actor)
- actor->onClick();
+ actor->onLeftClickMessage();
}
void PDAMgr::onMouseMove(Common::Point point) {
Commit: 6fde729266a4c7fa5456eb13c6dae403a873cb34
https://github.com/scummvm/scummvm/commit/6fde729266a4c7fa5456eb13c6dae403a873cb34
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-06-29T16:34:36+03:00
Commit Message:
PINK: added missing breaks
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 1d26c4d..0ce5a5a 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -111,6 +111,7 @@ void LeadActor::start(bool isHandler) {
break;
default:
forceUpdateCursor();
+ break;
}
}
@@ -178,6 +179,7 @@ void LeadActor::onKeyboardButtonClick(Common::KeyCode code) {
// fall through
case Common::KEYCODE_SPACE:
_walkMgr->skip();
+ break;
default:
break;
}
More information about the Scummvm-git-logs
mailing list