aboutsummaryrefslogtreecommitdiff
path: root/engines/draci/game.h
diff options
context:
space:
mode:
authorJohannes Schickel2009-09-30 10:45:14 +0000
committerJohannes Schickel2009-09-30 10:45:14 +0000
commitc9ca057ae2d8d3994aba86bb1ded05e0db008188 (patch)
tree55ec41d9c13bd108b41e28f9642ef24d78e6897b /engines/draci/game.h
parent4477f419034b7c606aef7eb7038337b7229cec33 (diff)
downloadscummvm-rg350-c9ca057ae2d8d3994aba86bb1ded05e0db008188.tar.gz
scummvm-rg350-c9ca057ae2d8d3994aba86bb1ded05e0db008188.tar.bz2
scummvm-rg350-c9ca057ae2d8d3994aba86bb1ded05e0db008188.zip
- Adapt parts of the Draci code to match our code formatting guidelines
- Remove use of tabs for formatting, now in nearly all cases tabs are only used for indentation - Use "uint" instead of "unsigned int" in the whole engine for consistency's sake - Strip some trailing tabs and leading whitespaces svn-id: r44478
Diffstat (limited to 'engines/draci/game.h')
-rw-r--r--engines/draci/game.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/engines/draci/game.h b/engines/draci/game.h
index 861ba6292d..19bd27e6ff 100644
--- a/engines/draci/game.h
+++ b/engines/draci/game.h
@@ -70,7 +70,8 @@ enum {
};
enum {
- kNoDialogue = -1, kDialogueLines = 4
+ kNoDialogue = -1,
+ kDialogueLines = 4
};
enum {
@@ -94,8 +95,7 @@ enum InventoryConstants {
};
class WalkingMap {
-
-public:
+public:
WalkingMap() {
_realWidth = 0;
_realHeight = 0;
@@ -103,7 +103,7 @@ public:
_mapHeight = 0;
_byteWidth = 0;
_data = NULL;
- }
+ }
void load(const byte *data, uint length) {
Common::MemoryReadStream mapReader(data, length);
@@ -132,7 +132,6 @@ private:
};
struct GameObject {
-
uint _init, _look, _use, _canUse;
bool _imInit, _imLook, _imUse;
int _walkDir;
@@ -181,7 +180,7 @@ struct Dialogue {
};
struct Room {
- int _roomNum;
+ int _roomNum;
byte _music;
WalkingMap _walkingMap;
byte _palette;
@@ -213,9 +212,9 @@ enum LoopSubstatus {
/**
* Enumerates the animations for the dragon's movement.
*/
-
enum Movement {
- kMoveUndefined, kMoveDown, kMoveUp, kMoveRight, kMoveLeft,
+ kMoveUndefined,
+ kMoveDown, kMoveUp, kMoveRight, kMoveLeft,
kMoveRightDown, kMoveRightUp, kMoveLeftDown, kMoveLeftUp,
kMoveDownRight, kMoveUpRight, kMoveDownLeft, kMoveUpLeft,
kMoveLeftRight, kMoveRightLeft, kMoveUpStopLeft, kMoveUpStopRight,
@@ -223,9 +222,7 @@ enum Movement {
};
class Game {
-
public:
-
Game(DraciEngine *vm);
~Game();
@@ -395,7 +392,7 @@ private:
uint _speechTick;
int _objUnderCursor;
- int _oldObjUnderCursor;
+ int _oldObjUnderCursor;
int _animUnderCursor;
int _markedAnimationIndex; //!< Used by the Mark GPL command