diff options
author | Max Horn | 2007-04-25 19:31:23 +0000 |
---|---|---|
committer | Max Horn | 2007-04-25 19:31:23 +0000 |
commit | 00b9bc7b36682365e64d710b4e843659bef373da (patch) | |
tree | 27f48e6cb51c37d595a6dd04d9fc1d773f4f766c /engines/sky | |
parent | 8306e0ebe5bddd5945bdfb436fcfb7148160e029 (diff) | |
download | scummvm-rg350-00b9bc7b36682365e64d710b4e843659bef373da.tar.gz scummvm-rg350-00b9bc7b36682365e64d710b4e843659bef373da.tar.bz2 scummvm-rg350-00b9bc7b36682365e64d710b4e843659bef373da.zip |
Removing lots of superfluous semicola (see mail by David Weinehall on scummvm-devel)
svn-id: r26594
Diffstat (limited to 'engines/sky')
-rw-r--r-- | engines/sky/control.h | 8 | ||||
-rw-r--r-- | engines/sky/disk.h | 2 | ||||
-rw-r--r-- | engines/sky/logic.h | 2 | ||||
-rw-r--r-- | engines/sky/screen.h | 8 | ||||
-rw-r--r-- | engines/sky/sound.h | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/engines/sky/control.h b/engines/sky/control.h index 4143772495..efccd268f4 100644 --- a/engines/sky/control.h +++ b/engines/sky/control.h @@ -133,10 +133,10 @@ struct AllocedMem { class ConResource { public: ConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen); - virtual ~ConResource(void) {}; - void setSprite(void *pSpData) { _spriteData = (dataFileHeader*)pSpData; }; - void setText(uint32 pText) { if (pText) _text = pText + 0x7000; else _text = 0; }; - void setXY(uint16 x, uint16 y) { _x = x; _y = y; }; + virtual ~ConResource(void) {} + void setSprite(void *pSpData) { _spriteData = (dataFileHeader*)pSpData; } + void setText(uint32 pText) { if (pText) _text = pText + 0x7000; else _text = 0; } + void setXY(uint16 x, uint16 y) { _x = x; _y = y; } bool isMouseOver(uint32 mouseX, uint32 mouseY); virtual void drawToScreen(bool doMask); diff --git a/engines/sky/disk.h b/engines/sky/disk.h index 99cb105740..df0b8e380f 100644 --- a/engines/sky/disk.h +++ b/engines/sky/disk.h @@ -54,7 +54,7 @@ public: void fnCacheChip(uint16 *fList); void fnCacheFiles(void); void fnFlushBuffers(void); - uint32 *giveLoadedFilesList(void) { return _loadedFilesList; }; + uint32 *giveLoadedFilesList(void) { return _loadedFilesList; } void refreshFilesList(uint32 *list); protected: diff --git a/engines/sky/logic.h b/engines/sky/logic.h index 53752ca88f..d1189bbef0 100644 --- a/engines/sky/logic.h +++ b/engines/sky/logic.h @@ -143,7 +143,7 @@ public: Sound *skySound); ~Logic(void); void engine(); - void useControlInstance(Control *control) { _skyControl = control; }; + void useControlInstance(Control *control) { _skyControl = control; } uint16 mouseScript(uint32 scrNum, Compact *scriptComp); diff --git a/engines/sky/screen.h b/engines/sky/screen.h index 872d6cf613..15223b0c3e 100644 --- a/engines/sky/screen.h +++ b/engines/sky/screen.h @@ -71,14 +71,14 @@ public: void startSequence(uint16 fileNum); void startSequenceItem(uint16 itemNum); void stopSequence(void); - bool sequenceRunning(void) { return _seqInfo.running; }; + bool sequenceRunning(void) { return _seqInfo.running; } void waitForSequence(void); - uint32 seqFramesLeft(void) { return _seqInfo.framesLeft; }; - uint8 *giveCurrent(void) { return _currentScreen; }; + uint32 seqFramesLeft(void) { return _seqInfo.framesLeft; } + uint8 *giveCurrent(void) { return _currentScreen; } void halvePalette(void); //- regular screen.asm routines - void forceRefresh(void) { memset(_gameGrid, 0x80, GRID_X * GRID_Y); }; + void forceRefresh(void) { memset(_gameGrid, 0x80, GRID_X * GRID_Y); } void fnFadeUp(uint32 palNum, uint32 scroll); void fnFadeDown(uint32 scroll); void fnDrawScreen(uint32 palette, uint32 scroll); diff --git a/engines/sky/sound.h b/engines/sky/sound.h index b515e0e8a4..4d7456195e 100644 --- a/engines/sky/sound.h +++ b/engines/sky/sound.h @@ -70,7 +70,7 @@ public: void playSound(uint16 sound, uint16 volume, uint8 channel); void fnStartFx(uint32 sound, uint8 channel); bool startSpeech(uint16 textNum); - bool speechFinished(void) { return !_mixer->isSoundHandleActive(_ingameSpeech); }; + bool speechFinished(void) { return !_mixer->isSoundHandleActive(_ingameSpeech); } void fnPauseFx(void); void fnUnPauseFx(void); void fnStopFx(void); |