aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise/actor.cpp
diff options
context:
space:
mode:
authorSven Hesse2007-11-04 13:01:41 +0000
committerSven Hesse2007-11-04 13:01:41 +0000
commit906a423fa7767c5100a1269cc90231840eb5e728 (patch)
tree33059093b8afb563089e1e21432c3c728f00f0d5 /engines/cruise/actor.cpp
parentfa15952f09129b0bfcbc2d1ba45f5a4094c4d86c (diff)
downloadscummvm-rg350-906a423fa7767c5100a1269cc90231840eb5e728.tar.gz
scummvm-rg350-906a423fa7767c5100a1269cc90231840eb5e728.tar.bz2
scummvm-rg350-906a423fa7767c5100a1269cc90231840eb5e728.zip
Some code formating fixes
svn-id: r29409
Diffstat (limited to 'engines/cruise/actor.cpp')
-rw-r--r--engines/cruise/actor.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp
index 777b09d214..2164d1c7e2 100644
--- a/engines/cruise/actor.cpp
+++ b/engines/cruise/actor.cpp
@@ -33,10 +33,8 @@ int16 mainProc13(int overlayIdx, int param1, actorStruct *pStartEntry, int param
while (pCurrentEntry) {
if ((pCurrentEntry->overlayNumber == overlayIdx || overlayIdx == -1) &&
(pCurrentEntry->idx == param1 || param1 == -1) &&
- (pCurrentEntry->type == param2 || param2 == -1))
- {
- if(pCurrentEntry->pathId != -2)
- {
+ (pCurrentEntry->type == param2 || param2 == -1)) {
+ if (pCurrentEntry->pathId != -2) {
return 0;
}
}
@@ -769,8 +767,7 @@ void processAnimation(void) {
while (currentActor) {
nextActor = currentActor->next;
- if (!currentActor->freeze && ((currentActor->type == 0) || (currentActor->type == 1)))
- {
+ if (!currentActor->freeze && ((currentActor->type == 0) || (currentActor->type == 1))) {
getMultipleObjectParam(currentActor->overlayNumber, currentActor->idx, &params);
if (((animationStart && !currentActor->flag) || (!animationStart && currentActor->x_dest != -1 && currentActor->y_dest != -1)) && (currentActor->type == 0)) {
@@ -859,8 +856,7 @@ void processAnimation(void) {
if ((currentActor->counter >= 0)
&& ((currentActor->phase == ANIM_PHASE_STATIC_END)
- || (currentActor->phase == ANIM_PHASE_STATIC)))
- {
+ || (currentActor->phase == ANIM_PHASE_STATIC))) {
int newA;
int inc = 1;
int t_inc = currentActor->startDirection - 1;