diff options
| author | Paweł Kołodziejski | 2003-03-06 17:58:13 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-03-06 17:58:13 +0000 |
| commit | 093428ae9a6a1fd33003a8a0827d7410501a74cb (patch) | |
| tree | 00a37a896d37505db01dd69a162627df49e4990c /scumm/scumm.h | |
| parent | 90680fe9bb614c1c5b7030821445e294c937f152 (diff) | |
| download | scummvm-rg350-093428ae9a6a1fd33003a8a0827d7410501a74cb.tar.gz scummvm-rg350-093428ae9a6a1fd33003a8a0827d7410501a74cb.tar.bz2 scummvm-rg350-093428ae9a6a1fd33003a8a0827d7410501a74cb.zip | |
and more cleanup
svn-id: r6718
Diffstat (limited to 'scumm/scumm.h')
| -rw-r--r-- | scumm/scumm.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 63d8d89d2f..c42307c3d1 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -61,11 +61,11 @@ enum { struct ScummPoint { int x, y; - bool operator ==(const ScummPoint &p) const + bool operator == (const ScummPoint &p) const { return p.x == x && p.y == y; } - bool operator !=(const ScummPoint &p) const + bool operator != (const ScummPoint &p) const { return p.x != x || p.y != y; } @@ -319,7 +319,7 @@ public: // Scumm main loop void mainRun(); int scummLoop(int delta); - + // Event handling void waitForTimer(int msec_delay); void processKbd(); @@ -442,15 +442,13 @@ protected: bool saveState(int slot, bool compat, SaveFileManager *mgr); bool loadState(int slot, bool compat, SaveFileManager *mgr); - bool saveState(int slot, bool compat) - { + bool saveState(int slot, bool compat) { SaveFileManager *mgr = _system->get_savefile_manager(); bool result = saveState(slot, compat, mgr); delete mgr; return result; } - bool loadState(int slot, bool compat) - { + bool loadState(int slot, bool compat) { SaveFileManager *mgr = _system->get_savefile_manager(); bool result = loadState(slot, compat, mgr); delete mgr; @@ -600,7 +598,7 @@ public: int _lastLoadedRoom, _roomResource; byte *findResourceData(uint32 tag, byte *ptr); int getResourceDataSize(byte *ptr); - + int getArrayId(); void nukeArray(int a); int defineArray(int a, int b, int c, int d); @@ -934,7 +932,7 @@ public: Box *getBoxBaseAddr(int box); byte getBoxFlags(int box); int getBoxScale(int box); - + int getScale(int box, int x, int y); void setScaleItem(int slot, int a, int b, int c, int d); @@ -1074,7 +1072,7 @@ public: byte VAR_SOUNDRESULT; byte VAR_TALKSTOP_KEY; byte VAR_59; - + byte VAR_SOUNDPARAM; byte VAR_SOUNDPARAM2; byte VAR_SOUNDPARAM3; |