[Scummvm-cvs-logs] scummvm master -> d9b204b78ea2c7636af7e8fcffd67065a6d08d84

[clone2727]

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:
bbec9fac20 PEGASUS: Initialize _duration in RobotShip
d9b204b78e PEGASUS: Fix minor formatting issue


Commit: bbec9fac207d9e85d647e5ee13d6f20b90b47a87
    https://github.com/scummvm/scummvm/commit/bbec9fac207d9e85d647e5ee13d6f20b90b47a87
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-09-25T19:08:55-07:00

Commit Message:
PEGASUS: Initialize _duration in RobotShip

Changed paths:
    engines/pegasus/neighborhood/mars/robotship.cpp



diff --git a/engines/pegasus/neighborhood/mars/robotship.cpp b/engines/pegasus/neighborhood/mars/robotship.cpp
index 43a7e55..9963a44 100644
--- a/engines/pegasus/neighborhood/mars/robotship.cpp
+++ b/engines/pegasus/neighborhood/mars/robotship.cpp
@@ -64,6 +64,7 @@ RobotShip::RobotShip() : _spritesMovie(kNoDisplayElement) {
 	_currentLocation.y = 0;
 	_snaring = false;
 	_dropJunkFuse.setFunctor(new Common::Functor0Mem<void, RobotShip>(this, &RobotShip::timeToDropJunk));
+	_duration = 0xFFFFFFFF;
 }
 
 RobotShip::~RobotShip() {


Commit: d9b204b78ea2c7636af7e8fcffd67065a6d08d84
    https://github.com/scummvm/scummvm/commit/d9b204b78ea2c7636af7e8fcffd67065a6d08d84
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-09-25T19:09:21-07:00

Commit Message:
PEGASUS: Fix minor formatting issue

Changed paths:
    engines/pegasus/neighborhood/mars/robotship.cpp



diff --git a/engines/pegasus/neighborhood/mars/robotship.cpp b/engines/pegasus/neighborhood/mars/robotship.cpp
index 9963a44..639f208 100644
--- a/engines/pegasus/neighborhood/mars/robotship.cpp
+++ b/engines/pegasus/neighborhood/mars/robotship.cpp
@@ -53,7 +53,7 @@ static const CoordType kRovingTop = kShuttleWindowTop + 20;
 static const CoordType kRovingWidth = kShuttleWindowMidH - kRovingLeft;
 static const CoordType kRovingHeight = kShuttleWindowMidV - kRovingTop;
 
-RobotShip* g_robotShip = 0;
+RobotShip *g_robotShip = 0;
 
 RobotShip::RobotShip() : _spritesMovie(kNoDisplayElement) {
 	g_robotShip = this;