aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/movement_track.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2016-10-03 12:38:43 +0200
committerEugene Sandulenko2016-10-03 12:38:43 +0200
commit281c19ab036f387a99192594aa645e696009f40b (patch)
treee4de335067b68ee83b76de33c9b7f86b4f016d35 /engines/bladerunner/movement_track.cpp
parent77be430824ad0cafb0de9952ecb352ba4ad18571 (diff)
downloadscummvm-rg350-281c19ab036f387a99192594aa645e696009f40b.tar.gz
scummvm-rg350-281c19ab036f387a99192594aa645e696009f40b.tar.bz2
scummvm-rg350-281c19ab036f387a99192594aa645e696009f40b.zip
BLADERUNNER: Code formatting fixes
Diffstat (limited to 'engines/bladerunner/movement_track.cpp')
-rw-r--r--engines/bladerunner/movement_track.cpp43
1 files changed, 14 insertions, 29 deletions
diff --git a/engines/bladerunner/movement_track.cpp b/engines/bladerunner/movement_track.cpp
index b7d0adc6c0..60a190a9a2 100644
--- a/engines/bladerunner/movement_track.cpp
+++ b/engines/bladerunner/movement_track.cpp
@@ -24,24 +24,20 @@
namespace BladeRunner {
-MovementTrack::MovementTrack()
-{
+MovementTrack::MovementTrack() {
reset();
}
-MovementTrack::~MovementTrack()
-{
+MovementTrack::~MovementTrack() {
reset();
}
-void MovementTrack::reset()
-{
+void MovementTrack::reset() {
_currentIndex = -1;
_lastIndex = -1;
_hasNext = 0;
_paused = 0;
- for (int i = 0; i < 100; i++)
- {
+ for (int i = 0; i < 100; i++) {
_entries[i].waypointId = -1;
_entries[i].delay = -1;
_entries[i].angle = -1;
@@ -49,13 +45,11 @@ void MovementTrack::reset()
}
}
-int MovementTrack::append(int waypointId, int delay, int running)
-{
+int MovementTrack::append(int waypointId, int delay, int running) {
return append(waypointId, delay, -1, running);
}
-int MovementTrack::append(int waypointId, int delay, int angle, int running)
-{
+int MovementTrack::append(int waypointId, int delay, int angle, int running) {
if (_lastIndex > ARRAYSIZE(_entries))
return 0;
@@ -70,41 +64,34 @@ int MovementTrack::append(int waypointId, int delay, int angle, int running)
return 1;
}
-void MovementTrack::flush()
-{
+void MovementTrack::flush() {
reset();
}
-void MovementTrack::repeat()
-{
+void MovementTrack::repeat() {
_currentIndex = 0;
_hasNext = 1;
}
-int MovementTrack::pause()
-{
+int MovementTrack::pause() {
_paused = 1;
return 1;
}
-int MovementTrack::unpause()
-{
+int MovementTrack::unpause() {
_paused = 0;
return 1;
}
-int MovementTrack::isPaused()
-{
+int MovementTrack::isPaused() {
return _paused;
}
-int MovementTrack::hasNext()
-{
+int MovementTrack::hasNext() {
return _hasNext;
}
-int MovementTrack::next(int *waypointId, int *delay, int *angle, int *running)
-{
+int MovementTrack::next(int *waypointId, int *delay, int *angle, int *running) {
if (_currentIndex < _lastIndex && this->_hasNext)
{
*waypointId = _entries[_currentIndex].waypointId;
@@ -112,9 +99,7 @@ int MovementTrack::next(int *waypointId, int *delay, int *angle, int *running)
*angle = _entries[_currentIndex].angle;
*running = _entries[_currentIndex++].running;
return 1;
- }
- else
- {
+ } else {
*waypointId = -1;
*delay = -1;
*angle = -1;