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/object.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/object.h')
-rw-r--r-- | engines/cruise/object.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engines/cruise/object.h b/engines/cruise/object.h index ca736143a2..24b8461851 100644 --- a/engines/cruise/object.h +++ b/engines/cruise/object.h @@ -22,41 +22,41 @@ * */ -#ifndef _OBJECT_H_ -#define _OBJECT_H_ +#ifndef CRUISE_OBJECT_H +#define CRUISE_OBJECT_H namespace Cruise { -struct gfxEntryStruct -{ - uint8* imagePtr; - int imageSize; - int fontIndex; - int height; - int width; // for font: max right border; for sprite: just width +struct gfxEntryStruct { + uint8 *imagePtr; + int imageSize; + int fontIndex; + int height; + int width; // for font: max right border; for sprite: just width }; typedef struct gfxEntryStruct gfxEntryStruct; #define OBJ_SPRITE 4 -struct objectParamsQuery -{ +struct objectParamsQuery { int16 X; int16 Y; int16 baseFileIdx; int16 fileIdx; int16 scale; int16 var5; - int16 var6; - int16 var7; + int16 var6; + int16 var7; }; typedef struct objectParamsQuery objectParamsQuery; -objDataStruct* getObjectDataFromOverlay(int ovlIdx,int objIdx); -int16 getSingleObjectParam(int16 overlayIdx,int16 param2,int16 param3,int16* returnParam); -int16 getMultipleObjectParam(int16 overlayIdx,int16 objectIdx,objectParamsQuery* returnParam); +objDataStruct *getObjectDataFromOverlay(int ovlIdx, int objIdx); +int16 getSingleObjectParam(int16 overlayIdx, int16 param2, int16 param3, + int16 * returnParam); +int16 getMultipleObjectParam(int16 overlayIdx, int16 objectIdx, + objectParamsQuery * returnParam); } // End of namespace Cruise |