diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/saga/detection.cpp | 4 | ||||
-rw-r--r-- | engines/saga/saga.h | 10 | ||||
-rw-r--r-- | engines/sword2/header.h | 18 | ||||
-rw-r--r-- | engines/sword2/object.h | 12 | ||||
-rw-r--r-- | engines/sword2/screen.h | 2 |
5 files changed, 23 insertions, 23 deletions
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 7fd1024405..9c897d8ebc 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -54,8 +54,8 @@ struct SAGAGameDescription { const GamePatchDescription *patchDescriptions; }; -const bool SagaEngine::isBigEndian() const { return (_gameDescription->features & GF_BIG_ENDIAN_DATA) != 0; } -const bool SagaEngine::isMacResources() const { return (getPlatform() == Common::kPlatformMacintosh); } +bool SagaEngine::isBigEndian() const { return (_gameDescription->features & GF_BIG_ENDIAN_DATA) != 0; } +bool SagaEngine::isMacResources() const { return (getPlatform() == Common::kPlatformMacintosh); } const GameResourceDescription *SagaEngine::getResourceDescription() { return _gameDescription->resourceDescription; } const GameSoundInfo *SagaEngine::getVoiceInfo() const { return _gameDescription->voiceInfo; } const GameSoundInfo *SagaEngine::getSfxInfo() const { return _gameDescription->sfxInfo; } diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 4fd789cb4e..4a5fae7ddb 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -580,15 +580,15 @@ public: _mouseClickCount = 0; } - const bool leftMouseButtonPressed() const { + bool leftMouseButtonPressed() const { return _leftMouseButtonPressed; } - const bool rightMouseButtonPressed() const { + bool rightMouseButtonPressed() const { return _rightMouseButtonPressed; } - const bool mouseButtonPressed() const { + bool mouseButtonPressed() const { return _leftMouseButtonPressed || _rightMouseButtonPressed; } @@ -622,8 +622,8 @@ public: public: bool initGame(void); - const bool isBigEndian() const; - const bool isMacResources() const; + bool isBigEndian() const; + bool isMacResources() const; const GameResourceDescription *getResourceDescription(); const GameSoundInfo *getVoiceInfo() const; const GameSoundInfo *getSfxInfo() const; diff --git a/engines/sword2/header.h b/engines/sword2/header.h index 5100e43de1..8cd8c900f8 100644 --- a/engines/sword2/header.h +++ b/engines/sword2/header.h @@ -56,7 +56,7 @@ struct ResHeader { // compressed) byte name[NAME_LEN]; // Name of object - static const int size() { + static int size() { return 44; } @@ -152,7 +152,7 @@ struct AnimHeader { uint8 feetEndDir; // Direction to start in after running anim uint16 blend; - static const int size() { + static int size() { return 15; } @@ -209,7 +209,7 @@ struct CdtEntry { uint8 frameType; // 0 = print sprite normally with top-left // corner at (x,y), otherwise see below... - static const int size() { + static int size() { return 9; } @@ -250,7 +250,7 @@ struct FrameHeader { uint16 width; // Dimensions of frame uint16 height; - static const int size() { + static int size() { return 8; } @@ -299,7 +299,7 @@ struct MultiScreenHeader { uint32 paletteTable; uint32 maskOffset; - static const int size() { + static int size() { return 36; } @@ -339,7 +339,7 @@ struct ScreenHeader { uint16 height; uint16 noLayers; // number of layer areas - static const int size() { + static int size() { return 6; } @@ -374,7 +374,7 @@ struct LayerHeader { uint32 offset; // where to find mask data (from start of // standard file header) - static const int size() { + static int size() { return 16; } @@ -436,7 +436,7 @@ public: _addr = NULL; } - static const int size() { + static int size() { return 44; } @@ -479,7 +479,7 @@ struct TextHeader { uint32 noOfLines; // how many lines of text are there in this // module - static const int size() { + static int size() { return 4; } diff --git a/engines/sword2/object.h b/engines/sword2/object.h index 57f020eb63..b6b6ca5174 100644 --- a/engines/sword2/object.h +++ b/engines/sword2/object.h @@ -48,7 +48,7 @@ struct ObjectMouse { int32 priority; int32 pointer; // type (or resource id?) of pointer used over this area - static const int size() { + static int size() { return 24; } @@ -91,7 +91,7 @@ public: _addr = addr; } - static const int size() { + static int size() { return 8; } @@ -139,7 +139,7 @@ public: _addr = addr; } - static const int size() { + static int size() { return 12; } @@ -178,7 +178,7 @@ public: _addr = addr; } - static const int size() { + static int size() { return 36; } @@ -240,7 +240,7 @@ public: _addr = addr; } - static const int size() { + static int size() { return 56; } @@ -291,7 +291,7 @@ struct ObjectWalkdata { int32 dx[8 * (12 + 1)]; // walk step distances in x direction int32 dy[8 * (12 + 1)]; // walk step distances in y direction - static const int size() { + static int size() { return 916; } diff --git a/engines/sword2/screen.h b/engines/sword2/screen.h index 93cc5e40ce..6defe51fdc 100644 --- a/engines/sword2/screen.h +++ b/engines/sword2/screen.h @@ -187,7 +187,7 @@ struct Parallax { // The dimensions are followed by an offset table, but we don't know in // advance how big it is. See initializeBackgroundLayer(). - static const int size() { + static int size() { return 4; } |