[Scummvm-git-logs] scummvm master -> 736e94ce39907ba3850d4daf3a9e5101d11e6e76
whiterandrek
whiterandrek at gmail.com
Fri Aug 17 16:14:25 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:
5f462c1ebc PINK: implemented skipString method in Archive
d60265d7d4 PINK: removed unused parameter
736e94ce39 PINK: JANITORIAL: fixed local vars naming
Commit: 5f462c1ebcd6b379e67b5e681cce80f41540fcde
https://github.com/scummvm/scummvm/commit/5f462c1ebcd6b379e67b5e681cce80f41540fcde
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-08-17T17:14:15+03:00
Commit Message:
PINK: implemented skipString method in Archive
Changed paths:
engines/pink/archive.cpp
engines/pink/archive.h
engines/pink/objects/module.cpp
engines/pink/objects/pages/page.cpp
engines/pink/pink.cpp
diff --git a/engines/pink/archive.cpp b/engines/pink/archive.cpp
index 5d67bc4..cc92704 100644
--- a/engines/pink/archive.cpp
+++ b/engines/pink/archive.cpp
@@ -305,6 +305,11 @@ Common::String Archive::readString() {
return Common::String(buffer, len);
}
+void Archive::skipString() {
+ byte len = _readStream->readByte();
+ _readStream->skip(len);
+}
+
void Archive::writeString(const Common::String &string) {
_writeStream->writeByte(string.size());
_writeStream->write(string.c_str(), string.size());
diff --git a/engines/pink/archive.h b/engines/pink/archive.h
index 5ce7ff2..34eba94 100644
--- a/engines/pink/archive.h
+++ b/engines/pink/archive.h
@@ -49,6 +49,7 @@ public:
uint16 readWORD() { return _readStream->readUint16LE(); }
Common::String readString();
+ void skipString();
Object *readObject();
diff --git a/engines/pink/objects/module.cpp b/engines/pink/objects/module.cpp
index 50a256d..c6a72cc 100644
--- a/engines/pink/objects/module.cpp
+++ b/engines/pink/objects/module.cpp
@@ -45,7 +45,7 @@ void Module::load(Archive &archive) {
archive.mapObject(this);
NamedObject::deserialize(archive);
- archive.readString(); // skip directory
+ archive.skipString(); // skip directory
_invMgr.deserialize(archive);
_pages.deserialize(archive);
diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp
index 337f65e..e980dd2 100644
--- a/engines/pink/objects/pages/page.cpp
+++ b/engines/pink/objects/pages/page.cpp
@@ -35,7 +35,7 @@ void Page::load(Archive &archive) {
debugC(6, kPinkDebugLoadingObjects, "Page load");
archive.mapObject(this);
NamedObject::deserialize(archive);
- archive.readString(); //skip directory
+ archive.skipString(); //skip directory
_actors.deserialize(archive);
}
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 64121b6..6363421 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -168,8 +168,8 @@ void PinkEngine::pauseEngine(void *engine, bool pause) {
}
void PinkEngine::load(Archive &archive) {
- archive.readString();
- archive.readString();
+ archive.skipString();
+ archive.skipString();
_modules.deserialize(archive);
}
Commit: d60265d7d4745f1c3fde03d4dc48765dfb151a0b
https://github.com/scummvm/scummvm/commit/d60265d7d4745f1c3fde03d4dc48765dfb151a0b
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-08-17T17:14:15+03:00
Commit Message:
PINK: removed unused parameter
Changed paths:
engines/pink/objects/actors/lead_actor.cpp
engines/pink/objects/actors/lead_actor.h
engines/pink/pda_mgr.cpp
engines/pink/pda_mgr.h
engines/pink/pink.cpp
diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp
index 6165a35..4134c2f 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -246,9 +246,9 @@ void LeadActor::onLeftButtonClick(const Common::Point point) {
}
}
-void LeadActor::onLeftButtonUp(const Common::Point point) {
+void LeadActor::onLeftButtonUp() {
if (_state == kPDA)
- _page->getGame()->getPdaMgr().onLeftButtonUp(point);
+ _page->getGame()->getPdaMgr().onLeftButtonUp();
}
void LeadActor::onRightButtonClick(const Common::Point point) {
diff --git a/engines/pink/objects/actors/lead_actor.h b/engines/pink/objects/actors/lead_actor.h
index 25ab1c2..b041f4f 100644
--- a/engines/pink/objects/actors/lead_actor.h
+++ b/engines/pink/objects/actors/lead_actor.h
@@ -70,7 +70,7 @@ public:
void onKeyboardButtonClick(Common::KeyCode code);
void onLeftButtonClick(const Common::Point point);
- void onLeftButtonUp(const Common::Point point);
+ void onLeftButtonUp();
void onRightButtonClick(const Common::Point point);
void onMouseMove(const Common::Point point);
diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp
index 55e96a9..bb685de 100644
--- a/engines/pink/pda_mgr.cpp
+++ b/engines/pink/pda_mgr.cpp
@@ -125,7 +125,7 @@ void PDAMgr::onLeftButtonClick(Common::Point point) {
actor->onLeftClickMessage();
}
-void PDAMgr::onLeftButtonUp(Common::Point point) {
+void PDAMgr::onLeftButtonUp() {
Actor* _rightHand = _globalPage->findActor(kRightHand);
if (_rightHand)
static_cast<ActionStill*>(_rightHand->getAction())->setFrame(0);
diff --git a/engines/pink/pda_mgr.h b/engines/pink/pda_mgr.h
index dda4cf0..1a1826e 100644
--- a/engines/pink/pda_mgr.h
+++ b/engines/pink/pda_mgr.h
@@ -53,7 +53,7 @@ public:
void close();
void onLeftButtonClick(Common::Point point);
- void onLeftButtonUp(Common::Point point);
+ void onLeftButtonUp();
void onMouseMove(Common::Point point);
PinkEngine *getGame() const { return _game; }
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 6363421..5eebeaa 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -135,7 +135,7 @@ Common::Error Pink::PinkEngine::run() {
_actor->onLeftButtonClick(event.mouse);
break;
case Common::EVENT_LBUTTONUP:
- _actor->onLeftButtonUp(event.mouse);
+ _actor->onLeftButtonUp();
break;
case Common::EVENT_RBUTTONDOWN:
if (isPeril())
Commit: 736e94ce39907ba3850d4daf3a9e5101d11e6e76
https://github.com/scummvm/scummvm/commit/736e94ce39907ba3850d4daf3a9e5101d11e6e76
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-08-17T17:14:15+03:00
Commit Message:
PINK: JANITORIAL: fixed local vars naming
Changed paths:
engines/pink/pda_mgr.cpp
diff --git a/engines/pink/pda_mgr.cpp b/engines/pink/pda_mgr.cpp
index bb685de..5edc93a 100644
--- a/engines/pink/pda_mgr.cpp
+++ b/engines/pink/pda_mgr.cpp
@@ -117,18 +117,18 @@ void PDAMgr::goToPage(const Common::String &pageName) {
}
void PDAMgr::onLeftButtonClick(Common::Point point) {
- Actor* _rightHand = _globalPage->findActor(kRightHand);
- if (_rightHand)
- static_cast<ActionStill*>(_rightHand->getAction())->setFrame(1);
+ Actor* rightHand = _globalPage->findActor(kRightHand);
+ if (rightHand)
+ static_cast<ActionStill*>(rightHand->getAction())->setFrame(1);
Actor *actor = _game->getDirector()->getActorByPoint(point);
if (actor)
actor->onLeftClickMessage();
}
void PDAMgr::onLeftButtonUp() {
- Actor* _rightHand = _globalPage->findActor(kRightHand);
- if (_rightHand)
- static_cast<ActionStill*>(_rightHand->getAction())->setFrame(0);
+ Actor* rightHand = _globalPage->findActor(kRightHand);
+ if (rightHand)
+ static_cast<ActionStill*>(rightHand->getAction())->setFrame(0);
}
void PDAMgr::onMouseMove(Common::Point point) {
More information about the Scummvm-git-logs
mailing list