diff options
author | Eugene Sandulenko | 2007-04-27 22:33:45 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2007-04-27 22:33:45 +0000 |
commit | ffce26ebfea301ec33f3d485fa9dbaa0dffccb5b (patch) | |
tree | b62bf14bf84b48b602f12c3aacd9c652a49bef46 /engines/cruise/actor.h | |
parent | 101fbdd64f1a9d62c40dcdd20d618a098dc9df7e (diff) | |
download | scummvm-rg350-ffce26ebfea301ec33f3d485fa9dbaa0dffccb5b.tar.gz scummvm-rg350-ffce26ebfea301ec33f3d485fa9dbaa0dffccb5b.tar.bz2 scummvm-rg350-ffce26ebfea301ec33f3d485fa9dbaa0dffccb5b.zip |
Fix code formatting (partially) and guard defines in includes.
svn-id: r26631
Diffstat (limited to 'engines/cruise/actor.h')
-rw-r--r-- | engines/cruise/actor.h | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/engines/cruise/actor.h b/engines/cruise/actor.h index 3c2f2a5037..7b8a5752dd 100644 --- a/engines/cruise/actor.h +++ b/engines/cruise/actor.h @@ -22,25 +22,24 @@ * */ -#ifndef _ACTOR_H_ -#define _ACTOR_H_ +#ifndef CRUISE_ACTOR_H +#define CRUISE_ACTOR_H namespace Cruise { -enum animPhase -{ - ANIM_PHASE_WAIT = 0, - ANIM_PHASE_STATIC = 1, - ANIM_PHASE_MOVE = 2, - ANIM_PHASE_STATIC_END = 3, - ANIM_PHASE_END = 4 +enum animPhase { + ANIM_PHASE_WAIT = 0, + ANIM_PHASE_STATIC = 1, + ANIM_PHASE_MOVE = 2, + ANIM_PHASE_STATIC_END = 3, + ANIM_PHASE_END = 4 }; typedef enum animPhase animPhase; struct actorStruct { - struct actorStruct* next; - struct actorStruct* prev; + struct actorStruct *next; + struct actorStruct *prev; int16 idx; int16 type; @@ -65,10 +64,13 @@ struct actorStruct { typedef struct actorStruct actorStruct; -int16 mainProc13(int overlayIdx, int param1, actorStruct* pStartEntry, int param2); -actorStruct* findActor(int overlayIdx, int param1, actorStruct* pStartEntry, int param2); +int16 mainProc13(int overlayIdx, int param1, actorStruct * pStartEntry, + int param2); +actorStruct *findActor(int overlayIdx, int param1, actorStruct * pStartEntry, + int param2); void processAnimation(void); void getPixel(int x, int y); + } // End of namespace Cruise #endif |