aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/titanic/npcs/bilge_succubus.cpp48
-rw-r--r--engines/titanic/npcs/bilge_succubus.h8
-rw-r--r--engines/titanic/npcs/succubus.cpp12
-rw-r--r--engines/titanic/npcs/succubus.h4
4 files changed, 36 insertions, 36 deletions
diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp
index 7ce361da5f..36627842a5 100644
--- a/engines/titanic/npcs/bilge_succubus.cpp
+++ b/engines/titanic/npcs/bilge_succubus.cpp
@@ -42,26 +42,26 @@ BEGIN_MESSAGE_MAP(CBilgeSuccUBus, CSuccUBus)
END_MESSAGE_MAP()
CBilgeSuccUBus::CBilgeSuccUBus() : CSuccUBus(),
- _bilgeStartFrame1(-1), _bilgeEndFrame1(-1),
- _bilgeStartFrame2(-1), _bilgeEndFrame2(-1) {
+ _sneezing2StartFrame(-1), _sneezing2EndFrame(-1),
+ _sneezing1StartFrame(-1), _sneezing1EndFrame(-1) {
}
void CBilgeSuccUBus::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
- file->writeNumberLine(_bilgeStartFrame1, indent);
- file->writeNumberLine(_bilgeEndFrame1, indent);
- file->writeNumberLine(_bilgeStartFrame2, indent);
- file->writeNumberLine(_bilgeEndFrame2, indent);
+ file->writeNumberLine(_sneezing2StartFrame, indent);
+ file->writeNumberLine(_sneezing2EndFrame, indent);
+ file->writeNumberLine(_sneezing1StartFrame, indent);
+ file->writeNumberLine(_sneezing1EndFrame, indent);
CSuccUBus::save(file, indent);
}
void CBilgeSuccUBus::load(SimpleFile *file) {
file->readNumber();
- _bilgeStartFrame1 = file->readNumber();
- _bilgeEndFrame1 = file->readNumber();
- _bilgeStartFrame2 = file->readNumber();
- _bilgeEndFrame2 = file->readNumber();
+ _sneezing2StartFrame = file->readNumber();
+ _sneezing2EndFrame = file->readNumber();
+ _sneezing1StartFrame = file->readNumber();
+ _sneezing1EndFrame = file->readNumber();
CSuccUBus::load(file);
}
@@ -137,10 +137,10 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
if (_sendStartFrame >= 0)
playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT);
- if (_bilgeStartFrame1 >= 0) {
- playMovie(_startFrame12, _endFrame12, MOVIE_GAMESTATE);
- playMovie(_bilgeStartFrame2, _bilgeEndFrame2, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
- playMovie(_bilgeStartFrame1, _bilgeEndFrame1, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+ if (_sneezing2StartFrame >= 0) {
+ playMovie(_trayOutStartFrame, _trayOutEndFrame, MOVIE_GAMESTATE);
+ playMovie(_sneezing1StartFrame, _sneezing1EndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+ playMovie(_sneezing2StartFrame, _sneezing2EndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
incTransitions();
}
} else {
@@ -180,7 +180,7 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
CPetControl *pet = getPetControl();
- if (msg->_endFrame == _endFrame12) {
+ if (msg->_endFrame == _trayOutEndFrame) {
if (_offStartFrame >= 0)
playSound("z#27.wav");
} else if (msg->_endFrame == _offEndFrame) {
@@ -234,10 +234,6 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
CSUBTransition transMsg;
transMsg.execute(this);
- } else if (msg->_endFrame == _bilgeEndFrame2) {
- playSound("z#25.wav", 70);
- playSound("z#24.wav", 70);
-
} else if (msg->_endFrame == _receiveEndFrame) {
if (_mailP) {
_mailP->petAddToInventory();
@@ -251,7 +247,11 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
transMsg.execute(this);
}
- } else if (msg->_endFrame == _bilgeEndFrame1) {
+ } else if (msg->_endFrame == _sneezing1EndFrame) {
+ playSound("z#25.wav", 70);
+ playSound("z#24.wav", 70);
+
+ } else if (msg->_endFrame == _sneezing2EndFrame) {
changeView("BilgeRoomWith.Node 1.N", "");
_v2 = 0;
resetMail();
@@ -440,10 +440,10 @@ bool CBilgeSuccUBus::TurnOn(CTurnOn *msg) {
bool CBilgeSuccUBus::TurnOff(CTurnOff *msg) {
CPetControl *pet = getPetControl();
- if (pet && mailExists(pet->getRoomFlags()) && _startFrame12 >= 0)
- playMovie(_startFrame12, _endFrame12, MOVIE_NOTIFY_OBJECT);
- else if (_endFrame12 >= 0)
- playMovie(_endFrame12, _endFrame12, MOVIE_NOTIFY_OBJECT);
+ if (pet && mailExists(pet->getRoomFlags()) && _trayOutStartFrame >= 0)
+ playMovie(_trayOutStartFrame, _trayOutEndFrame, MOVIE_NOTIFY_OBJECT);
+ else if (_trayOutEndFrame >= 0)
+ playMovie(_trayOutEndFrame, _trayOutEndFrame, MOVIE_NOTIFY_OBJECT);
if (_soundHandle != -1) {
stopSound(_soundHandle);
diff --git a/engines/titanic/npcs/bilge_succubus.h b/engines/titanic/npcs/bilge_succubus.h
index 754949a306..b56716d110 100644
--- a/engines/titanic/npcs/bilge_succubus.h
+++ b/engines/titanic/npcs/bilge_succubus.h
@@ -41,10 +41,10 @@ class CBilgeSuccUBus : public CSuccUBus {
bool TurnOn(CTurnOn *msg);
bool TurnOff(CTurnOff *msg);
public:
- int _bilgeStartFrame1;
- int _bilgeEndFrame1;
- int _bilgeStartFrame2;
- int _bilgeEndFrame2;
+ int _sneezing2StartFrame;
+ int _sneezing2EndFrame;
+ int _sneezing1StartFrame;
+ int _sneezing1EndFrame;
public:
CLASSDEF;
CBilgeSuccUBus();
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index dd075139a8..a05cc71d00 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -71,8 +71,8 @@ CSuccUBus::CSuccUBus() : CTrueTalkNPC() {
_mailP = nullptr;
_afterReceiveStartFrame = 0;
_afterReceiveEndFrame = 0;
- _startFrame12 = 224;
- _endFrame12 = 248;
+ _trayOutStartFrame = 224;
+ _trayOutEndFrame = 248;
_field158 = 0;
_field15C = 0;
_string2 = "NULL";
@@ -123,8 +123,8 @@ void CSuccUBus::save(SimpleFile *file, int indent) {
file->writeNumberLine(_v2, indent);
file->writeNumberLine(_afterReceiveStartFrame, indent);
file->writeNumberLine(_afterReceiveEndFrame, indent);
- file->writeNumberLine(_startFrame12, indent);
- file->writeNumberLine(_endFrame12, indent);
+ file->writeNumberLine(_trayOutStartFrame, indent);
+ file->writeNumberLine(_trayOutEndFrame, indent);
file->writeNumberLine(_field158, indent);
file->writeNumberLine(_field15C, indent);
@@ -187,8 +187,8 @@ void CSuccUBus::load(SimpleFile *file) {
_v2 = file->readNumber();
_afterReceiveStartFrame = file->readNumber();
_afterReceiveEndFrame = file->readNumber();
- _startFrame12 = file->readNumber();
- _endFrame12 = file->readNumber();
+ _trayOutStartFrame = file->readNumber();
+ _trayOutEndFrame = file->readNumber();
_field158 = file->readNumber();
_field15C = file->readNumber();
diff --git a/engines/titanic/npcs/succubus.h b/engines/titanic/npcs/succubus.h
index d81ae84e67..d996bcdc68 100644
--- a/engines/titanic/npcs/succubus.h
+++ b/engines/titanic/npcs/succubus.h
@@ -70,8 +70,8 @@ protected:
CGameObject *_mailP;
int _afterReceiveStartFrame;
int _afterReceiveEndFrame;
- int _startFrame12;
- int _endFrame12;
+ int _trayOutStartFrame;
+ int _trayOutEndFrame;
int _field158;
bool _field15C;
CString _string2;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 06:56:37 +0000