[Scummvm-cvs-logs] scummvm master -> 131b99844b9f6ef8753c9be2a0a1332933dd7f6b
clone2727
clone2727 at gmail.com
Thu Dec 12 05:34:47 CET 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
131b99844b PEGASUS: Fix the robot timer outside of the shield generator
Commit: 131b99844b9f6ef8753c9be2a0a1332933dd7f6b
https://github.com/scummvm/scummvm/commit/131b99844b9f6ef8753c9be2a0a1332933dd7f6b
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-12-11T20:34:16-08:00
Commit Message:
PEGASUS: Fix the robot timer outside of the shield generator
Changed paths:
engines/pegasus/neighborhood/mars/mars.cpp
diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp
index 7752215..435bcd4 100644
--- a/engines/pegasus/neighborhood/mars/mars.cpp
+++ b/engines/pegasus/neighborhood/mars/mars.cpp
@@ -2011,7 +2011,7 @@ void Mars::dropItemIntoRoom(Item *item, Hotspot *dropSpot) {
void Mars::robotTiredOfWaiting() {
if (GameState.getCurrentRoomAndView() == MakeRoomView(kMars48, kEast)) {
- if (_attackingItem) {
+ if (!_attackingItem) {
startExtraSequence(kMars48RobotKillsPlayer, kExtraCompletedFlag, kFilterNoInput);
loadLoopSound2("");
} else {
More information about the Scummvm-git-logs
mailing list