libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 13:13:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

TITANIC: Renaming of CSuccUBus & CBilgeSuccUBus fields

Browse Source
This commit is contained in:
Paul Gilbert 2016-12-28 20:44:17 -05:00
parent af3a0a4255
commit 07d6d182ac
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
engines/titanic/npcs/bilge_succubus.cpp
View File

@ -42,26 +42,26 @@ BEGIN_MESSAGE_MAP(CBilgeSuccUBus, CSuccUBus)
END_MESSAGE_MAP() END_MESSAGE_MAP()
CBilgeSuccUBus::CBilgeSuccUBus() : CSuccUBus(), CBilgeSuccUBus::CBilgeSuccUBus() : CSuccUBus(),
_bilgeStartFrame1(-1), _bilgeEndFrame1(-1), _sneezing2StartFrame(-1), _sneezing2EndFrame(-1),
_bilgeStartFrame2(-1), _bilgeEndFrame2(-1) { _sneezing1StartFrame(-1), _sneezing1EndFrame(-1) {
} }
void CBilgeSuccUBus::save(SimpleFile *file, int indent) { void CBilgeSuccUBus::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent); file->writeNumberLine(1, indent);
file->writeNumberLine(_bilgeStartFrame1, indent); file->writeNumberLine(_sneezing2StartFrame, indent);
file->writeNumberLine(_bilgeEndFrame1, indent); file->writeNumberLine(_sneezing2EndFrame, indent);
file->writeNumberLine(_bilgeStartFrame2, indent); file->writeNumberLine(_sneezing1StartFrame, indent);
file->writeNumberLine(_bilgeEndFrame2, indent); file->writeNumberLine(_sneezing1EndFrame, indent);
CSuccUBus::save(file, indent); CSuccUBus::save(file, indent);
} }
void CBilgeSuccUBus::load(SimpleFile *file) { void CBilgeSuccUBus::load(SimpleFile *file) {
file->readNumber(); file->readNumber();
_bilgeStartFrame1 = file->readNumber(); _sneezing2StartFrame = file->readNumber();
_bilgeEndFrame1 = file->readNumber(); _sneezing2EndFrame = file->readNumber();
_bilgeStartFrame2 = file->readNumber(); _sneezing1StartFrame = file->readNumber();
_bilgeEndFrame2 = file->readNumber(); _sneezing1EndFrame = file->readNumber();
CSuccUBus::load(file); CSuccUBus::load(file);
} }
@ -137,10 +137,10 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
if (_sendStartFrame >= 0) if (_sendStartFrame >= 0)
playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT); playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT);
if (_bilgeStartFrame1 >= 0) { if (_sneezing2StartFrame >= 0) {
playMovie(_startFrame12, _endFrame12, MOVIE_GAMESTATE); playMovie(_trayOutStartFrame, _trayOutEndFrame, MOVIE_GAMESTATE);
playMovie(_bilgeStartFrame2, _bilgeEndFrame2, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); playMovie(_sneezing1StartFrame, _sneezing1EndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
playMovie(_bilgeStartFrame1, _bilgeEndFrame1, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); playMovie(_sneezing2StartFrame, _sneezing2EndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
incTransitions(); incTransitions();
} }
} else { } else {
@ -180,7 +180,7 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
CPetControl *pet = getPetControl(); CPetControl *pet = getPetControl();
if (msg->_endFrame == _endFrame12) { if (msg->_endFrame == _trayOutEndFrame) {
if (_offStartFrame >= 0) if (_offStartFrame >= 0)
playSound("z#27.wav"); playSound("z#27.wav");
} else if (msg->_endFrame == _offEndFrame) { } else if (msg->_endFrame == _offEndFrame) {
@ -234,10 +234,6 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
CSUBTransition transMsg; CSUBTransition transMsg;
transMsg.execute(this); transMsg.execute(this);
} else if (msg->_endFrame == _bilgeEndFrame2) {
playSound("z#25.wav", 70);
playSound("z#24.wav", 70);
} else if (msg->_endFrame == _receiveEndFrame) { } else if (msg->_endFrame == _receiveEndFrame) {
if (_mailP) { if (_mailP) {
_mailP->petAddToInventory(); _mailP->petAddToInventory();
@ -251,7 +247,11 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
transMsg.execute(this); 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", ""); changeView("BilgeRoomWith.Node 1.N", "");
_v2 = 0; _v2 = 0;
resetMail(); resetMail();
@ -440,10 +440,10 @@ bool CBilgeSuccUBus::TurnOn(CTurnOn *msg) {
bool CBilgeSuccUBus::TurnOff(CTurnOff *msg) { bool CBilgeSuccUBus::TurnOff(CTurnOff *msg) {
CPetControl *pet = getPetControl(); CPetControl *pet = getPetControl();
if (pet && mailExists(pet->getRoomFlags()) && _startFrame12 >= 0) if (pet && mailExists(pet->getRoomFlags()) && _trayOutStartFrame >= 0)
playMovie(_startFrame12, _endFrame12, MOVIE_NOTIFY_OBJECT); playMovie(_trayOutStartFrame, _trayOutEndFrame, MOVIE_NOTIFY_OBJECT);
else if (_endFrame12 >= 0) else if (_trayOutEndFrame >= 0)
playMovie(_endFrame12, _endFrame12, MOVIE_NOTIFY_OBJECT); playMovie(_trayOutEndFrame, _trayOutEndFrame, MOVIE_NOTIFY_OBJECT);
if (_soundHandle != -1) { if (_soundHandle != -1) {
stopSound(_soundHandle); stopSound(_soundHandle);

8
engines/titanic/npcs/bilge_succubus.h
View File

@ -41,10 +41,10 @@ class CBilgeSuccUBus : public CSuccUBus {
bool TurnOn(CTurnOn *msg); bool TurnOn(CTurnOn *msg);
bool TurnOff(CTurnOff *msg); bool TurnOff(CTurnOff *msg);
public: public:
int _bilgeStartFrame1; int _sneezing2StartFrame;
int _bilgeEndFrame1; int _sneezing2EndFrame;
int _bilgeStartFrame2; int _sneezing1StartFrame;
int _bilgeEndFrame2; int _sneezing1EndFrame;
public: public:
CLASSDEF; CLASSDEF;
CBilgeSuccUBus(); CBilgeSuccUBus();

12
engines/titanic/npcs/succubus.cpp
View File

@ -71,8 +71,8 @@ CSuccUBus::CSuccUBus() : CTrueTalkNPC() {
_mailP = nullptr; _mailP = nullptr;
_afterReceiveStartFrame = 0; _afterReceiveStartFrame = 0;
_afterReceiveEndFrame = 0; _afterReceiveEndFrame = 0;
_startFrame12 = 224; _trayOutStartFrame = 224;
_endFrame12 = 248; _trayOutEndFrame = 248;
_field158 = 0; _field158 = 0;
_field15C = 0; _field15C = 0;
_string2 = "NULL"; _string2 = "NULL";
@ -123,8 +123,8 @@ void CSuccUBus::save(SimpleFile *file, int indent) {
file->writeNumberLine(_v2, indent); file->writeNumberLine(_v2, indent);
file->writeNumberLine(_afterReceiveStartFrame, indent); file->writeNumberLine(_afterReceiveStartFrame, indent);
file->writeNumberLine(_afterReceiveEndFrame, indent); file->writeNumberLine(_afterReceiveEndFrame, indent);
file->writeNumberLine(_startFrame12, indent); file->writeNumberLine(_trayOutStartFrame, indent);
file->writeNumberLine(_endFrame12, indent); file->writeNumberLine(_trayOutEndFrame, indent);
file->writeNumberLine(_field158, indent); file->writeNumberLine(_field158, indent);
file->writeNumberLine(_field15C, indent); file->writeNumberLine(_field15C, indent);
@ -187,8 +187,8 @@ void CSuccUBus::load(SimpleFile *file) {
_v2 = file->readNumber(); _v2 = file->readNumber();
_afterReceiveStartFrame = file->readNumber(); _afterReceiveStartFrame = file->readNumber();
_afterReceiveEndFrame = file->readNumber(); _afterReceiveEndFrame = file->readNumber();
_startFrame12 = file->readNumber(); _trayOutStartFrame = file->readNumber();
_endFrame12 = file->readNumber(); _trayOutEndFrame = file->readNumber();
_field158 = file->readNumber(); _field158 = file->readNumber();
_field15C = file->readNumber(); _field15C = file->readNumber();

4
engines/titanic/npcs/succubus.h
View File

@ -70,8 +70,8 @@ protected:
CGameObject *_mailP; CGameObject *_mailP;
int _afterReceiveStartFrame; int _afterReceiveStartFrame;
int _afterReceiveEndFrame; int _afterReceiveEndFrame;
int _startFrame12; int _trayOutStartFrame;
int _endFrame12; int _trayOutEndFrame;
int _field158; int _field158;
bool _field15C; bool _field15C;
CString _string2; CString _string2;