[Scummvm-git-logs] scummvm master -> 04dabb0cd220e030ee3149f11bf9dcf52fdcad0e
dreammaster
dreammaster at scummvm.org
Sun Sep 10 00:21:12 CEST 2017
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b2dd72adbd TITANIC: Improved naming for Helmet On/Off flag
d5fb1170d7 TITANIC: Prevent locking/unlocking sounds in photoview
3b579178d4 TITANIC: Hitting go on captain wheel resets it
04dabb0cd2 Merge pull request #1017 from dafioram/star-control-changes
Commit: b2dd72adbdf7fad21438f4860ad8b420b5a82812
https://github.com/scummvm/scummvm/commit/b2dd72adbdf7fad21438f4860ad8b420b5a82812
Author: David Fioramonti (dafioram at gmail.com)
Date: 2017-09-09T14:24:26-07:00
Commit Message:
TITANIC: Improved naming for Helmet On/Off flag
Changed paths:
engines/titanic/game/nav_helmet.cpp
engines/titanic/game/nav_helmet.h
diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp
index c2496be..498f52b 100644
--- a/engines/titanic/game/nav_helmet.cpp
+++ b/engines/titanic/game/nav_helmet.cpp
@@ -37,13 +37,13 @@ END_MESSAGE_MAP()
void CNavHelmet::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
- file->writeNumberLine(_flag, indent);
+ file->writeNumberLine(_helmetOn, indent);
CGameObject::save(file, indent);
}
void CNavHelmet::load(SimpleFile *file) {
file->readNumber();
- _flag = file->readNumber();
+ _helmetOn = file->readNumber();
CGameObject::load(file);
}
@@ -51,7 +51,7 @@ bool CNavHelmet::MovieEndMsg(CMovieEndMsg *msg) {
CPetControl *pet = getPetControl();
assert(pet);
- if (_flag && pet->isAreaUnlocked()) {
+ if (_helmetOn && pet->isAreaUnlocked()) {
setVisible(false);
pet->setArea(PET_STARFIELD);
@@ -78,8 +78,8 @@ bool CNavHelmet::LeaveViewMsg(CLeaveViewMsg *msg) {
bool CNavHelmet::PETHelmetOnOffMsg(CPETHelmetOnOffMsg *msg) {
CPetControl *pet = getPetControl();
- if (_flag) {
- _flag = false;
+ if (_helmetOn) {
+ _helmetOn = false;
setVisible(true);
starFn(STAR_HIDE);
playMovie(61, 120, MOVIE_NOTIFY_OBJECT);
@@ -94,7 +94,7 @@ bool CNavHelmet::PETHelmetOnOffMsg(CPETHelmetOnOffMsg *msg) {
decTransitions();
} else {
incTransitions();
- _flag = true;
+ _helmetOn = true;
setVisible(true);
playMovie(0, 60, MOVIE_NOTIFY_OBJECT);
playSound("a#48.wav");
@@ -105,14 +105,14 @@ bool CNavHelmet::PETHelmetOnOffMsg(CPETHelmetOnOffMsg *msg) {
}
bool CNavHelmet::PETPhotoOnOffMsg(CPETPhotoOnOffMsg *msg) {
- if (_flag)
+ if (_helmetOn)
starFn(STAR_TOGGLE_MODE);
return true;
}
bool CNavHelmet::PETStarFieldLockMsg(CPETStarFieldLockMsg *msg) {
- if (_flag) {
+ if (_helmetOn) {
if (msg->_value) {
playSound("a#6.wav");
starFn(LOCK_STAR);
diff --git a/engines/titanic/game/nav_helmet.h b/engines/titanic/game/nav_helmet.h
index c408d05..6e30c4b 100644
--- a/engines/titanic/game/nav_helmet.h
+++ b/engines/titanic/game/nav_helmet.h
@@ -38,10 +38,10 @@ class CNavHelmet : public CGameObject {
bool PETStarFieldLockMsg(CPETStarFieldLockMsg *msg);
bool PETSetStarDestinationMsg(CPETSetStarDestinationMsg *msg);
private:
- bool _flag;
+ bool _helmetOn;
public:
CLASSDEF;
- CNavHelmet() : CGameObject(), _flag(false) {}
+ CNavHelmet() : CGameObject(), _helmetOn(false) {}
/**
* Save the data for the class to file
Commit: d5fb1170d7d3e9cbe2029d494f6a438745f6490c
https://github.com/scummvm/scummvm/commit/d5fb1170d7d3e9cbe2029d494f6a438745f6490c
Author: David Fioramonti (dafioram at gmail.com)
Date: 2017-09-09T14:24:26-07:00
Commit Message:
TITANIC: Prevent locking/unlocking sounds in photoview
In scummvm and the original engine if you try to
unlock/lock stars in photoview/skyview then the
stars will not unlock/lock, but the sounds
associated with unlocking and locking were playing.
Giving a false impression that the
locking/unlocking was happening.
The sounds no longer play when in photoview.
Changed paths:
engines/titanic/game/nav_helmet.cpp
engines/titanic/star_control/star_control.cpp
engines/titanic/star_control/star_control.h
diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp
index 498f52b..f4ea6e4 100644
--- a/engines/titanic/game/nav_helmet.cpp
+++ b/engines/titanic/game/nav_helmet.cpp
@@ -22,6 +22,7 @@
#include "titanic/game/nav_helmet.h"
#include "titanic/pet_control/pet_control.h"
+#include "titanic/star_control/star_control.h"
namespace Titanic {
@@ -113,12 +114,28 @@ bool CNavHelmet::PETPhotoOnOffMsg(CPETPhotoOnOffMsg *msg) {
bool CNavHelmet::PETStarFieldLockMsg(CPETStarFieldLockMsg *msg) {
if (_helmetOn) {
- if (msg->_value) {
- playSound("a#6.wav");
- starFn(LOCK_STAR);
- } else {
- playSound("a#5.wav");
- starFn(UNLOCK_STAR);
+ CPetControl *pet = getPetControl();
+ CStarControl *starControl = 0;
+ bool isStarFieldMode=false;
+
+ if (pet)
+ starControl = pet->getStarControl();
+
+ if (starControl)
+ isStarFieldMode = starControl->isStarFieldMode();
+
+ if (isStarFieldMode) {
+ // locking and unlocking only in starfield
+ // It already does this without the conditional
+ // but now it will also not play the sounds in
+ // photoview
+ if (msg->_value) {
+ playSound("a#6.wav");
+ starFn(LOCK_STAR);
+ } else {
+ playSound("a#5.wav");
+ starFn(UNLOCK_STAR);
+ }
}
}
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp
index cc41430..8464262 100644
--- a/engines/titanic/star_control/star_control.cpp
+++ b/engines/titanic/star_control/star_control.cpp
@@ -145,6 +145,18 @@ void CStarControl::newFrame() {
}
}
+bool CStarControl::isStarFieldMode() {
+ if (!_petControl)
+ _petControl = getPetControl();
+
+ if (_petControl) {
+
+ if (_starField.getMode() == MODE_STARFIELD)
+ return true;
+ }
+ return false;
+}
+
void CStarControl::doAction(StarControlAction action) {
if (!_enabled)
return;
diff --git a/engines/titanic/star_control/star_control.h b/engines/titanic/star_control/star_control.h
index e4072d7..7efd386 100644
--- a/engines/titanic/star_control/star_control.h
+++ b/engines/titanic/star_control/star_control.h
@@ -70,6 +70,11 @@ public:
virtual void draw(CScreenManager *screenManager);
/**
+ * _starField is currently showing the starfield
+ */
+ bool isStarFieldMode();
+
+ /**
* Does an action in the star control
*/
void doAction(StarControlAction action);
Commit: 3b579178d447d68f514a809d06ae45ce039ed5b2
https://github.com/scummvm/scummvm/commit/3b579178d447d68f514a809d06ae45ce039ed5b2
Author: David Fioramonti (dafioram at gmail.com)
Date: 2017-09-09T14:24:26-07:00
Commit Message:
TITANIC: Hitting go on captain wheel resets it
In the original once you have hit the go button
on the steering wheel it won't let you use it again
until you have solved the puzzle so that is how
ScummVM does it now.
Changed paths:
engines/titanic/game/captains_wheel.cpp
diff --git a/engines/titanic/game/captains_wheel.cpp b/engines/titanic/game/captains_wheel.cpp
index eafb478..32582ed 100644
--- a/engines/titanic/game/captains_wheel.cpp
+++ b/engines/titanic/game/captains_wheel.cpp
@@ -99,6 +99,7 @@ bool CCaptainsWheel::ActMsg(CActMsg *msg) {
}
} else if (msg->_action == "Go") {
if (_stopEnabled) {
+ _goEnabled = false;
incTransitions();
_stopEnabled = false;
_actionNum = 1;
Commit: 04dabb0cd220e030ee3149f11bf9dcf52fdcad0e
https://github.com/scummvm/scummvm/commit/04dabb0cd220e030ee3149f11bf9dcf52fdcad0e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-09T18:21:08-04:00
Commit Message:
Merge pull request #1017 from dafioram/star-control-changes
TITANIC: Star control changes
Changed paths:
engines/titanic/game/captains_wheel.cpp
engines/titanic/game/nav_helmet.cpp
engines/titanic/game/nav_helmet.h
engines/titanic/star_control/star_control.cpp
engines/titanic/star_control/star_control.h
More information about the Scummvm-git-logs
mailing list