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

whiterandrek whiterandrek at gmail.com
Fri Oct 12 21:49:15 CEST 2018


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

Summary:
18c6a1a25c PINK: added missing sequencer update in Moving state
b13e235242 PINK: removed unnecessary G key


Commit: 18c6a1a25c7f4c65faeb1a4d4827046f21ab9c3d
    https://github.com/scummvm/scummvm/commit/18c6a1a25c7f4c65faeb1a4d4827046f21ab9c3d
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-10-12T22:41:46+03:00

Commit Message:
PINK: added missing sequencer update in Moving state

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 4134c2f..a547973 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -119,12 +119,11 @@ void LeadActor::start(bool isHandler) {
 
 void LeadActor::update() {
 	switch (_state) {
-	case kReady:
-		_sequencer->update();
-		_cursorMgr->update();
-		break;
 	case kMoving:
 		_walkMgr->update();
+		// fall through
+	case kReady:
+		_sequencer->update();
 		_cursorMgr->update();
 		break;
 	case kPlayingSequence:


Commit: b13e2352426c78ee4628e445bace363399fdd206
    https://github.com/scummvm/scummvm/commit/b13e2352426c78ee4628e445bace363399fdd206
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2018-10-12T22:45:47+03:00

Commit Message:
PINK: removed unnecessary G key

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 a547973..4c224e4 100644
--- a/engines/pink/objects/actors/lead_actor.cpp
+++ b/engines/pink/objects/actors/lead_actor.cpp
@@ -168,10 +168,6 @@ void LeadActor::loadPDA(const Common::String &pageName) {
 }
 
 void LeadActor::onKeyboardButtonClick(Common::KeyCode code) {
-	if (code == Common::KEYCODE_g) {
-		loadPDA("TOC");
-		return;
-	}
 	switch (_state) {
 	case kMoving:
 		switch (code) {





More information about the Scummvm-git-logs mailing list