diff options
author | Johannes Schickel | 2008-06-04 17:20:25 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-06-04 17:20:25 +0000 |
commit | 73da6ab51ef86b89adad28a935ac22bad257b834 (patch) | |
tree | 176ae7f067d513f01a330757f97559d4922f693b /engines/saga/saga.h | |
parent | 0931f926d45db807806f433cde9114839c4de65e (diff) | |
download | scummvm-rg350-73da6ab51ef86b89adad28a935ac22bad257b834.tar.gz scummvm-rg350-73da6ab51ef86b89adad28a935ac22bad257b834.tar.bz2 scummvm-rg350-73da6ab51ef86b89adad28a935ac22bad257b834.zip |
- Removed -Wconversion from compiler options for g++ 4.3, it's behavior has fundamently changed in g++ 4.3
- Added -Wno-empty-body and -Wno-parentheses as compiler flags for g++ 4.3 for *now* (we should think of removing -Wparentheses though)
- Fixed some warnings for g++ 4.3 (only for the engines I'm using)
svn-id: r32540
Diffstat (limited to 'engines/saga/saga.h')
-rw-r--r-- | engines/saga/saga.h | 10 |
1 files changed, 5 insertions, 5 deletions
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; |