[Scummvm-git-logs] scummvm master -> 98bbb92a8e04dfb31ca942805a8ac36e1aafbcf8

sev- sev at scummvm.org
Tue Feb 21 23:26:42 CET 2017


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:
02ac724c66 SCUMM: MM V0: Fix an issue with Sandy appearing to slide across a walkbox
038b3b1789 SCUMM: MM V0: Fix actors skipping between certain walk-boxes
98bbb92a8e Merge pull request #907 from segrax/Fix_SandySlide


Commit: 02ac724c660133765c9c63db8768590c58bea897
    https://github.com/scummvm/scummvm/commit/02ac724c660133765c9c63db8768590c58bea897
Author: Robert Crossfield (robcrossfield at gmail.com)
Date: 2017-02-15T17:05:28+11:00

Commit Message:
SCUMM: MM V0: Fix an issue with Sandy appearing to slide across a walkbox

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 8465526..f888c69 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2416,6 +2416,7 @@ void Actor_v0::startAnimActor(int f) {
 			return;
 
 		_speaking = 1;
+		speakCheck();
 		return;
 	}
 


Commit: 038b3b178939f1bcc6714eda1b88c3e80e787c02
    https://github.com/scummvm/scummvm/commit/038b3b178939f1bcc6714eda1b88c3e80e787c02
Author: Robert Crossfield (robcrossfield at gmail.com)
Date: 2017-02-21T06:17:32+11:00

Commit Message:
SCUMM: MM V0: Fix actors skipping between certain walk-boxes

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index f888c69..5b7e144 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -937,7 +937,6 @@ L2A33:;
 	}
 
 	if ((_moving & 0x0F) == 3) {
-L2C36:;
 		setTmpFromActor();
 
 		if (!_walkDirX) {
@@ -980,7 +979,6 @@ L2C36:;
 
 	// 2ADA
 	if ((_moving & 0x0F) == 4) {
-L2CA3:;
 		setTmpFromActor();
 
 		if (!_walkDirY) {
@@ -1045,7 +1043,7 @@ L2CA3:;
 
 				directionUpdate();
 				animateActor(newDirToOldDir(_facing));
-				goto L2C36;
+				return;
 
 			} else {
 				// 2B39
@@ -1064,7 +1062,7 @@ L2CA3:;
 
 				directionUpdate();
 				animateActor(newDirToOldDir(_facing));
-				goto L2CA3;
+				return;
 			}
 		}
 	}


Commit: 98bbb92a8e04dfb31ca942805a8ac36e1aafbcf8
    https://github.com/scummvm/scummvm/commit/98bbb92a8e04dfb31ca942805a8ac36e1aafbcf8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-21T23:26:36+01:00

Commit Message:
Merge pull request #907 from segrax/Fix_SandySlide

SCUMM: MM V0: Fix two walk animation issues

Changed paths:
    engines/scumm/actor.cpp







More information about the Scummvm-git-logs mailing list