diff options
author | Eugene Sandulenko | 2016-10-09 14:59:58 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2016-10-09 14:59:58 +0200 |
commit | dead4aa01446da2bf711e64a4e681be460fa1202 (patch) | |
tree | 149648f240e839900e18af10953c4408da1e9464 /engines/titanic/npcs | |
parent | c5efd9f7487f4f51316d9ae6e6cbef3d35dd7b51 (diff) | |
download | scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.tar.gz scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.tar.bz2 scummvm-rg350-dead4aa01446da2bf711e64a4e681be460fa1202.zip |
JANITORIAL: Remove trailing spaces
Diffstat (limited to 'engines/titanic/npcs')
-rw-r--r-- | engines/titanic/npcs/barbot.cpp | 10 | ||||
-rw-r--r-- | engines/titanic/npcs/bellbot.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/npcs/callbot.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/npcs/deskbot.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/npcs/maitre_d.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/npcs/parrot.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/npcs/parrot_succubus.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/npcs/succubus.cpp | 10 | ||||
-rw-r--r-- | engines/titanic/npcs/titania.cpp | 6 |
9 files changed, 23 insertions, 23 deletions
diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp index 2524a835f8..791adaa05c 100644 --- a/engines/titanic/npcs/barbot.cpp +++ b/engines/titanic/npcs/barbot.cpp @@ -142,7 +142,7 @@ void CBarbot::load(SimpleFile *file) { _field158 = file->readNumber(); _field15C = file->readNumber(); _field160 = file->readNumber(); - + CTrueTalkNPC::load(file); } @@ -179,7 +179,7 @@ bool CBarbot::ActMsg(CActMsg *msg) { statusMsg._newStatus = 2; statusMsg.execute("PickUpGlass"); _field158 = 3; - + playRange(_frames[32], MOVIE_NOTIFY_OBJECT); playRange(_frames[30], MOVIE_NOTIFY_OBJECT); _frameNum = _frames[30]._endFrame; @@ -317,7 +317,7 @@ bool CBarbot::TurnOn(CTurnOn *msg) { playRange(_frames[23], MOVIE_NOTIFY_OBJECT); playRange(_frames[21], MOVIE_NOTIFY_OBJECT); _frameNum = _frames[21]._endFrame; - + switch (g_vm->getRandomNumber(2)) { case 0: playRange(_frames[10], MOVIE_NOTIFY_OBJECT); @@ -575,7 +575,7 @@ bool CBarbot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { } bool CBarbot::FrameMsg(CFrameMsg *msg) { - if (!_fieldC4 || _frameNum != -1 || _field148 != -1 + if (!_fieldC4 || _frameNum != -1 || _field148 != -1 || (msg->_ticks - _field14C) <= 5000 || (msg->_ticks - _field150) <= 1000) return true; @@ -611,7 +611,7 @@ bool CBarbot::FrameMsg(CFrameMsg *msg) { playRange(_frames[1], MOVIE_NOTIFY_OBJECT); _field148 = _frames[1]._endFrame; break; - + case 4: playRange(_frames[3], MOVIE_NOTIFY_OBJECT); _field148 = _frames[3]._endFrame; diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp index 0170491270..7aa32eeef3 100644 --- a/engines/titanic/npcs/bellbot.cpp +++ b/engines/titanic/npcs/bellbot.cpp @@ -74,7 +74,7 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) { { "MusicRoomLobby", "z#192.wav" }, { "1stClassRestaurant", "z#190.wav" } }; - + int idx; for (idx = 0; idx < 8; ++idx) { if (compareRoomNameTo(ROOM_WAVES[idx][0])) { diff --git a/engines/titanic/npcs/callbot.cpp b/engines/titanic/npcs/callbot.cpp index 4af9876b35..0979fa46f6 100644 --- a/engines/titanic/npcs/callbot.cpp +++ b/engines/titanic/npcs/callbot.cpp @@ -57,7 +57,7 @@ bool CCallBot::TurnOn(CTurnOn *msg) { bool CCallBot::EnterViewMsg(CEnterViewMsg *msg) { if (_enabled) { CRoomItem *room = getRoom(); - + if (room) { CSummonBotQueryMsg queryMsg; queryMsg._npcName = _npcName; diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp index 8f1fc28e20..c5032f1674 100644 --- a/engines/titanic/npcs/deskbot.cpp +++ b/engines/titanic/npcs/deskbot.cpp @@ -94,7 +94,7 @@ bool CDeskbot::EnterViewMsg(CEnterViewMsg *msg) { _deskbotActive = false; _fieldC4 = 0; loadFrame(625); - + return true; } @@ -264,7 +264,7 @@ bool CDeskbot::TrueTalkNotifySpeechStartedMsg(CTrueTalkNotifySpeechStartedMsg *m default: break; } - + return true; } diff --git a/engines/titanic/npcs/maitre_d.cpp b/engines/titanic/npcs/maitre_d.cpp index 09444f5611..658b7c7123 100644 --- a/engines/titanic/npcs/maitre_d.cpp +++ b/engines/titanic/npcs/maitre_d.cpp @@ -156,7 +156,7 @@ bool CMaitreD::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) { if (msg->_value2 != 2) { msg->_names = NAMES; - + CAnimateMaitreDMsg animMsg; if (_field12C) animMsg._value = 0; diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp index 6e7aa4ec57..358a86686f 100644 --- a/engines/titanic/npcs/parrot.cpp +++ b/engines/titanic/npcs/parrot.cpp @@ -116,13 +116,13 @@ CParrot::CParrot() : CTrueTalkNPC() { void CParrot::save(SimpleFile *file, int indent) { file->writeNumberLine(1, indent); file->writeNumberLine(_assetNumber, indent); - + file->writeQuotedLine(_assetName, indent); file->writeNumberLine(_field108, indent); file->writeNumberLine(_v1, indent); file->writeNumberLine(_v2, indent); file->writeNumberLine(_v3, indent); - + file->writeQuotedLine(_string2, indent); file->writeNumberLine(_field118, indent); file->writeNumberLine(_field11C, indent); @@ -581,7 +581,7 @@ bool CParrot::FrameMsg(CFrameMsg *msg) { actMsg.execute(_field134); } - _npcFlags &= ~(NPCFLAG_10000 | NPCFLAG_20000 | NPCFLAG_40000 + _npcFlags &= ~(NPCFLAG_10000 | NPCFLAG_20000 | NPCFLAG_40000 | NPCFLAG_80000 | NPCFLAG_100000 | NPCFLAG_200000 | NPCFLAG_400000); return true; } diff --git a/engines/titanic/npcs/parrot_succubus.cpp b/engines/titanic/npcs/parrot_succubus.cpp index d285c219b5..657bde5b66 100644 --- a/engines/titanic/npcs/parrot_succubus.cpp +++ b/engines/titanic/npcs/parrot_succubus.cpp @@ -34,7 +34,7 @@ BEGIN_MESSAGE_MAP(CParrotSuccUBus, CSuccUBus) ON_MESSAGE(LeaveNodeMsg) END_MESSAGE_MAP() -CParrotSuccUBus::CParrotSuccUBus() : CSuccUBus(), _field1DC(0), +CParrotSuccUBus::CParrotSuccUBus() : CSuccUBus(), _field1DC(0), _field1EC(0), _field1F0(376), _field1F4(393) { } @@ -43,7 +43,7 @@ void CParrotSuccUBus::save(SimpleFile *file, int indent) { file->writeNumberLine(_field1DC, indent); file->writeQuotedLine(_string3, indent); file->writeNumberLine(_field1EC, indent); - + CSuccUBus::save(file, indent); } diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp index 453f016757..6db8c8d798 100644 --- a/engines/titanic/npcs/succubus.cpp +++ b/engines/titanic/npcs/succubus.cpp @@ -183,7 +183,7 @@ void CSuccUBus::load(SimpleFile *file) { _startFrame2 = file->readNumber(); _endFrame2 = file->readNumber(); _field140 = file->readNumber(); - + _v2 = file->readNumber(); _startFrame5 = file->readNumber(); _endFrame5 = file->readNumber(); @@ -282,7 +282,7 @@ bool CSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) { CChicken *chicken = dynamic_cast<CChicken *>(item); bool chickenFlag = chicken ? chicken->_string6 != "None" : false; - + item->setVisible(false); if (_startFrame1 >= 0) { playSound("z#23.wav"); @@ -353,7 +353,7 @@ bool CSuccUBus::LeaveViewMsg(CLeaveViewMsg *msg) { _enabled = false; if (_startFrame10 >= 0) playSound("z#27.wav", 100); - + if (_field15C) setVisible(false); } @@ -397,7 +397,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { petDisplayMessage(2, NOTHING_IN_SUCCUBUS_TRAY); } else { _field19C = 0; - + CRoomFlags roomFlags = _roomFlags; if (!pet->testRooms5(roomFlags) || getPassengerClass() > 0) { roomFlags = pet->getSpecialRoomFlags("BilgeRoom"); @@ -512,7 +512,7 @@ bool CSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { if (msg->_endFrame == _endFrame10) { if (_startFrame11 >= 0) playSound("z#30.wav", 100); - + if (_field15C) { _field15C = false; setVisible(false); diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp index 000595f6b7..aa92ddd166 100644 --- a/engines/titanic/npcs/titania.cpp +++ b/engines/titanic/npcs/titania.cpp @@ -159,7 +159,7 @@ bool CTitania::ActMsg(CActMsg *msg) { CSenseWorkingMsg workingMsg2("Not Working"); CSenseWorkingMsg workingMsg3("Not Working"); CSenseWorkingMsg workingMsg4("Not Working"); - + if (_eye1 && _eye2) { workingMsg1._value = _visionCentre ? "Working" : "Random"; } @@ -201,10 +201,10 @@ bool CTitania::EnterViewMsg(CEnterViewMsg *msg) { _showIntro = false; disableMouse(); petHide(); - + CSetFrameMsg frameMsg; frameMsg._frameNumber = 25; - frameMsg.execute("Bomb"); + frameMsg.execute("Bomb"); playCutscene(0, 52); setVisible(false); |