[Scummvm-git-logs] scummvm master -> d27aba0bbe77698be5fe6e0211deffb733ca8494
dreammaster
dreammaster at scummvm.org
Wed Feb 22 04:54:47 CET 2017
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:
2857acb14a TITANIC: Add missing timer call in endgame sequence
d27aba0bbe TITANIC: Cleanup and renaming for endgame classes
Commit: 2857acb14a036a78ee71f8ac1cc3bb375859c0d8
https://github.com/scummvm/scummvm/commit/2857acb14a036a78ee71f8ac1cc3bb375859c0d8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-21T22:48:32-05:00
Commit Message:
TITANIC: Add missing timer call in endgame sequence
Changed paths:
engines/titanic/game/end_game_credits.cpp
diff --git a/engines/titanic/game/end_game_credits.cpp b/engines/titanic/game/end_game_credits.cpp
index 4edcef0..79ddcce 100644
--- a/engines/titanic/game/end_game_credits.cpp
+++ b/engines/titanic/game/end_game_credits.cpp
@@ -75,6 +75,7 @@ bool CEndGameCredits::MovieEndMsg(CMovieEndMsg *msg) {
visibleMsg.execute("CreditsBackdrop");
}
+ addTimer(4000, 0);
return true;
}
Commit: d27aba0bbe77698be5fe6e0211deffb733ca8494
https://github.com/scummvm/scummvm/commit/d27aba0bbe77698be5fe6e0211deffb733ca8494
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-21T22:54:42-05:00
Commit Message:
TITANIC: Cleanup and renaming for endgame classes
Changed paths:
engines/titanic/game/end_explode_ship.cpp
engines/titanic/game/end_explode_ship.h
engines/titanic/game/end_game_credits.cpp
diff --git a/engines/titanic/game/end_explode_ship.cpp b/engines/titanic/game/end_explode_ship.cpp
index 10c80f5..6253a4d 100644
--- a/engines/titanic/game/end_explode_ship.cpp
+++ b/engines/titanic/game/end_explode_ship.cpp
@@ -33,25 +33,25 @@ END_MESSAGE_MAP()
void CEndExplodeShip::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
- file->writeNumberLine(_value1, indent);
- file->writeNumberLine(_value2, indent);
+ file->writeNumberLine(_isExploding, indent);
+ file->writeNumberLine(_unused5, indent);
CGameObject::save(file, indent);
}
void CEndExplodeShip::load(SimpleFile *file) {
file->readNumber();
- _value1 = file->readNumber();
- _value2 = file->readNumber();
+ _isExploding = file->readNumber();
+ _unused5 = file->readNumber();
CGameObject::load(file);
}
bool CEndExplodeShip::ActMsg(CActMsg *msg) {
if (msg->_action == "Arm Bomb") {
- _value1 = 1;
+ _isExploding = true;
} else if (msg->_action == "Disarm Bomb") {
- _value1 = 0;
+ _isExploding = false;
} else if (msg->_action == "TakeOff") {
loadSound("a#31.wav");
loadSound("a#14.wav");
@@ -67,12 +67,12 @@ bool CEndExplodeShip::TimerMsg(CTimerMsg *msg) {
setVisible(true);
playMovie(0, 449, 0);
movieEvent(58);
- playMovie(516, _value1 ? 550 : 551, MOVIE_NOTIFY_OBJECT);
+ playMovie(516, _isExploding ? 550 : 551, MOVIE_NOTIFY_OBJECT);
}
if (msg->_actionVal == 3) {
setGlobalSoundVolume(-4, 2, -1);
- CActMsg actMsg(_value1 ? "ExplodeCredits" : "Credits");
+ CActMsg actMsg(_isExploding ? "ExplodeCredits" : "Credits");
actMsg.execute("EndGameCredits");
}
diff --git a/engines/titanic/game/end_explode_ship.h b/engines/titanic/game/end_explode_ship.h
index c48f822..592741e 100644
--- a/engines/titanic/game/end_explode_ship.h
+++ b/engines/titanic/game/end_explode_ship.h
@@ -34,10 +34,11 @@ class CEndExplodeShip : public CGameObject {
bool MovieEndMsg(CMovieEndMsg *msg);
bool MovieFrameMsg(CMovieFrameMsg *msg);
public:
- int _value1, _value2;
+ bool _isExploding;
+ int _unused5;
public:
CLASSDEF;
- CEndExplodeShip() : CGameObject(), _value1(0), _value2(0) {}
+ CEndExplodeShip() : CGameObject(), _isExploding(false), _unused5(0) {}
/**
* Save the data for the class to file
diff --git a/engines/titanic/game/end_game_credits.cpp b/engines/titanic/game/end_game_credits.cpp
index 79ddcce..c816f22 100644
--- a/engines/titanic/game/end_game_credits.cpp
+++ b/engines/titanic/game/end_game_credits.cpp
@@ -31,7 +31,7 @@ BEGIN_MESSAGE_MAP(CEndGameCredits, CGameObject)
ON_MESSAGE(TimerMsg)
END_MESSAGE_MAP()
-CEndGameCredits::CEndGameCredits() : CGameObject(), _flag(0),
+CEndGameCredits::CEndGameCredits() : CGameObject(), _flag(false),
_frameRange(0, 28) {
}
More information about the Scummvm-git-logs
mailing list