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/barbot.cpp | |
| 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/barbot.cpp')
| -rw-r--r-- | engines/titanic/npcs/barbot.cpp | 10 |
1 files changed, 5 insertions, 5 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; |