From 51933629d1f1a17839ddbb75b2b619effe117abb Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 2 Nov 2009 21:54:57 +0000 Subject: Changed foo(void) to foo() in almost all non-backend source files svn-id: r45616 --- engines/agi/agi.cpp | 4 +- engines/agi/agi.h | 36 ++--- engines/agi/console.h | 8 +- engines/agi/detection.cpp | 4 +- engines/agi/keyboard.cpp | 6 +- engines/agi/op_test.cpp | 2 +- engines/agi/preagi.h | 8 +- engines/agi/predictive.cpp | 6 +- engines/agi/saveload.cpp | 4 +- engines/agi/sound.cpp | 2 +- engines/agos/midi.h | 2 +- engines/agos/script.cpp | 2 +- engines/agos/script_s1.cpp | 2 +- engines/cine/anim.h | 2 +- engines/cine/bg_list.cpp | 2 +- engines/cine/bg_list.h | 2 +- engines/cine/cine.h | 6 +- engines/cine/gfx.h | 12 +- engines/cine/part.cpp | 2 +- engines/cine/part.h | 2 +- engines/cine/saveload.cpp | 2 +- engines/cine/script.h | 20 +-- engines/cine/script_fw.cpp | 18 +-- engines/cine/texte.h | 2 +- engines/cine/various.cpp | 20 +-- engines/cine/various.h | 24 ++-- engines/cine/xref.txt | 2 +- engines/cruise/actor.cpp | 2 +- engines/cruise/actor.h | 2 +- engines/cruise/cruise.h | 8 +- engines/cruise/cruise_main.cpp | 12 +- engines/cruise/cruise_main.h | 10 +- engines/cruise/decompiler.cpp | 28 ++-- engines/cruise/font.cpp | 4 +- engines/cruise/font.h | 4 +- engines/cruise/function.cpp | 242 ++++++++++++++++----------------- engines/cruise/function.h | 4 +- engines/cruise/gfxModule.cpp | 8 +- engines/cruise/gfxModule.h | 12 +- engines/cruise/linker.cpp | 2 +- engines/cruise/linker.h | 2 +- engines/cruise/mainDraw.cpp | 8 +- engines/cruise/mainDraw.h | 2 +- engines/cruise/object.cpp | 2 +- engines/cruise/object.h | 2 +- engines/cruise/overlay.cpp | 2 +- engines/cruise/overlay.h | 2 +- engines/cruise/perso.cpp | 2 +- engines/cruise/perso.h | 2 +- engines/cruise/saveload.cpp | 2 +- engines/cruise/saveload.h | 2 +- engines/cruise/script.cpp | 26 ++-- engines/cruise/script.h | 4 +- engines/cruise/stack.cpp | 2 +- engines/cruise/stack.h | 4 +- engines/cruise/vars.h | 4 +- engines/cruise/volume.cpp | 10 +- engines/cruise/volume.h | 8 +- engines/draci/barchive.cpp | 2 +- engines/draci/barchive.h | 4 +- engines/draci/music.h | 2 +- engines/draci/sound.h | 2 +- engines/engine.cpp | 2 +- engines/gob/draw_bargon.cpp | 2 +- engines/gob/expression.h | 2 +- engines/gob/goblin.cpp | 18 +-- engines/gob/goblin.h | 30 ++-- engines/gob/goblin_v1.cpp | 2 +- engines/gob/goblin_v2.cpp | 4 +- engines/gob/hotspots.cpp | 2 +- engines/gob/map.cpp | 2 +- engines/gob/map.h | 4 +- engines/gob/map_v1.cpp | 2 +- engines/gob/mult.cpp | 8 +- engines/gob/util.cpp | 16 +-- engines/gob/util.h | 16 +-- engines/groovie/music.cpp | 2 +- engines/groovie/music.h | 2 +- engines/kyra/sound_intern.h | 2 +- engines/kyra/sound_midi.cpp | 2 +- engines/kyra/sound_towns.cpp | 2 +- engines/lure/sound.h | 2 +- engines/m4/console.h | 2 +- engines/m4/midi.h | 2 +- engines/made/music.h | 2 +- engines/made/redreader.cpp | 2 +- engines/made/redreader.h | 8 +- engines/parallaction/parallaction.h | 2 +- engines/queen/music.h | 2 +- engines/saga/actor.cpp | 2 +- engines/saga/animation.cpp | 14 +- engines/saga/animation.h | 22 +-- engines/saga/console.h | 2 +- engines/saga/events.cpp | 2 +- engines/saga/events.h | 2 +- engines/saga/font.cpp | 2 +- engines/saga/font.h | 2 +- engines/saga/interface.cpp | 6 +- engines/saga/interface.h | 8 +- engines/saga/music.cpp | 6 +- engines/saga/music.h | 14 +- engines/saga/objectmap.cpp | 2 +- engines/saga/objectmap.h | 6 +- engines/saga/palanim.cpp | 2 +- engines/saga/palanim.h | 2 +- engines/saga/puzzle.cpp | 16 +-- engines/saga/puzzle.h | 22 +-- engines/saga/render.cpp | 4 +- engines/saga/render.h | 6 +- engines/saga/saga.h | 4 +- engines/saga/scene.h | 2 +- engines/saga/script.cpp | 10 +- engines/saga/script.h | 4 +- engines/saga/sprite.cpp | 2 +- engines/saga/sprite.h | 2 +- engines/saga/sthread.cpp | 4 +- engines/sci/engine/kpathing.cpp | 2 +- engines/sci/engine/said.y | 4 +- engines/sci/gui/gui_animate.h | 2 +- engines/sci/gui/gui_controls.h | 2 +- engines/sci/gui/gui_gfx.cpp | 4 +- engines/sci/gui/gui_gfx.h | 2 +- engines/sci/gui/gui_portrait.h | 2 +- engines/sci/gui/gui_text.h | 2 +- engines/sci/gui/gui_transitions.h | 2 +- engines/sci/resource.h | 2 +- engines/sci/sfx/core.cpp | 4 +- engines/sci/sfx/seq/gm.cpp | 4 +- engines/scumm/he/logic_he.h | 2 +- engines/scumm/insane/insane.cpp | 32 ++--- engines/scumm/insane/insane.h | 60 ++++---- engines/scumm/insane/insane_ben.cpp | 10 +- engines/scumm/insane/insane_enemy.cpp | 10 +- engines/scumm/insane/insane_iact.cpp | 4 +- engines/scumm/insane/insane_scenes.cpp | 6 +- engines/scumm/player_nes.cpp | 70 +++++----- engines/scumm/player_v2a.cpp | 2 +- engines/sky/autoroute.cpp | 2 +- engines/sky/autoroute.h | 2 +- engines/sky/compact.cpp | 6 +- engines/sky/compact.h | 6 +- engines/sky/control.cpp | 36 ++--- engines/sky/control.h | 38 +++--- engines/sky/disk.cpp | 6 +- engines/sky/disk.h | 8 +- engines/sky/grid.cpp | 4 +- engines/sky/grid.h | 4 +- engines/sky/intro.cpp | 8 +- engines/sky/intro.h | 8 +- engines/sky/logic.cpp | 6 +- engines/sky/logic.h | 6 +- engines/sky/mouse.cpp | 12 +- engines/sky/mouse.h | 24 ++-- engines/sky/music/adlibchannel.cpp | 30 ++-- engines/sky/music/adlibchannel.h | 38 +++--- engines/sky/music/adlibmusic.cpp | 12 +- engines/sky/music/adlibmusic.h | 12 +- engines/sky/music/gmchannel.cpp | 30 ++-- engines/sky/music/gmchannel.h | 38 +++--- engines/sky/music/gmmusic.cpp | 8 +- engines/sky/music/gmmusic.h | 8 +- engines/sky/music/mt32music.cpp | 8 +- engines/sky/music/mt32music.h | 8 +- engines/sky/music/musicbase.cpp | 18 +-- engines/sky/music/musicbase.h | 22 +-- engines/sky/screen.cpp | 22 +-- engines/sky/screen.h | 32 ++--- engines/sky/sky.cpp | 10 +- engines/sky/sky.h | 6 +- engines/sky/sound.cpp | 14 +- engines/sky/sound.h | 16 +-- engines/sky/text.cpp | 4 +- engines/sky/text.h | 4 +- engines/sword1/animation.cpp | 4 +- engines/sword1/animation.h | 4 +- engines/sword1/collision.h | 8 +- engines/sword1/control.cpp | 34 ++--- engines/sword1/control.h | 36 ++--- engines/sword1/eventman.cpp | 4 +- engines/sword1/eventman.h | 4 +- engines/sword1/logic.cpp | 8 +- engines/sword1/logic.h | 8 +- engines/sword1/memman.cpp | 8 +- engines/sword1/memman.h | 8 +- engines/sword1/menu.cpp | 16 +-- engines/sword1/menu.h | 20 +-- engines/sword1/mouse.cpp | 20 +-- engines/sword1/mouse.h | 20 +-- engines/sword1/music.cpp | 6 +- engines/sword1/objectman.cpp | 4 +- engines/sword1/objectman.h | 4 +- engines/sword1/resman.cpp | 6 +- engines/sword1/resman.h | 6 +- engines/sword1/router.h | 2 +- engines/sword1/screen.cpp | 24 ++-- engines/sword1/screen.h | 24 ++-- engines/sword1/sound.cpp | 16 +-- engines/sword1/sound.h | 14 +- engines/sword1/sword1.cpp | 10 +- engines/sword1/sword1.h | 10 +- engines/sword1/text.cpp | 2 +- engines/sword1/text.h | 2 +- engines/sword2/animation.cpp | 2 +- engines/sword2/animation.h | 2 +- engines/tinsel/actors.cpp | 12 +- engines/tinsel/actors.h | 14 +- engines/tinsel/background.cpp | 4 +- engines/tinsel/background.h | 14 +- engines/tinsel/bg.cpp | 10 +- engines/tinsel/bmv.cpp | 26 ++-- engines/tinsel/bmv.h | 24 ++-- engines/tinsel/cliprect.cpp | 2 +- engines/tinsel/config.cpp | 4 +- engines/tinsel/config.h | 4 +- engines/tinsel/cursor.cpp | 32 ++--- engines/tinsel/cursor.h | 24 ++-- engines/tinsel/debugger.cpp | 4 +- engines/tinsel/debugger.h | 2 +- engines/tinsel/dialogs.cpp | 76 +++++------ engines/tinsel/dialogs.h | 20 +-- engines/tinsel/drives.cpp | 6 +- engines/tinsel/drives.h | 6 +- engines/tinsel/events.cpp | 32 ++--- engines/tinsel/events.h | 26 ++-- engines/tinsel/faders.cpp | 2 +- engines/tinsel/faders.h | 2 +- engines/tinsel/font.cpp | 2 +- engines/tinsel/font.h | 8 +- engines/tinsel/handle.cpp | 6 +- engines/tinsel/handle.h | 4 +- engines/tinsel/heapmem.cpp | 4 +- engines/tinsel/mareels.cpp | 4 +- engines/tinsel/mareels.h | 4 +- engines/tinsel/move.cpp | 4 +- engines/tinsel/move.h | 4 +- engines/tinsel/music.cpp | 6 +- engines/tinsel/music.h | 6 +- engines/tinsel/object.cpp | 8 +- engines/tinsel/object.h | 8 +- engines/tinsel/palette.cpp | 18 +-- engines/tinsel/palette.h | 20 +-- engines/tinsel/pcode.cpp | 10 +- engines/tinsel/pcode.h | 6 +- engines/tinsel/pdisplay.cpp | 16 +-- engines/tinsel/pdisplay.h | 4 +- engines/tinsel/play.cpp | 4 +- engines/tinsel/play.h | 2 +- engines/tinsel/polygons.cpp | 8 +- engines/tinsel/polygons.h | 8 +- engines/tinsel/rince.cpp | 4 +- engines/tinsel/rince.h | 4 +- engines/tinsel/saveload.cpp | 12 +- engines/tinsel/savescn.cpp | 10 +- engines/tinsel/savescn.h | 10 +- engines/tinsel/scene.cpp | 16 +-- engines/tinsel/scene.h | 4 +- engines/tinsel/sched.cpp | 8 +- engines/tinsel/sched.h | 2 +- engines/tinsel/scroll.cpp | 18 +-- engines/tinsel/scroll.h | 12 +- engines/tinsel/sound.cpp | 6 +- engines/tinsel/sound.h | 6 +- engines/tinsel/strres.cpp | 6 +- engines/tinsel/strres.h | 6 +- engines/tinsel/sysvar.cpp | 4 +- engines/tinsel/sysvar.h | 2 +- engines/tinsel/timers.cpp | 4 +- engines/tinsel/timers.h | 6 +- engines/tinsel/tinlib.cpp | 84 ++++++------ engines/tinsel/tinlib.h | 6 +- engines/tinsel/tinsel.cpp | 24 ++-- engines/tinsel/tinsel.h | 12 +- engines/tinsel/token.cpp | 2 +- engines/tinsel/token.h | 2 +- 274 files changed, 1404 insertions(+), 1404 deletions(-) (limited to 'engines') diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 95939684de..ca76d91169 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -269,7 +269,7 @@ void AgiEngine::processEvents() { } } -void AgiEngine::pollTimer(void) { +void AgiEngine::pollTimer() { static uint32 m = 0; uint32 dm; @@ -715,7 +715,7 @@ void AgiEngine::syncSoundSettings() { _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech); } -void AgiEngine::parseFeatures(void) { +void AgiEngine::parseFeatures() { if (!ConfMan.hasKey("features")) return; diff --git a/engines/agi/agi.h b/engines/agi/agi.h index 994edcc11b..679d686b7e 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -721,10 +721,10 @@ public: bool _noSaveLoadAllowed; - virtual void pollTimer(void) = 0; - virtual int getKeypress(void) = 0; - virtual bool isKeypress(void) = 0; - virtual void clearKeyQueue(void) = 0; + virtual void pollTimer() = 0; + virtual int getKeypress() = 0; + virtual bool isKeypress() = 0; + virtual void clearKeyQueue() = 0; AgiBase(OSystem *syst, const AGIGameDescription *gameDesc); @@ -755,9 +755,9 @@ public: Common::Language getLanguage() const; Common::Platform getPlatform() const; const char *getGameMD5() const; - void initFeatures(void); + void initFeatures(); void setFeature(uint32 feature); - void initVersion(void); + void initVersion(); void setVersion(uint16 version); bool canLoadGameStateCurrently(); @@ -800,7 +800,7 @@ private: int checkCollision(VtEntry *v); int checkPosition(VtEntry *v); - void parseFeatures(void); + void parseFeatures(); int _firstSlot; @@ -854,10 +854,10 @@ public: int agiUnloadResource(int, int); void agiUnloadResources(); - virtual void pollTimer(void); - virtual int getKeypress(void); - virtual bool isKeypress(void); - virtual void clearKeyQueue(void); + virtual void pollTimer(); + virtual int getKeypress(); + virtual bool isKeypress(); + virtual void clearKeyQueue(); static void agiTimerFunctionLow(void *refCon); void initPriTable(); @@ -981,27 +981,27 @@ public: int messageBox(const char *); int selectionBox(const char *, const char **); - void closeWindow(void); + void closeWindow(); void drawWindow(int, int, int, int); void printText(const char *, int, int, int, int, int, int, bool checkerboard = false); void printTextConsole(const char *, int, int, int, int, int); int print(const char *, int, int, int); char *wordWrapString(const char *, int *); char *agiSprintf(const char *); - void writeStatus(void); - void writePrompt(void); - void clearPrompt(void); + void writeStatus(); + void writePrompt(); + void clearPrompt(); void clearLines(int, int, int); void flushLines(int, int); - bool predictiveDialog(void); + bool predictiveDialog(); private: void printStatus(const char *message, ...) GCC_PRINTF(2, 3); void printText2(int l, const char *msg, int foff, int xoff, int yoff, int len, int fg, int bg, bool checkerboard = false); void blitTextbox(const char *p, int y, int x, int len); void eraseTextbox(); - void loadDict(void); - bool matchWord(void); + void loadDict(); + bool matchWord(); // Predictive dialog // TODO: Move this to a separate class diff --git a/engines/agi/console.h b/engines/agi/console.h index b75abe2ccd..270f4e86bd 100644 --- a/engines/agi/console.h +++ b/engines/agi/console.h @@ -49,7 +49,7 @@ struct AgiDebug { class Console : public GUI::Debugger { public: Console(AgiEngine *vm); - virtual ~Console(void); + virtual ~Console(); protected: virtual void preEnter(); @@ -81,7 +81,7 @@ private: class PreAGI_Console : public GUI::Debugger { public: PreAGI_Console(PreAgiEngine *vm); - virtual ~PreAGI_Console(void) {} + virtual ~PreAGI_Console() {} protected: virtual void preEnter() {} @@ -95,7 +95,7 @@ private: class Mickey_Console : public PreAGI_Console { public: Mickey_Console(PreAgiEngine *vm, Mickey *mickey); - virtual ~Mickey_Console(void) {} + virtual ~Mickey_Console() {} protected: virtual void preEnter() {} @@ -113,7 +113,7 @@ private: class Winnie_Console : public PreAGI_Console { public: Winnie_Console(PreAgiEngine *vm, Winnie *winnie); - virtual ~Winnie_Console(void) {} + virtual ~Winnie_Console() {} protected: virtual void preEnter() {} diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 8760adb19e..e22a8148ce 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -74,7 +74,7 @@ const char *AgiBase::getGameMD5() const { return _gameDescription->desc.filesDescriptions[0].md5; } -void AgiBase::initFeatures(void) { +void AgiBase::initFeatures() { _gameFeatures = _gameDescription->features; } @@ -86,7 +86,7 @@ void AgiBase::setVersion(uint16 version) { _gameVersion = version; } -void AgiBase::initVersion(void) { +void AgiBase::initVersion() { _gameVersion = _gameDescription->version; } diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp index ea384f3418..d5ef590961 100644 --- a/engines/agi/keyboard.cpp +++ b/engines/agi/keyboard.cpp @@ -421,12 +421,12 @@ int AgiEngine::waitAnyKey() { return key; } -bool AgiEngine::isKeypress(void) { +bool AgiEngine::isKeypress() { processEvents(); return _keyQueueStart != _keyQueueEnd; } -int AgiEngine::getKeypress(void) { +int AgiEngine::getKeypress() { int k; while (_keyQueueStart == _keyQueueEnd) // block @@ -437,7 +437,7 @@ int AgiEngine::getKeypress(void) { return k; } -void AgiEngine::clearKeyQueue(void) { +void AgiEngine::clearKeyQueue() { while (isKeypress()) { getKeypress(); } diff --git a/engines/agi/op_test.cpp b/engines/agi/op_test.cpp index ca80798a52..16ceb2ef72 100644 --- a/engines/agi/op_test.cpp +++ b/engines/agi/op_test.cpp @@ -36,7 +36,7 @@ static uint8 testObjInBox(uint8, uint8, uint8, uint8, uint8); static uint8 testPosn(uint8, uint8, uint8, uint8, uint8); static uint8 testSaid(uint8, uint8 *); static uint8 testController(uint8); -static uint8 testKeypressed(void); +static uint8 testKeypressed(); static uint8 testCompareStrings(uint8, uint8); static AgiEngine *g_agi; diff --git a/engines/agi/preagi.h b/engines/agi/preagi.h index 89d120b0ae..0fe0064e76 100644 --- a/engines/agi/preagi.h +++ b/engines/agi/preagi.h @@ -41,10 +41,10 @@ protected: void initialize(); public: - void pollTimer(void) {} - int getKeypress(void) { return 0; } - bool isKeypress(void) { return false; } - void clearKeyQueue(void) {} + void pollTimer() {} + int getKeypress() { return 0; } + bool isKeypress() { return false; } + void clearKeyQueue() {} PreAgiEngine(OSystem *syst, const AGIGameDescription *gameDesc); virtual ~PreAgiEngine(); diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp index c2f031ea75..ea674272e6 100644 --- a/engines/agi/predictive.cpp +++ b/engines/agi/predictive.cpp @@ -92,7 +92,7 @@ void bringWordtoTop(char *str, int wordnum) { memcpy(str, tmp.c_str(), strlen(str)); } -bool AgiEngine::predictiveDialog(void) { +bool AgiEngine::predictiveDialog() { int key = 0, active = -1, lastactive = 0; bool rc = false; uint8 x; @@ -483,7 +483,7 @@ bool AgiEngine::predictiveDialog(void) { return rc; } -void AgiEngine::loadDict(void) { +void AgiEngine::loadDict() { Common::File inFile; int lines = 0; @@ -550,7 +550,7 @@ void AgiEngine::loadDict(void) { printf("Time to parse pred.dic: %d, total: %d\n", time3-time2, time3-time1); } -bool AgiEngine::matchWord(void) { +bool AgiEngine::matchWord() { if (_currentCode.empty()) { return false; } diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp index df3667d312..431c190a8f 100644 --- a/engines/agi/saveload.cpp +++ b/engines/agi/saveload.cpp @@ -974,11 +974,11 @@ void AgiEngine::replayImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3, } } -void AgiEngine::clearImageStack(void) { +void AgiEngine::clearImageStack() { _imageStack.clear(); } -void AgiEngine::releaseImageStack(void) { +void AgiEngine::releaseImageStack() { _imageStack.clear(); } diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index 5e52a66d91..7c0e895219 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -931,7 +931,7 @@ void SoundMgr::playSound() { } } -uint32 SoundMgr::mixSound(void) { +uint32 SoundMgr::mixSound() { register int i, p; const int16 *src; int c, b, m; diff --git a/engines/agos/midi.h b/engines/agos/midi.h index c004230e5b..d4c09118f6 100644 --- a/engines/agos/midi.h +++ b/engines/agos/midi.h @@ -121,7 +121,7 @@ public: // Timing functions - MidiDriver now operates timers void setTimerCallback(void *timer_param, void (*timer_proc) (void *)) { } - uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; } + uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; } // Channel allocation functions MidiChannel *allocateChannel() { return 0; } diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index 89590beef1..90992b52fe 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -33,7 +33,7 @@ #include "agos/agos.h" #ifdef _WIN32_WCE -extern bool isSmartphone(void); +extern bool isSmartphone(); #endif namespace AGOS { diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp index 81efb5cd81..797a938bc6 100644 --- a/engines/agos/script_s1.cpp +++ b/engines/agos/script_s1.cpp @@ -29,7 +29,7 @@ #include "agos/agos.h" #ifdef _WIN32_WCE -extern bool isSmartphone(void); +extern bool isSmartphone(); #endif namespace AGOS { diff --git a/engines/cine/anim.h b/engines/cine/anim.h index 6370f64342..e67237aac0 100644 --- a/engines/cine/anim.h +++ b/engines/cine/anim.h @@ -101,7 +101,7 @@ public: extern Common::Array animDataTable; -void freeAnimDataTable(void); +void freeAnimDataTable(); void freeAnimDataRange(byte startIdx, byte numIdx); int loadResource(const char *resourceName, int16 idx = -1); void loadResourcesFromSave(Common::SeekableReadStream &fHandle, enum CineSaveGameFormat saveGameFormat); diff --git a/engines/cine/bg_list.cpp b/engines/cine/bg_list.cpp index 8a79bfeea1..e7c0993066 100644 --- a/engines/cine/bg_list.cpp +++ b/engines/cine/bg_list.cpp @@ -76,7 +76,7 @@ void createBgIncrustListElement(int16 objIdx, int16 param) { /*! \brief Reset var8 (probably something related to bgIncrustList) */ -void resetBgIncrustList(void) { +void resetBgIncrustList() { var8 = 0; } diff --git a/engines/cine/bg_list.h b/engines/cine/bg_list.h index f6c73ea9a3..409b16dbd5 100644 --- a/engines/cine/bg_list.h +++ b/engines/cine/bg_list.h @@ -49,7 +49,7 @@ void addToBGList(int16 objIdx); void addSpriteFilledToBGList(int16 idx); void createBgIncrustListElement(int16 objIdx, int16 param); -void resetBgIncrustList(void); +void resetBgIncrustList(); void loadBgIncrustFromSave(Common::SeekableReadStream &fHandle); } // End of namespace Cine diff --git a/engines/cine/cine.h b/engines/cine/cine.h index 1031d6d449..ab43674af7 100644 --- a/engines/cine/cine.h +++ b/engines/cine/cine.h @@ -87,8 +87,8 @@ public: Common::Language getLanguage() const; Common::Platform getPlatform() const; - bool loadSaveDirectory(void); - void makeSystemMenu(void); + bool loadSaveDirectory(); + void makeSystemMenu(); int modifyGameSpeed(int speedChange); int getTimerDelay() const; Common::Error loadGameState(int slot); @@ -106,7 +106,7 @@ public: TextHandler _textHandler; private: - void initialize(void); + void initialize(); void resetEngine(); bool loadPlainSaveFW(Common::SeekableReadStream &in, CineSaveGameFormat saveGameFormat); bool loadTempSaveOS(Common::SeekableReadStream &in); diff --git a/engines/cine/gfx.h b/engines/cine/gfx.h index 528b8c8588..caf9b44ba7 100644 --- a/engines/cine/gfx.h +++ b/engines/cine/gfx.h @@ -264,7 +264,7 @@ void setMouseCursor(int cursor); void gfxCopyPage(byte *source, byte *dest); void transformPaletteRange(byte startColor, byte numColor, int8 r, int8 g, int8 b); -void gfxFlipPage(void); +void gfxFlipPage(); void gfxDrawMaskedSprite(const byte *ptr, const byte *msk, uint16 width, uint16 height, byte *page, int16 x, int16 y); void gfxFillSprite(const byte *src4, uint16 sw, uint16 sh, byte *dst4, int16 sx, int16 sy, uint8 fillColor = 0); @@ -288,17 +288,17 @@ void gfxDrawPlainBoxRaw(int16 x1, int16 y1, int16 x2, int16 y2, byte color, byte void drawSpriteRaw2(const byte *spritePtr, byte transColor, int16 width, int16 height, byte *page, int16 x, int16 y); void maskBgOverlay(const byte *spritePtr, const byte *maskPtr, int16 width, int16 height, byte *page, int16 x, int16 y); -void fadeFromBlack(void); -void fadeToBlack(void); +void fadeFromBlack(); +void fadeToBlack(); // wtf?! //void gfxDrawMaskedSprite(byte *param1, byte *param2, byte *param3, byte *param4, int16 param5); -void gfxWaitVBL(void); -void gfxRedrawMouseCursor(void); +void gfxWaitVBL(); +void gfxRedrawMouseCursor(); void blitScreen(byte *frontBuffer, byte *backbuffer); void blitRawScreen(byte *frontBuffer); -void flip(void); +void flip(); } // End of namespace Cine diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp index b1218ce676..f47433e709 100644 --- a/engines/cine/part.cpp +++ b/engines/cine/part.cpp @@ -65,7 +65,7 @@ void loadPart(const char *partName) { loadPal(partName); } -void closePart(void) { +void closePart() { // TODO } diff --git a/engines/cine/part.h b/engines/cine/part.h index 755f843b4a..2f1af7141f 100644 --- a/engines/cine/part.h +++ b/engines/cine/part.h @@ -40,7 +40,7 @@ struct PartBuffer { extern Common::Array partBuffer; void loadPart(const char *partName); -void closePart(void); +void closePart(); int16 findFileInBundle(const char *fileName); diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp index 158d209289..57908b25a2 100644 --- a/engines/cine/saveload.cpp +++ b/engines/cine/saveload.cpp @@ -457,7 +457,7 @@ void saveSeqList(Common::OutSaveFile &out) { } } -bool CineEngine::loadSaveDirectory(void) { +bool CineEngine::loadSaveDirectory() { Common::InSaveFile *fHandle; char tmp[80]; diff --git a/engines/cine/script.h b/engines/cine/script.h index f3920448f3..40b7023930 100644 --- a/engines/cine/script.h +++ b/engines/cine/script.h @@ -63,7 +63,7 @@ public: explicit ScriptVars(unsigned int len = 50); ScriptVars(Common::SeekableReadStream &fHandle, unsigned int len = 50); ScriptVars(const ScriptVars &src); - ~ScriptVars(void); + ~ScriptVars(); ScriptVars &operator=(const ScriptVars &src); int16 &operator[](unsigned int idx); @@ -73,7 +73,7 @@ public: void save(Common::OutSaveFile &fHandle, unsigned int len) const; void load(Common::SeekableReadStream &fHandle); void load(Common::SeekableReadStream &fHandle, unsigned int len); - void reset(void); + void reset(); }; class FWScriptInfo; @@ -98,7 +98,7 @@ public: explicit RawScript(uint16 size); RawScript(const FWScriptInfo &info, const byte *data, uint16 size); RawScript(const RawScript &src); - ~RawScript(void); + ~RawScript(); RawScript &operator=(const RawScript &src); @@ -106,7 +106,7 @@ public: /*! \brief Size of script * \return Size of script */ - const ScriptVars &labels(void) const; + const ScriptVars &labels() const; byte getByte(unsigned int pos) const; uint16 getWord(unsigned int pos) const; const char *getString(unsigned int pos) const; @@ -130,7 +130,7 @@ public: /// \brief Run the script one more time /// \return Run count before incrementation - int16 run(void) { return _runCount++; } + int16 run() { return _runCount++; } }; /*! \brief Future Wars script, prcLinkedListStruct replacement @@ -283,7 +283,7 @@ public: FWScript(const RawScript &script, int16 index); // FWScript(const RawObjectScript &script, int16 index); FWScript(const FWScript &src); - ~FWScript(void); + ~FWScript(); int execute(); void save(Common::OutSaveFile &fHandle) const; @@ -380,11 +380,11 @@ int16 checkCollision(int16 objIdx, int16 x, int16 y, int16 numZones, int16 zoneI void runObjectScript(int16 entryIdx); -void executeObjectScripts(void); -void executeGlobalScripts(void); +void executeObjectScripts(); +void executeGlobalScripts(); -void purgeObjectScripts(void); -void purgeGlobalScripts(void); +void purgeObjectScripts(); +void purgeGlobalScripts(); } // End of namespace Cine diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp index c9f7c3e2dd..7dffa5fd1e 100644 --- a/engines/cine/script_fw.cpp +++ b/engines/cine/script_fw.cpp @@ -263,7 +263,7 @@ ScriptVars::ScriptVars(const ScriptVars &src) : _size(src._size), _vars(new int1 /*! \brief Destructor */ -ScriptVars::~ScriptVars(void) { +ScriptVars::~ScriptVars() { delete[] _vars; } @@ -340,7 +340,7 @@ void ScriptVars::load(Common::SeekableReadStream &fHandle, unsigned int len) { /*! \brief Reset all values to 0 */ -void ScriptVars::reset(void) { +void ScriptVars::reset() { memset( _vars, 0, _size * sizeof(int16)); } @@ -374,7 +374,7 @@ RawScript::RawScript(const RawScript &src) : _size(src._size), /*! \brief Destructor */ -RawScript::~RawScript(void) { +RawScript::~RawScript() { delete[] _data; } @@ -511,7 +511,7 @@ void RawScript::setData(const FWScriptInfo &info, const byte *data) { /*! \brief Initial script labels * \return Precalculated script labels */ -const ScriptVars &RawScript::labels(void) const { +const ScriptVars &RawScript::labels() const { assert(_data); return _labels; } @@ -614,7 +614,7 @@ FWScript::FWScript(const FWScript &src, FWScriptInfo *info) : _compare(src._compare), _index(src._index), _labels(src._labels), _localVars(src._localVars), _globalVars(src._globalVars), _info(info) { } -FWScript::~FWScript(void) { +FWScript::~FWScript() { delete _info; } @@ -1916,7 +1916,7 @@ uint16 compareVars(int16 a, int16 b) { return flag; } -void executeObjectScripts(void) { +void executeObjectScripts() { ScriptList::iterator it = objectScripts.begin(); for (; it != objectScripts.end();) { if ((*it)->_index < 0 || (*it)->execute() < 0) { @@ -1927,7 +1927,7 @@ void executeObjectScripts(void) { } } -void executeGlobalScripts(void) { +void executeGlobalScripts() { ScriptList::iterator it = globalScripts.begin(); for (; it != globalScripts.end();) { if ((*it)->_index < 0 || (*it)->execute() < 0) { @@ -1941,13 +1941,13 @@ void executeGlobalScripts(void) { /*! \todo Remove object scripts with script index of -1 (Not script position, but script index!). * This would seem to be valid for both Future Wars and Operation Stealth. */ -void purgeObjectScripts(void) { +void purgeObjectScripts() { } /*! \todo Remove global scripts with script index of -1 (Not script position, but script index!). * This would seem to be valid for both Future Wars and Operation Stealth. */ -void purgeGlobalScripts(void) { +void purgeGlobalScripts() { } //////////////////////////////////// diff --git a/engines/cine/texte.h b/engines/cine/texte.h index 0b1fc88e86..a23f43913a 100644 --- a/engines/cine/texte.h +++ b/engines/cine/texte.h @@ -63,7 +63,7 @@ extern const char **commandPrepositionTable; void loadTextData(const char *filename); void loadErrmessDat(const char *fname); -void freeErrmessDat(void); +void freeErrmessDat(); void loadPoldatDat(const char *fname); int fitLine(const char *ptr, int maxWidth, int &words, int &width); diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index 019f57d775..1228aa8e42 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -56,7 +56,7 @@ int16 canUseOnObject = 0; void drawString(const char *string, byte param) { } -void waitPlayerInput(void) { +void waitPlayerInput() { } void setTextWindow(uint16 param1, uint16 param2, uint16 param3, uint16 param4) { @@ -151,7 +151,7 @@ void moveUsingKeyboard(int x, int y) { egoMovedWithKeyboard = x || y; } -void stopMusicAfterFadeOut(void) { +void stopMusicAfterFadeOut() { // if (g_sfxPlayer->_fadeOutCounter != 0 && g_sfxPlayer->_fadeOutCounter < 100) { // g_sfxPlayer->stop(); // } @@ -324,7 +324,7 @@ void CineEngine::resetEngine() { } } -void CineEngine::makeSystemMenu(void) { +void CineEngine::makeSystemMenu() { int16 numEntry, systemCommand; int16 mouseX, mouseY, mouseButton; int16 selectedSave; @@ -558,7 +558,7 @@ int16 selectSubObject(int16 x, int16 y, int16 param) { // TODO: Make separate functions for Future Wars's and Operation Stealth's version of this function, this is getting too messy // TODO: Add support for using the different prepositions for different verbs (Doesn't work currently) -void makeCommandLine(void) { +void makeCommandLine() { uint16 x, y; commandVar1 = 0; @@ -799,7 +799,7 @@ int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X, return currentSelection; } -void makeActionMenu(void) { +void makeActionMenu() { uint16 mouseButton; uint16 mouseX; uint16 mouseY; @@ -822,7 +822,7 @@ void makeActionMenu(void) { inMenu = false; } -uint16 executePlayerInput(void) { +uint16 executePlayerInput() { uint16 var_5E; uint16 var_2; uint16 mouseX, mouseY, mouseButton; @@ -1181,10 +1181,10 @@ uint16 processKeyboard(uint16 param) { return 0; } -void mainLoopSub6(void) { +void mainLoopSub6() { } -void checkForPendingDataLoad(void) { +void checkForPendingDataLoad() { if (newPrcName[0] != 0) { bool loadPrcOk = loadPrc(newPrcName); @@ -1228,7 +1228,7 @@ void checkForPendingDataLoad(void) { } } -void hideMouse(void) { +void hideMouse() { } void removeExtention(char *dest, const char *source) { @@ -1587,7 +1587,7 @@ void processSeqListElement(SeqListElement &element) { } } -void processSeqList(void) { +void processSeqList() { Common::List::iterator it; for (it = seqList.begin(); it != seqList.end(); ++it) { diff --git a/engines/cine/various.h b/engines/cine/various.h index 1f9aa7dc78..daa73759f8 100644 --- a/engines/cine/various.h +++ b/engines/cine/various.h @@ -39,10 +39,10 @@ namespace Cine { void initLanguage(Common::Language lang); int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X, uint16 Y, uint16 width, bool recheckValue = false); -void makeCommandLine(void); -void makeActionMenu(void); +void makeCommandLine(); +void makeActionMenu(); void drawString(const char *string, byte param); -void waitPlayerInput(void); +void waitPlayerInput(); void setTextWindow(uint16 param1, uint16 param2, uint16 param3, uint16 param4); extern bool disableSystemMenu; @@ -111,25 +111,25 @@ extern char newMsgName[20]; extern char currentCtName[15]; extern char currentPartName[15]; -void stopSample(void); -void stopMusicAfterFadeOut(void); -uint16 executePlayerInput(void); +void stopSample(); +void stopMusicAfterFadeOut(); +uint16 executePlayerInput(); -void drawOverlays(void); +void drawOverlays(); extern uint16 mouseUpdateStatus; extern uint16 dummyU16; void getMouseData(uint16 param, uint16 *pButton, uint16 *pX, uint16 *pY); -int getKeyData(void); +int getKeyData(); uint16 processKeyboard(uint16 param); -void mainLoopSub6(void); +void mainLoopSub6(); -void checkForPendingDataLoad(void); +void checkForPendingDataLoad(); -void hideMouse(void); +void hideMouse(); void removeExtention(char *dest, const char *source); @@ -150,7 +150,7 @@ void removeSeq(uint16 param1, uint16 param2, uint16 param3); bool isSeqRunning(uint16 param1, uint16 param2, uint16 param3); void addSeqListElement(uint16 objIdx, int16 param1, int16 param2, int16 frame, int16 param4, int16 param5, int16 param6, int16 param7, int16 param8); void modifySeqListElement(uint16 objIdx, int16 var4Test, int16 param1, int16 param2, int16 param3, int16 param4); -void processSeqList(void); +void processSeqList(); void resetGfxEntityEntry(uint16 objIdx); diff --git a/engines/cine/xref.txt b/engines/cine/xref.txt index 5a8d2eef0f..27af915e36 100644 --- a/engines/cine/xref.txt +++ b/engines/cine/xref.txt @@ -128,7 +128,7 @@ o2_unloadMask22() - replaced with FWScript::o2_unloadMask22() prc.cpp: resetGlobalScriptsHead() - removed (obsoleted by Common::List) -freePrcLinkedList(void) - removed (obsoleted by Common::List::clear()) +freePrcLinkedList() - removed (obsoleted by Common::List::clear()) rel.cpp: resetObjectScriptHead() - removed (obsoleted by Common::List) diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp index 344552bf76..81e39600f5 100644 --- a/engines/cruise/actor.cpp +++ b/engines/cruise/actor.cpp @@ -711,7 +711,7 @@ void set_anim(int ovl, int obj, int start, int x, int y, int mat, int state) { /** * Handles the processing of any active actors to allow for handling movement */ -void processAnimation(void) { +void processAnimation() { objectParamsQuery params; MovementEntry moveInfo; actorStruct *currentActor = actorHead.next; diff --git a/engines/cruise/actor.h b/engines/cruise/actor.h index 7e9f3672ad..d55aac1eca 100644 --- a/engines/cruise/actor.h +++ b/engines/cruise/actor.h @@ -68,7 +68,7 @@ struct actorStruct { bool isAnimFinished(int overlayIdx, int idx, actorStruct *pStartEntry, int objType); actorStruct *findActor(actorStruct *pStartEntry, int overlayIdx, int objIdx, int type); -void processAnimation(void); +void processAnimation(); void getPixel(int x, int y); } // End of namespace Cruise diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h index eff3e9b92f..f9e7e1e69f 100644 --- a/engines/cruise/cruise.h +++ b/engines/cruise/cruise.h @@ -63,12 +63,12 @@ private: int _gameSpeed; bool _speedFlag; - void initialize(void); - void deinitialise(void); + void initialize(); + void deinitialise(); bool loadLanguageStrings(); bool makeLoad(char *saveName); void mainLoop(); - int processInput(void); + int processInput(); protected: // Engine APIs virtual Common::Error run(); @@ -100,7 +100,7 @@ public: virtual void syncSoundSettings(); const CRUISEGameDescription *_gameDescription; - void initAllData(void); + void initAllData(); Common::RandomSource _rnd; }; diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index 6f5bf552fa..2fb242a145 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -441,7 +441,7 @@ uint8 *mainProc14(uint16 overlay, uint16 idx) { return NULL; } -void CruiseEngine::initAllData(void) { +void CruiseEngine::initAllData() { int i; setupFuncArray(); @@ -779,7 +779,7 @@ int findObject(int mouseX, int mouseY, int *outObjOvl, int *outObjIdx) { Common::KeyCode keyboardCode = Common::KEYCODE_INVALID; -void freeStuff2(void) { +void freeStuff2() { warning("implement freeStuff2"); } @@ -1070,7 +1070,7 @@ bool findRelation(int objOvl, int objIdx, int x, int y) { return found; } -int processInventory(void) { +int processInventory() { if (menuTable[1]) { menuElementSubStruct *pMenuElementSub = getSelectedEntryInMenu(menuTable[1]); @@ -1380,7 +1380,7 @@ void callRelation(menuElementSubStruct *pMenuElement, int nObj2) { } } -void closeAllMenu(void) { +void closeAllMenu() { if (menuTable[0]) { freeMenu(menuTable[0]); menuTable[0] = NULL; @@ -1417,7 +1417,7 @@ bool checkInput(int16 *buttonPtr) { extern bool manageEvents(); -int CruiseEngine::processInput(void) { +int CruiseEngine::processInput() { int16 mouseX = 0; int16 mouseY = 0; int16 button = 0; @@ -1788,7 +1788,7 @@ void getMouseStatus(int16 *pMouseVar, int16 *pMouseX, int16 *pMouseButton, int16 } -void CruiseEngine::mainLoop(void) { +void CruiseEngine::mainLoop() { //int32 t_start,t_left; //uint32 t_end; //int32 q=0; /* Dummy */ diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h index ef15b7c923..8657b4bc21 100644 --- a/engines/cruise/cruise_main.h +++ b/engines/cruise/cruise_main.h @@ -94,7 +94,7 @@ ovlData3Struct *scriptFunc1Sub2(int32 scriptNumber, int32 param); void resetFileEntry(int32 entryNumber); uint8 *mainProc14(uint16 overlay, uint16 idx); void printInfoBlackBox(const char *string); -void waitForPlayerInput(void); +void waitForPlayerInput(); void loadPackedFileToMem(int fileIdx, uint8 * buffer); int getNumObjectsByClass(int scriptIdx, int param); void resetFileEntryRange(int param1, int param2); @@ -105,14 +105,14 @@ void removeExtention(const char *name, char *buffer); void resetPtr2(scriptInstanceStruct * ptr); void getFileExtention(const char *name, char *buffer); void *allocAndZero(int size); -void freeStuff2(void); -void mainLoop(void); +void freeStuff2(); +void mainLoop(); void getMouseStatus(int16 *pMouseVar, int16 *pMouseX, int16 *pMouseButton, int16 *pMouseY); bool testMask(int x, int y, unsigned char* pData, int stride); menuElementSubStruct *getSelectedEntryInMenu(menuStruct *pMenu); -void closeAllMenu(void); +void closeAllMenu(); int removeFinishedScripts(scriptInstanceStruct *ptrHandle); -void initBigVar3(void); +void initBigVar3(); void resetActorPtr(actorStruct *ptr); void removeAllScripts(scriptInstanceStruct *ptrHandle); diff --git a/engines/cruise/decompiler.cpp b/engines/cruise/decompiler.cpp index a7244d3f8a..ba4ade56a7 100644 --- a/engines/cruise/decompiler.cpp +++ b/engines/cruise/decompiler.cpp @@ -234,7 +234,7 @@ void getByteFromDecompScript(char *buffer) { sprintf(buffer, "%d", var); } -char getByteFromDecompScriptReal(void) { +char getByteFromDecompScriptReal() { short int var = currentDecompScript[currentDecompScriptPtr->var4]; currentDecompScriptPtr->var4 = currentDecompScriptPtr->var4 + 1; @@ -257,7 +257,7 @@ void getShortFromDecompScript(char *buffer) { sprintf(buffer, "%d", var); } -int16 getShortFromDecompScriptReal(void) { +int16 getShortFromDecompScriptReal() { int16 var = (int16)READ_BE_UINT16(currentDecompScript + currentDecompScriptPtr->var4); currentDecompScriptPtr->var4 = currentDecompScriptPtr->var4 + 2; @@ -345,7 +345,7 @@ void resolveVarName(char *ovlIdxString, int varType, char *varIdxString, } } -int decompLoadVar(void) { +int decompLoadVar() { switch (currentScriptOpcodeType) { case 0: { char buffer[256]; @@ -416,7 +416,7 @@ int decompLoadVar(void) { } } -int decompSaveVar(void) { +int decompSaveVar() { // int var = popVar(); switch (currentScriptOpcodeType) { @@ -492,7 +492,7 @@ int decompSaveVar(void) { return (0); } -int decompOpcodeType2(void) { +int decompOpcodeType2() { switch (currentScriptOpcodeType) { case 1: { char buffer3[256]; @@ -536,7 +536,7 @@ int decompOpcodeType2(void) { return (0); } -int decompMath(void) { +int decompMath() { char *param1 = popDecomp(); char *param2 = popDecomp(); @@ -588,7 +588,7 @@ int decompMath(void) { return (0); } -int decompBoolCompare(void) { +int decompBoolCompare() { char *param1; char *param2; @@ -601,7 +601,7 @@ int decompBoolCompare(void) { return 0; } -int decompTest(void) { +int decompTest() { unsigned long int oldOffset = currentDecompScriptPtr->var4; short int offset = getShortFromDecompScriptReal(); @@ -659,7 +659,7 @@ int decompTest(void) { return 0; } -int decompCompare(void) { +int decompCompare() { char *param; param = popDecomp(); @@ -684,7 +684,7 @@ int decompCompare(void) { return 0; } -int decompSwapStack(void) { +int decompSwapStack() { char *stack1; char *stack2; char buffer1[4000]; @@ -702,7 +702,7 @@ int decompSwapStack(void) { return 0; } -int decompFunction(void) { +int decompFunction() { currentScriptOpcodeType = getByteFromDecompScriptReal(); // addDecomp("OP_%X", currentScriptOpcodeType); switch (currentScriptOpcodeType) { @@ -1279,18 +1279,18 @@ int decompFunction(void) { uint8 stop = 0; -int decompStop(void) { +int decompStop() { stop = 1; addDecomp("stop\n"); return 0; } -int decompBreak(void) { +int decompBreak() { addDecomp("break"); return 0; } -void generateIndentation(void) { +void generateIndentation() { int i, j; for (i = 0; i < positionInDecompileLineTable; i++) { diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp index bd9b2e2644..3a609cb8d4 100644 --- a/engines/cruise/font.cpp +++ b/engines/cruise/font.cpp @@ -137,7 +137,7 @@ void loadFNT(const char *fileName) { fontFileHandle.close(); } -void initSystem(void) { +void initSystem() { int32 i; itemColor = 15; @@ -168,7 +168,7 @@ void initSystem(void) { loadFNT("system.fnt"); } -void freeSystem(void) { +void freeSystem() { MemFree(_systemFNT); } diff --git a/engines/cruise/font.h b/engines/cruise/font.h index e3f34837af..849c074ac5 100644 --- a/engines/cruise/font.h +++ b/engines/cruise/font.h @@ -51,8 +51,8 @@ struct FontEntry { #include "common/pack-end.h" // END STRUCT PACKING void loadFNT(const char *fileName); -void initSystem(void); -void freeSystem(void); +void initSystem(); +void freeSystem(); ////////////////////////////////////////////////// void bigEndianShortToNative(void *var); diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp index 4c1ab63a8a..2d61bed578 100644 --- a/engines/cruise/function.cpp +++ b/engines/cruise/function.cpp @@ -38,7 +38,7 @@ uint32 Period(uint32 hz) { //#define FUNCTION_DEBUG -int16 Op_LoadOverlay(void) { +int16 Op_LoadOverlay() { char *pOverlayName; char overlayName[38] = ""; int overlayLoadResult; @@ -63,7 +63,7 @@ int16 Op_LoadOverlay(void) { return(overlayLoadResult); } -int16 Op_Strcpy(void) { +int16 Op_Strcpy() { char *ptr1 = (char *)popPtr(); char *ptr2 = (char *)popPtr(); @@ -81,7 +81,7 @@ int16 Op_Strcpy(void) { return (0); } -int16 Op_Exec(void) { +int16 Op_Exec() { int scriptIdx; int ovlIdx; uint8 *ptr; @@ -122,7 +122,7 @@ int16 Op_Exec(void) { return (0); } -int16 Op_AddProc(void) { +int16 Op_AddProc() { int pop1 = popVar(); int pop2; int overlay; @@ -154,7 +154,7 @@ int16 Op_AddProc(void) { return (0); } -int16 Op_Narrator(void) { +int16 Op_Narrator() { int pop1 = popVar(); int pop2 = popVar(); @@ -167,7 +167,7 @@ int16 Op_Narrator(void) { return (0); } -int16 Op_GetMouseX(void) { +int16 Op_GetMouseX() { int16 dummy; int16 mouseX; int16 mouseY; @@ -178,7 +178,7 @@ int16 Op_GetMouseX(void) { return (mouseX); } -int16 Op_GetMouseY(void) { +int16 Op_GetMouseY() { int16 dummy; int16 mouseX; int16 mouseY; @@ -189,7 +189,7 @@ int16 Op_GetMouseY(void) { return (mouseY); } -int16 Op_Random(void) { +int16 Op_Random() { int var = popVar(); if (var < 2) { @@ -199,7 +199,7 @@ int16 Op_Random(void) { return (_vm->_rnd.getRandomNumber(var - 1)); } -int16 Op_PlayFX(void) { +int16 Op_PlayFX() { int volume = popVar(); int speed = popVar(); /*int channelNum = */popVar(); @@ -216,7 +216,7 @@ int16 Op_PlayFX(void) { return (0); } -int16 Op_LoopFX(void) { +int16 Op_LoopFX() { int volume = popVar(); int speed = popVar(); /*int channelNum = */popVar(); @@ -233,7 +233,7 @@ int16 Op_LoopFX(void) { return (0); } -int16 Op_StopFX(void) { +int16 Op_StopFX() { int channelNum = popVar(); if (channelNum == -1) { @@ -248,7 +248,7 @@ int16 Op_StopFX(void) { return 0; } -int16 Op_FreqFX(void) { +int16 Op_FreqFX() { int volume = popVar(); int freq2 = popVar(); int channelNum = popVar(); @@ -263,7 +263,7 @@ int16 Op_FreqFX(void) { return (0); } -int16 Op_FreeCT(void) { +int16 Op_FreeCT() { freeCTP(); return (0); } @@ -291,18 +291,18 @@ void freeObjectList(cellStruct *pListHead) { } } -int16 Op_FreeCell(void) { +int16 Op_FreeCell() { freeObjectList(&cellHead); return (0); } -int16 Op_freeBackgroundInscrustList(void) { +int16 Op_freeBackgroundInscrustList() { freeBackgroundIncrustList(&backgroundIncrustHead); return (0); } -int16 Op_UnmergeBackgroundIncrust(void) { +int16 Op_UnmergeBackgroundIncrust() { int obj = popVar(); int ovl = popVar(); @@ -315,13 +315,13 @@ int16 Op_UnmergeBackgroundIncrust(void) { return (0); } -int16 Op_FreePreload(void) { +int16 Op_FreePreload() { // TODO: See if this is needed debug(1, "Op_FreePreload not implemented"); return (0); } -int16 Op_RemoveMessage(void) { +int16 Op_RemoveMessage() { int idx; int overlay; @@ -337,7 +337,7 @@ int16 Op_RemoveMessage(void) { return (0); } -int16 Op_FindSet(void) { +int16 Op_FindSet() { int16 i; char name[36] = ""; char *ptr; @@ -360,7 +360,7 @@ int16 Op_FindSet(void) { return -1; } -int16 Op_RemoveFrame(void) { +int16 Op_RemoveFrame() { int count = popVar(); int start = popVar(); @@ -369,7 +369,7 @@ int16 Op_RemoveFrame(void) { return (0); } -int16 Op_comment(void) { +int16 Op_comment() { char *var; var = (char *)popPtr(); @@ -379,7 +379,7 @@ int16 Op_comment(void) { return (0); } -int16 Op_RemoveProc(void) { +int16 Op_RemoveProc() { int idx; int overlay; @@ -395,7 +395,7 @@ int16 Op_RemoveProc(void) { return (0); } -int16 Op_FreeOverlay(void) { +int16 Op_FreeOverlay() { char localName[36] = ""; char *namePtr; @@ -411,7 +411,7 @@ int16 Op_FreeOverlay(void) { return 0; } -int16 Op_FindProc(void) { +int16 Op_FindProc() { char name[36] = ""; char *ptr; int param; @@ -425,13 +425,13 @@ int16 Op_FindProc(void) { return param; } -int16 Op_GetRingWord(void) { +int16 Op_GetRingWord() { // Original method had a ringed queue allowing this method to return words one at a time. // But it never seemed to be used; no entries were ever added to the list return 0; } -int16 Op_KillMenu(void) { +int16 Op_KillMenu() { // Free menus, if active if (menuTable[0]) { freeMenu(menuTable[0]); @@ -453,14 +453,14 @@ int16 Op_KillMenu(void) { return 0; } -int16 Op_UserMenu(void) { +int16 Op_UserMenu() { int oldValue = playerMenuEnabled; playerMenuEnabled = popVar(); return oldValue; } -int16 Op_UserOn(void) { +int16 Op_UserOn() { int oldValue = userEnabled; int newValue = popVar(); @@ -471,7 +471,7 @@ int16 Op_UserOn(void) { return oldValue; } -int16 Op_Display(void) { +int16 Op_Display() { int oldValue = displayOn; int newValue = popVar(); @@ -482,7 +482,7 @@ int16 Op_Display(void) { return oldValue; } -int16 Op_FreezeParent(void) { +int16 Op_FreezeParent() { if (currentScriptPtr->var1A == 20) { changeScriptParamInList(currentScriptPtr->var18, currentScriptPtr->var16, &procHead, -1, 9997); } else if (currentScriptPtr->var1A == 30) { @@ -492,7 +492,7 @@ int16 Op_FreezeParent(void) { return 0; } -int16 Op_LoadBackground(void) { +int16 Op_LoadBackground() { int result = 0; char bgName[36] = ""; char *ptr; @@ -520,7 +520,7 @@ int16 Op_LoadBackground(void) { return result; } -int16 Op_FrameExist(void) { +int16 Op_FrameExist() { int param; param = popVar(); @@ -536,7 +536,7 @@ int16 Op_FrameExist(void) { return 0; } -int16 Op_LoadFrame(void) { +int16 Op_LoadFrame() { int param1; int param2; int param3; @@ -568,7 +568,7 @@ int16 Op_LoadFrame(void) { return 0; } -int16 Op_LoadAbs(void) { +int16 Op_LoadAbs() { int slot; char name[36] = ""; char *ptr; @@ -591,7 +591,7 @@ int16 Op_LoadAbs(void) { return result; } -int16 Op_InitializeState(void) { +int16 Op_InitializeState() { int param1 = popVar(); int objIdx = popVar(); int ovlIdx = popVar(); @@ -608,11 +608,11 @@ int16 Op_InitializeState(void) { return (0); } -int16 Op_GetlowMemory(void) { +int16 Op_GetlowMemory() { return lowMemory; } -int16 Op_AniDir(void) { +int16 Op_AniDir() { int type = popVar(); int objIdx = popVar(); int ovlIdx = popVar(); @@ -627,7 +627,7 @@ int16 Op_AniDir(void) { return -1; } -int16 Op_FadeOut(void) { +int16 Op_FadeOut() { for (long int i = 0; i < 256; i += 32) { for (long int j = 0; j < 256; j++) { int offsetTable[3]; @@ -661,7 +661,7 @@ int16 isOverlayLoaded(const char * name) { return 0; } -int16 Op_FindOverlay(void) { +int16 Op_FindOverlay() { char name[36] = ""; char *ptr; @@ -673,7 +673,7 @@ int16 Op_FindOverlay(void) { return (isOverlayLoaded(name)); } -int16 Op_WriteObject(void) { +int16 Op_WriteObject() { int16 returnParam; int16 param1 = popVar(); @@ -687,7 +687,7 @@ int16 Op_WriteObject(void) { return returnParam; } -int16 Op_ReadObject(void) { +int16 Op_ReadObject() { int16 returnParam; int member = popVar(); @@ -699,12 +699,12 @@ int16 Op_ReadObject(void) { return returnParam; } -int16 Op_FadeIn(void) { +int16 Op_FadeIn() { doFade = 1; return 0; } -int16 Op_GetMouseButton(void) { +int16 Op_GetMouseButton() { int16 dummy; int16 mouseX; int16 mouseY; @@ -715,7 +715,7 @@ int16 Op_GetMouseButton(void) { return mouseButton; } -int16 Op_AddCell(void) { +int16 Op_AddCell() { int16 objType = popVar(); int16 objIdx = popVar(); int16 overlayIdx = popVar(); @@ -728,7 +728,7 @@ int16 Op_AddCell(void) { return 0; } -int16 Op_AddBackgroundIncrust(void) { +int16 Op_AddBackgroundIncrust() { int16 objType = popVar(); int16 objIdx = popVar(); @@ -742,7 +742,7 @@ int16 Op_AddBackgroundIncrust(void) { return 0; } -int16 Op_RemoveCell(void) { +int16 Op_RemoveCell() { int objType = popVar(); int objectIdx = popVar(); int ovlNumber = popVar(); @@ -758,13 +758,13 @@ int16 Op_RemoveCell(void) { int16 fontFileIndex = -1; -int16 Op_SetFont(void) { +int16 Op_SetFont() { fontFileIndex = popVar(); return 0; } -int16 Op_UnfreezeParent(void) { +int16 Op_UnfreezeParent() { if (currentScriptPtr->var1A == 0x14) { changeScriptParamInList(currentScriptPtr->var18, currentScriptPtr->var16, &procHead, -1, 0); } else if (currentScriptPtr->var1A == 0x1E) { @@ -774,7 +774,7 @@ int16 Op_UnfreezeParent(void) { return 0; } -int16 Op_ProtectionFlag(void) { +int16 Op_ProtectionFlag() { int16 temp = protectionCode; int16 newVar; @@ -786,7 +786,7 @@ int16 Op_ProtectionFlag(void) { return temp; } -int16 Op_ClearScreen(void) { +int16 Op_ClearScreen() { int bgIdx = popVar(); if ((bgIdx >= 0) && (bgIdx < NBSCREENS) && (backgroundScreens[bgIdx])) { @@ -798,7 +798,7 @@ int16 Op_ClearScreen(void) { return 0; } -int16 Op_AddMessage(void) { +int16 Op_AddMessage() { int16 color = popVar(); int16 var_2 = popVar(); int16 var_4 = popVar(); @@ -822,18 +822,18 @@ int16 Op_AddMessage(void) { return 0; } -int16 Op_Preload(void) { +int16 Op_Preload() { popPtr(); popVar(); return 0; } -int16 Op_LoadCt(void) { +int16 Op_LoadCt() { return initCt((const char *)popPtr()); } -int16 Op_EndAnim(void) { +int16 Op_EndAnim() { int param1 = popVar(); int param2 = popVar(); int overlay = popVar(); @@ -844,14 +844,14 @@ int16 Op_EndAnim(void) { return isAnimFinished(overlay, param2, &actorHead, param1); } -int16 Op_Protect(void) { +int16 Op_Protect() { popPtr(); popVar(); return 0; } -int16 Op_AutoCell(void) { +int16 Op_AutoCell() { cellStruct *pObject; int signal = popVar(); @@ -906,7 +906,7 @@ int16 Op_AutoCell(void) { return 0; } -int16 Op_Sizeof(void) { +int16 Op_Sizeof() { objectParamsQuery params; int index = popVar(); int overlay = popVar(); @@ -919,7 +919,7 @@ int16 Op_Sizeof(void) { return params.nbState - 1; } -int16 Op_SetActiveBackground(void) { +int16 Op_SetActiveBackground() { int currentPlane = masterScreen; int newPlane = popVar(); @@ -934,7 +934,7 @@ int16 Op_SetActiveBackground(void) { return currentPlane; } -int16 Op_RemoveBackground(void) { +int16 Op_RemoveBackground() { int backgroundIdx = popVar(); if (backgroundIdx > 0 && backgroundIdx < 8) { @@ -956,14 +956,14 @@ int16 Op_RemoveBackground(void) { int vblLimit; -int16 Op_VBL(void) { +int16 Op_VBL() { vblLimit = popVar(); return 0; } int op7BVar = 0; -int16 Op_Sec(void) { +int16 Op_Sec() { int di = popVar(); int si = 1 - op7BVar; int sign; @@ -979,7 +979,7 @@ int16 Op_Sec(void) { return si; } -int16 Op_RemoveBackgroundIncrust(void) { +int16 Op_RemoveBackgroundIncrust() { int idx = popVar(); int overlay = popVar(); @@ -992,7 +992,7 @@ int16 Op_RemoveBackgroundIncrust(void) { return 0; } -int16 Op_SetColor(void) { +int16 Op_SetColor() { int colorB = popVar(); int colorG = popVar(); int colorR = popVar(); @@ -1023,7 +1023,7 @@ int16 Op_SetColor(void) { return 0; } -int16 Op_Inventory(void) { +int16 Op_Inventory() { int si = var41; var41 = popVar(); @@ -1031,7 +1031,7 @@ int16 Op_Inventory(void) { return si; } -int16 Op_RemoveOverlay(void) { +int16 Op_RemoveOverlay() { int overlayIdx; overlayIdx = popVar(); @@ -1043,7 +1043,7 @@ int16 Op_RemoveOverlay(void) { return 0; } -int16 Op_ComputeLine(void) { +int16 Op_ComputeLine() { int y2 = popVar(); int x2 = popVar(); int y1 = popVar(); @@ -1058,14 +1058,14 @@ int16 Op_ComputeLine(void) { return maxValue; } -int16 Op_FindMsg(void) { +int16 Op_FindMsg() { int si = popVar(); popVar(); return si; } -int16 Op_SetZoom(void) { +int16 Op_SetZoom() { var46 = popVar(); var45 = popVar(); var42 = popVar(); @@ -1081,14 +1081,14 @@ int16 subOp23(int param1, int param2) { return (param1 * param2) >> 8; } -int16 Op_GetStep(void) { +int16 Op_GetStep() { int si = popVar(); int dx = popVar(); return subOp23(dx, si); } -int16 Op_GetZoom(void) { +int16 Op_GetZoom() { return (computeZoom(popVar())); } @@ -1195,7 +1195,7 @@ int removeAnimation(actorStruct * pHead, int overlay, int objIdx, int objType) { int flag_obstacle; // numPolyBis // add animation -int16 Op_AddAnimation(void) { +int16 Op_AddAnimation() { int stepY = popVar(); int stepX = popVar(); int direction = popVar(); @@ -1248,7 +1248,7 @@ int16 Op_AddAnimation(void) { return 0; } -int16 Op_RemoveAnimation(void) { +int16 Op_RemoveAnimation() { int objType = popVar(); int objIdx = popVar(); int ovlIdx = popVar(); @@ -1260,12 +1260,12 @@ int16 Op_RemoveAnimation(void) { return removeAnimation(&actorHead, ovlIdx, objIdx, objType); } -int16 Op_regenerateBackgroundIncrust(void) { +int16 Op_regenerateBackgroundIncrust() { regenerateBackgroundIncrust(&backgroundIncrustHead); return 0; } -int16 Op_SetStringColors(void) { +int16 Op_SetStringColors() { // TODO: here ignore if low color mode subColor = (uint8) popVar(); @@ -1276,7 +1276,7 @@ int16 Op_SetStringColors(void) { return 0; } -int16 Op_XClick(void) { +int16 Op_XClick() { int x = popVar(); if (x != -1) { @@ -1287,7 +1287,7 @@ int16 Op_XClick(void) { return aniX; } -int16 Op_YClick(void) { +int16 Op_YClick() { int y = popVar(); if (y != -1) { @@ -1298,7 +1298,7 @@ int16 Op_YClick(void) { return aniY; } -int16 Op_GetPixel(void) { +int16 Op_GetPixel() { int x = popVar(); int y = popVar(); @@ -1306,7 +1306,7 @@ int16 Op_GetPixel(void) { return numPoly; } -int16 Op_TrackAnim(void) { // setup actor position +int16 Op_TrackAnim() { // setup actor position actorStruct *pActor; int var0 = popVar(); @@ -1336,7 +1336,7 @@ int16 Op_TrackAnim(void) { // setup actor position return 0; } -int16 Op_BgName(void) { +int16 Op_BgName() { char* bgName = (char*)popPtr(); int bgIdx = popVar(); @@ -1352,7 +1352,7 @@ int16 Op_BgName(void) { return 0; } -int16 Op_LoadSong(void) { +int16 Op_LoadSong() { const char *ptr = (const char *)popPtr(); char buffer[33]; @@ -1364,27 +1364,27 @@ int16 Op_LoadSong(void) { return 0; } -int16 Op_PlaySong(void) { +int16 Op_PlaySong() { if (_vm->sound().songLoaded() && !_vm->sound().songPlayed()) _vm->sound().playMusic(); return 0; } -int16 Op_StopSong(void) { +int16 Op_StopSong() { if (_vm->sound().isPlaying()) _vm->sound().stopMusic(); return 0; } -int16 Op_RestoreSong(void) { +int16 Op_RestoreSong() { // Used in the original to restore the contents of a song. Doesn't seem to be used, // since the backup buffer it uses is never set return 0; } -int16 Op_SongSize(void) { +int16 Op_SongSize() { int size, oldSize; if (_vm->sound().songLoaded()) { @@ -1399,7 +1399,7 @@ int16 Op_SongSize(void) { return oldSize; } -int16 Op_SetPattern(void) { +int16 Op_SetPattern() { int value = popVar(); int offset = popVar(); @@ -1410,26 +1410,26 @@ int16 Op_SetPattern(void) { return 0; } -int16 Op_FadeSong(void) { +int16 Op_FadeSong() { _vm->sound().fadeSong(); return 0; } -int16 Op_FreeSong(void) { +int16 Op_FreeSong() { _vm->sound().stopMusic(); _vm->sound().removeMusic(); return 0; } -int16 Op_SongLoop(void) { +int16 Op_SongLoop() { bool oldLooping = _vm->sound().musicLooping(); _vm->sound().musicLoop(popVar() != 0); return oldLooping; } -int16 Op_SongPlayed(void) { +int16 Op_SongPlayed() { return _vm->sound().songPlayed(); } @@ -1437,17 +1437,17 @@ void setVar49Value(int value) { flagCt = value; } -int16 Op_CTOn(void) { +int16 Op_CTOn() { setVar49Value(1); return 0; } -int16 Op_CTOff(void) { +int16 Op_CTOff() { setVar49Value(0); return 0; } -int16 Op_FreezeOverlay(void) { +int16 Op_FreezeOverlay() { //int var0; //int var1; int temp; @@ -1465,7 +1465,7 @@ int16 Op_FreezeOverlay(void) { return temp; } -int16 Op_FreezeCell(void) { +int16 Op_FreezeCell() { int newFreezz = popVar(); int oldFreeze = popVar(); int backgroundPlante = popVar(); @@ -1492,7 +1492,7 @@ void Op_60Sub(int overlayIdx, actorStruct * pActorHead, int _var0, int _var1, in } } -int16 Op_FreezeAni(void) { +int16 Op_FreezeAni() { /* * int var0; * int var1; @@ -1516,7 +1516,7 @@ int16 Op_FreezeAni(void) { return 0; } -int16 Op_Itoa(void) { +int16 Op_Itoa() { int nbp = popVar(); int param[160]; char txt[40]; @@ -1546,7 +1546,7 @@ int16 Op_Itoa(void) { return 0; } -int16 Op_Strcat(void) { +int16 Op_Strcat() { char *pSource = (char *)popPtr(); char *pDest = (char *)popPtr(); @@ -1560,7 +1560,7 @@ int16 Op_Strcat(void) { return 0; } -int16 Op_FindSymbol(void) { +int16 Op_FindSymbol() { int var0 = popVar(); char *ptr = (char *)popPtr(); int var1 = popVar(); @@ -1571,7 +1571,7 @@ int16 Op_FindSymbol(void) { return getProcParam(var1, var0, ptr); } -int16 Op_FindObject(void) { +int16 Op_FindObject() { char var_26[36]; char *ptr = (char *)popPtr(); int overlayIdx; @@ -1590,7 +1590,7 @@ int16 Op_FindObject(void) { return getProcParam(overlayIdx, 40, var_26); } -int16 Op_SetObjectAtNode(void) { +int16 Op_SetObjectAtNode() { int16 node = popVar(); int16 obj = popVar(); int16 ovl = popVar(); @@ -1610,7 +1610,7 @@ int16 Op_SetObjectAtNode(void) { return 0; } -int16 Op_GetNodeX(void) { +int16 Op_GetNodeX() { int16 node = popVar(); int nodeInfo[2]; @@ -1622,7 +1622,7 @@ int16 Op_GetNodeX(void) { return nodeInfo[0]; } -int16 Op_GetNodeY(void) { +int16 Op_GetNodeY() { int16 node = popVar(); int nodeInfo[2]; @@ -1634,7 +1634,7 @@ int16 Op_GetNodeY(void) { return nodeInfo[1]; } -int16 Op_SetVolume(void) { +int16 Op_SetVolume() { int oldVolume = _vm->sound().getVolume(); int newVolume = popVar(); @@ -1647,7 +1647,7 @@ int16 Op_SetVolume(void) { return oldVolume >> 2; } -int16 Op_SongExist(void) { +int16 Op_SongExist() { const char *songName = (char*)popPtr(); if (songName) { @@ -1662,33 +1662,33 @@ int16 Op_SongExist(void) { return 0; } -int16 Op_TrackPos(void) { +int16 Op_TrackPos() { // This function returns a variable that never seems to change from 0 return 0; } -int16 Op_SetNodeState(void) { +int16 Op_SetNodeState() { int16 state = popVar(); int16 node = popVar(); return setNodeState(node, state); } -int16 Op_SetNodeColor(void) { +int16 Op_SetNodeColor() { int16 color = popVar(); int16 node = popVar(); return setNodeColor(node, color); } -int16 Op_SetXDial(void) { +int16 Op_SetXDial() { int16 old = xdial; xdial = popVar(); return old; } -int16 Op_DialogOn(void) { +int16 Op_DialogOn() { dialogueObj = popVar(); dialogueOvl = popVar(); @@ -1700,7 +1700,7 @@ int16 Op_DialogOn(void) { return 0; } -int16 Op_DialogOff(void) { +int16 Op_DialogOff() { dialogueEnabled = false; objectReset(); @@ -1715,7 +1715,7 @@ int16 Op_DialogOff(void) { return 0; } -int16 Op_LinkObjects(void) { +int16 Op_LinkObjects() { int type = popVar(); int obj2 = popVar(); int ovl2 = popVar(); @@ -1732,7 +1732,7 @@ int16 Op_LinkObjects(void) { return 0; } -int16 Op_UserClick(void) { +int16 Op_UserClick() { sysKey = popVar(); sysY = popVar(); sysX = popVar(); @@ -1740,7 +1740,7 @@ int16 Op_UserClick(void) { return 0; } -int16 Op_XMenuItem(void) { +int16 Op_XMenuItem() { int index = popVar(); int count = 0; @@ -1760,7 +1760,7 @@ int16 Op_XMenuItem(void) { return 0; } -int16 Op_YMenuItem(void) { +int16 Op_YMenuItem() { int index = popVar(); int count = 0; @@ -1785,7 +1785,7 @@ int16 Op_Menu() { return (int16)(menuTable[0] != NULL); } -int16 Op_AutoControl(void) { +int16 Op_AutoControl() { int oldValue = automaticMode; int newValue = popVar(); @@ -1797,7 +1797,7 @@ int16 Op_AutoControl(void) { return oldValue; } -int16 Op_MouseMove(void) { +int16 Op_MouseMove() { int16 handle, button; Common::Point pt; @@ -1810,18 +1810,18 @@ int16 Op_MouseMove(void) { return 0; } -int16 Op_MouseEnd(void) { +int16 Op_MouseEnd() { if (automoveInc < automoveMax) return (int16)false; return (int16)true; } -int16 Op_MsgExist(void) { +int16 Op_MsgExist() { return isMessage; } -int16 Op_UserDelay(void) { +int16 Op_UserDelay() { int delay = popVar(); if (delay >= 0) { @@ -1831,13 +1831,13 @@ int16 Op_UserDelay(void) { return userDelay; } -int16 Op_ThemeReset(void) { +int16 Op_ThemeReset() { objectReset(); return 0; } -int16 Op_UserWait(void) { +int16 Op_UserWait() { userWait = 1; if (currentScriptPtr->type == scriptType_PROC) { changeScriptParamInList(currentScriptPtr->overlayNumber, currentScriptPtr->scriptNumber, &procHead, -1, 9999); @@ -1984,7 +1984,7 @@ opcodeFunction opcodeTablePtr[] = { Op_KillMenu, }; -int32 opcodeType8(void) { +int32 opcodeType8() { int opcode = getByteFromScript(); if (!opcode) diff --git a/engines/cruise/function.h b/engines/cruise/function.h index 6604d87bcb..347c9f23b8 100644 --- a/engines/cruise/function.h +++ b/engines/cruise/function.h @@ -30,12 +30,12 @@ namespace Cruise { extern int flag_obstacle; extern int vblLimit; -int32 opcodeType8(void); +int32 opcodeType8(); int16 computeZoom(int param); int16 subOp23(int param1, int param2); void freeObjectList(cellStruct *pListHead); int removeAnimation(actorStruct * pHead, int overlay, int objIdx, int objType); -int16 Op_FadeOut(void); +int16 Op_FadeOut(); } // End of namespace Cruise diff --git a/engines/cruise/gfxModule.cpp b/engines/cruise/gfxModule.cpp index b8f7ef291e..fdf26337e3 100644 --- a/engines/cruise/gfxModule.cpp +++ b/engines/cruise/gfxModule.cpp @@ -201,10 +201,10 @@ void gfxModuleData_convertOldPalColor(uint16 oldColor, uint8 *pOutput) { *(pOutput++) = B; } -void gfxModuleData_gfxWaitVSync(void) { +void gfxModuleData_gfxWaitVSync() { } -void gfxModuleData_flip(void) { +void gfxModuleData_flip() { } void gfxCopyRect(const uint8 *sourceBuffer, int width, int height, byte *dest, int x, int y, int colour) { @@ -225,13 +225,13 @@ void gfxCopyRect(const uint8 *sourceBuffer, int width, int height, byte *dest, i } } -void gfxModuleData_Init(void) { +void gfxModuleData_Init() { memset(globalScreen, 0, 320 * 200); memset(page00, 0, 320 * 200); memset(page10, 0, 320 * 200); } -void gfxModuleData_flipScreen(void) { +void gfxModuleData_flipScreen() { memcpy(globalScreen, gfxModuleData.pPage00, 320 * 200); flip(); diff --git a/engines/cruise/gfxModule.h b/engines/cruise/gfxModule.h index 724b327f35..1dbc5afc9b 100644 --- a/engines/cruise/gfxModule.h +++ b/engines/cruise/gfxModule.h @@ -49,9 +49,9 @@ extern gfxModuleDataStruct gfxModuleData; void gfxModuleData_gfxClearFrameBuffer(uint8 *ptr); void gfxModuleData_setDirtyColors(int min, int max); void gfxModuleData_setPalColor(int idx, int r, int g, int b); -void gfxModuleData_field_90(void); -void gfxModuleData_gfxWaitVSync(void); -void gfxModuleData_flip(void); +void gfxModuleData_field_90(); +void gfxModuleData_gfxWaitVSync(); +void gfxModuleData_flip(); void gfxModuleData_updatePalette(); void gfxModuleData_updateScreen(); @@ -59,14 +59,14 @@ void gfxCopyRect(const uint8 *sourceBuffer, int width, int height, byte *dest, i void gfxModuleData_gfxCopyScreen(const uint8 *sourcePtr, uint8 *destPtr); void convertGfxFromMode4(const uint8 *sourcePtr, int width, int height, uint8 *destPtr); void convertGfxFromMode5(const uint8 *sourcePtr, int width, int height, uint8 *destPtr); -void gfxModuleData_Init(void); -void gfxModuleData_flipScreen(void); +void gfxModuleData_Init(); +void gfxModuleData_flipScreen(); //void gfxModuleData_setPal(uint8 * ptr); void gfxModuleData_convertOldPalColor(uint16 oldColor, uint8 *pOutput); void gfxModuleData_setPalEntries(const byte *ptr, int start, int num); void gfxModuleData_setPal256(const byte *ptr); void gfxModuleData_addDirtyRect(const Common::Rect &r); -void flip(void); +void flip(); void drawSolidBox(int32 x1, int32 y1, int32 x2, int32 y2, uint8 colour); void resetBitmap(uint8 *dataPtr, int32 dataSize); diff --git a/engines/cruise/linker.cpp b/engines/cruise/linker.cpp index 2d14d46ce3..49e97ebc11 100644 --- a/engines/cruise/linker.cpp +++ b/engines/cruise/linker.cpp @@ -270,7 +270,7 @@ int updateScriptImport(int ovlIdx) { } // check that the newly loaded isn't used by the already loaded overlays -void updateAllScriptsImports(void) { +void updateAllScriptsImports() { int i; for (i = 0; i < 90; i++) { diff --git a/engines/cruise/linker.h b/engines/cruise/linker.h index 808ace75e0..f513d15845 100644 --- a/engines/cruise/linker.h +++ b/engines/cruise/linker.h @@ -28,7 +28,7 @@ namespace Cruise { -void updateAllScriptsImports(void); +void updateAllScriptsImports(); } // End of namespace Cruise #endif diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp index 2218c5bb7c..ca7859f1e9 100644 --- a/engines/cruise/mainDraw.cpp +++ b/engines/cruise/mainDraw.cpp @@ -56,7 +56,7 @@ void addAutoCell(int overlayIdx, int idx, int type, int newVal, cellStruct *pObj pNewEntry->pCell = pObject; } -void freeAutoCell(void) { +void freeAutoCell() { autoCellStruct *pCurrent = autoCellHead.next; while (pCurrent) { @@ -126,7 +126,7 @@ void fadeIn() { PCFadeFlag = 0; } -void flipScreen(void) { +void flipScreen() { if (switchPal) { for (unsigned long int i = 0; i < 256*3; i++) { workpal[i] = palScreen[masterScreen][i]; @@ -341,7 +341,7 @@ int16 *A2ptr; -void buildSegment(void) { +void buildSegment() { int16* pOut = XMIN_XMAX; if ((polyXMin >= 320) || (polyXMax < 0) || (polyYMax < 0) || (polyYMin >= 200)) { @@ -1265,7 +1265,7 @@ void drawSprite(int width, int height, cellStruct *currentObjPtr, const uint8 *d } #ifdef _DEBUG -void drawCtp(void) { +void drawCtp() { /* int i; if (ctp_walkboxTable) { diff --git a/engines/cruise/mainDraw.h b/engines/cruise/mainDraw.h index 620ac6e4d7..306fb6845d 100644 --- a/engines/cruise/mainDraw.h +++ b/engines/cruise/mainDraw.h @@ -37,7 +37,7 @@ int upscaleValue(int value, int scale); void pixel(int x, int y, char color); void mainDraw(int16 param); -void flipScreen(void); +void flipScreen(); void buildPolyModel(int X, int Y, int scale, char *ptr2, char *destBuffer, char *dataPtr); void drawSprite(int width, int height, cellStruct *currentObjPtr, const uint8 *dataIn, int ys, int xs, uint8 *output, const uint8 *dataBuf); void flipPoly(int fileId, int16 *dataPtr, int scale, char** newFrame, int X, int Y, int *outX, int *outY, int *outScale); diff --git a/engines/cruise/object.cpp b/engines/cruise/object.cpp index 0a5a45f027..4d2c1c2273 100644 --- a/engines/cruise/object.cpp +++ b/engines/cruise/object.cpp @@ -288,7 +288,7 @@ int16 getSingleObjectParam(int16 overlayIdx, int16 param2, int16 param3, int16 * return 0; } -void objectReset(void) { +void objectReset() { for (int i = 1; i < numOfLoadedOverlay; i++) { if (overlayTable[i].alreadyLoaded && overlayTable[i].ovlData) { if (overlayTable[i].ovlData->arrayObject) { diff --git a/engines/cruise/object.h b/engines/cruise/object.h index 73c430ad01..625e8e479e 100644 --- a/engines/cruise/object.h +++ b/engines/cruise/object.h @@ -53,7 +53,7 @@ struct objectParamsQuery { objDataStruct *getObjectDataFromOverlay(int ovlIdx, int objIdx); int16 getSingleObjectParam(int16 overlayIdx, int16 param2, int16 param3, int16 * returnParam); int16 getMultipleObjectParam(int16 overlayIdx, int16 objectIdx, objectParamsQuery * returnParam); -void objectReset(void); +void objectReset(); const char *getObjectName(int index, const char *string); int getObjectClass(int overlayIdx, int objIdx); diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp index 8ed129a424..f93e8f37fc 100644 --- a/engines/cruise/overlay.cpp +++ b/engines/cruise/overlay.cpp @@ -33,7 +33,7 @@ namespace Cruise { overlayStruct overlayTable[90]; int numOfLoadedOverlay; -void initOverlayTable(void) { +void initOverlayTable() { int i; for (i = 0; i < 90; i++) { diff --git a/engines/cruise/overlay.h b/engines/cruise/overlay.h index 338ec51caf..7b2f34b73d 100644 --- a/engines/cruise/overlay.h +++ b/engines/cruise/overlay.h @@ -179,7 +179,7 @@ struct overlayStruct { extern overlayStruct overlayTable[90]; extern int numOfLoadedOverlay; -void initOverlayTable(void); +void initOverlayTable(); int loadOverlay(const char * scriptName); int32 findOverlayByName2(const char * name); int findOverlayByName(const char *overlayName); diff --git a/engines/cruise/perso.cpp b/engines/cruise/perso.cpp index e6dee49c9e..27d3c8cb7d 100644 --- a/engines/cruise/perso.cpp +++ b/engines/cruise/perso.cpp @@ -39,7 +39,7 @@ void freePerso(int persoIdx) { } } -void freeCTP(void) { +void freeCTP() { for (unsigned long int i = 0; i < NUM_PERSONS; i++) { freePerso(i); diff --git a/engines/cruise/perso.h b/engines/cruise/perso.h index 9522ca2fa6..19201ecafb 100644 --- a/engines/cruise/perso.h +++ b/engines/cruise/perso.h @@ -63,7 +63,7 @@ extern int16 numPoly; int cor_droite(int x1, int y1, int x2, int y2, point* outputTable); void freePerso(int persoIdx); -void freeCTP(void); +void freeCTP(); void affiche_chemin(int16 persoIdx, MovementEntry &data); int direction(int x1, int y1, int x2, int y2, int inc_jo1, int inc_jo2); diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp index fb752ce2a7..a7351ff700 100644 --- a/engines/cruise/saveload.cpp +++ b/engines/cruise/saveload.cpp @@ -659,7 +659,7 @@ void unloadOverlay(const char*name, int overlayNumber) { overlayTable[overlayNumber].alreadyLoaded = 0; } -void initVars(void) { +void initVars() { closeAllMenu(); resetFileEntryRange(0, NUM_FILE_ENTRIES); diff --git a/engines/cruise/saveload.h b/engines/cruise/saveload.h index bb69918a48..9aa1f89e0f 100644 --- a/engines/cruise/saveload.h +++ b/engines/cruise/saveload.h @@ -42,7 +42,7 @@ struct CruiseSavegameHeader { Common::Error saveSavegameData(int saveGameIdx, const Common::String &saveName); Common::Error loadSavegameData(int saveGameIdx); bool readSavegameHeader(Common::InSaveFile *in, CruiseSavegameHeader &header); -void initVars(void); +void initVars(); } // End of namespace Cruise diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp index 9ef9c686b1..3d0a0c1804 100644 --- a/engines/cruise/script.cpp +++ b/engines/cruise/script.cpp @@ -34,14 +34,14 @@ scriptInstanceStruct procHead; scriptInstanceStruct *currentScriptPtr; -int8 getByteFromScript(void) { +int8 getByteFromScript() { int8 var = *(int8*)(currentData3DataPtr + currentScriptPtr->scriptOffset); ++currentScriptPtr->scriptOffset; return (var); } -short int getShortFromScript(void) { +short int getShortFromScript() { short int var = (int16)READ_BE_UINT16(currentData3DataPtr + currentScriptPtr->scriptOffset); currentScriptPtr->scriptOffset += 2; @@ -49,7 +49,7 @@ short int getShortFromScript(void) { } // load opcode -int32 opcodeType0(void) { +int32 opcodeType0() { int index = 0; switch (currentScriptOpcodeType) { @@ -128,7 +128,7 @@ int32 opcodeType0(void) { } // save opcode -int32 opcodeType1(void) { +int32 opcodeType1() { int var = popVar(); int offset = 0; @@ -222,7 +222,7 @@ int32 opcodeType1(void) { return (0); } -int32 opcodeType2(void) { +int32 opcodeType2() { int index = 0; switch (currentScriptOpcodeType) { case 5: @@ -269,15 +269,15 @@ int32 opcodeType2(void) { return 0; } -int32 opcodeType10(void) { // break +int32 opcodeType10() { // break return (0); } -int32 opcodeType11(void) { // break +int32 opcodeType11() { // break return (1); } -int32 opcodeType4(void) { // test +int32 opcodeType4() { // test int boolVar = 0; int var1 = popVar(); @@ -322,7 +322,7 @@ int32 opcodeType4(void) { // test return (0); } -int32 opcodeType6(void) { +int32 opcodeType6() { int si = 0; int pop = popVar(); @@ -343,7 +343,7 @@ int32 opcodeType6(void) { return (0); } -int32 opcodeType7(void) { +int32 opcodeType7() { int var1 = popVar(); int var2 = popVar(); @@ -353,7 +353,7 @@ int32 opcodeType7(void) { return (0); } -int32 opcodeType5(void) { +int32 opcodeType5() { int offset = currentScriptPtr->scriptOffset; int short1 = getShortFromScript(); int newSi = short1 + offset; @@ -408,7 +408,7 @@ int32 opcodeType5(void) { return (0); } -int32 opcodeType3(void) { // math +int32 opcodeType3() { // math int pop1 = popVar(); int pop2 = popVar(); @@ -447,7 +447,7 @@ int32 opcodeType3(void) { // math return 0; } -int32 opcodeType9(void) { // stop script +int32 opcodeType9() { // stop script //printf("Stop a script of overlay %s\n",overlayTable[currentScriptPtr->overlayNumber].overlayName); currentScriptPtr->scriptNumber = -1; return (1); diff --git a/engines/cruise/script.h b/engines/cruise/script.h index bcaa2db9ff..2a7a85689d 100644 --- a/engines/cruise/script.h +++ b/engines/cruise/script.h @@ -55,8 +55,8 @@ extern scriptInstanceStruct relHead; extern scriptInstanceStruct procHead; extern scriptInstanceStruct *currentScriptPtr; -void setupFuncArray(void); -int8 getByteFromScript(void); +void setupFuncArray(); +int8 getByteFromScript(); int removeScript(int overlay, int idx, scriptInstanceStruct * headPtr); uint8 *attacheNewScriptToTail(scriptInstanceStruct *scriptHandlePtr, int16 overlayNumber, int16 param, int16 arg0, int16 arg1, int16 arg2, scriptTypeEnum scriptType); diff --git a/engines/cruise/stack.cpp b/engines/cruise/stack.cpp index 1639ba3942..4f36dbec48 100644 --- a/engines/cruise/stack.cpp +++ b/engines/cruise/stack.cpp @@ -40,7 +40,7 @@ void pushVar(int16 var) { } } -int16 popVar(void) { +int16 popVar() { if (positionInStack <= 0) { return (0); } diff --git a/engines/cruise/stack.h b/engines/cruise/stack.h index 831c07e217..a7cd3f556d 100644 --- a/engines/cruise/stack.h +++ b/engines/cruise/stack.h @@ -46,11 +46,11 @@ struct stackElementStruct { } data; }; -int16 popVar(void); +int16 popVar(); void pushVar(int16 var); void pushPtr(void *ptr); -void *popPtr(void); +void *popPtr(); } // End of namespace Cruise diff --git a/engines/cruise/vars.h b/engines/cruise/vars.h index 4bb94ff691..1e19794f3a 100644 --- a/engines/cruise/vars.h +++ b/engines/cruise/vars.h @@ -51,8 +51,8 @@ struct menuElementStruct { menuElementSubStruct *ptrSub; }; -typedef int32(*opcodeTypeFunction)(void); -typedef int16(*opcodeFunction)(void); +typedef int32(*opcodeTypeFunction)(); +typedef int16(*opcodeFunction)(); extern uint8 *_systemFNT; extern int16 fontFileIndex; diff --git a/engines/cruise/volume.cpp b/engines/cruise/volume.cpp index 58cd2fdb44..3b856b4440 100644 --- a/engines/cruise/volume.cpp +++ b/engines/cruise/volume.cpp @@ -56,7 +56,7 @@ void loadPal(volumeDataStruct *entry) { #endif } -void closePal(void) { +void closePal() { if (PAL_file.isOpen()) { PAL_file.close(); @@ -68,7 +68,7 @@ void closePal(void) { } } -int closeBase(void) { +int closeBase() { if (currentVolumeFile.isOpen()) { currentVolumeFile.close(); @@ -177,7 +177,7 @@ int32 findFileInDisksSub1(const char *fileName) { return (foundDisk); } -void freeDisk(void) { +void freeDisk() { if (currentVolumeFile.isOpen()) { currentVolumeFile.close(); MemFree(volumePtrToFileDescriptor); @@ -313,7 +313,7 @@ int16 findFileInDisks(const char *name) { } } -int closeCnf(void) { +int closeCnf() { for (long int i = 0; i < numOfDisks; i++) { if (volumeData[i].ptr) { MemFree(volumeData[i].ptr); @@ -326,7 +326,7 @@ int closeCnf(void) { return 0; } -int16 readVolCnf(void) { +int16 readVolCnf() { int i; Common::File fileHandle; short int sizeHEntry; diff --git a/engines/cruise/volume.h b/engines/cruise/volume.h index ef5113b1c3..a842a30470 100644 --- a/engines/cruise/volume.h +++ b/engines/cruise/volume.h @@ -28,10 +28,10 @@ namespace Cruise { -int16 readVolCnf(void); -int closeCnf(void); +int16 readVolCnf(); +int closeCnf(); int16 findFileInDisks(const char *name); -void freeDisk(void); +void freeDisk(); int16 findFileInList(const char *fileName); //////////////// @@ -41,7 +41,7 @@ void drawMsgString(const char *string); void askDisk(int16 discNumber); void setObjectPosition(int16 param1, int16 param2, int16 param3, int16 param4); -int closeBase(void); +int closeBase(); } // End of namespace Cruise diff --git a/engines/draci/barchive.cpp b/engines/draci/barchive.cpp index 735a84bb60..c9703559b8 100644 --- a/engines/draci/barchive.cpp +++ b/engines/draci/barchive.cpp @@ -238,7 +238,7 @@ void BArchive::openArchive(const Common::String &path) { * Closes the currently opened archive. It can be called explicitly to * free up memory. */ -void BArchive::closeArchive(void) { +void BArchive::closeArchive() { if (!_opened) { return; } diff --git a/engines/draci/barchive.h b/engines/draci/barchive.h index 1d366944f2..87ee301de5 100644 --- a/engines/draci/barchive.h +++ b/engines/draci/barchive.h @@ -43,7 +43,7 @@ struct BAFile { byte _stopper; ///< Not used in BAR files, needed for DFW /** Releases the file data (for memory considerations) */ - void close(void) { + void close() { delete[] _data; _data = NULL; } @@ -61,7 +61,7 @@ public: ~BArchive() { closeArchive(); } void openArchive(const Common::String &path); - void closeArchive(void); + void closeArchive(); uint size() const { return _fileCount; } /** diff --git a/engines/draci/music.h b/engines/draci/music.h index 0db062d73b..2d3da47e46 100644 --- a/engines/draci/music.h +++ b/engines/draci/music.h @@ -67,7 +67,7 @@ public: void metaEvent(byte type, byte *data, uint16 length); void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { } - uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; } + uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; } //Channel allocation functions MidiChannel *allocateChannel() { return 0; } diff --git a/engines/draci/sound.h b/engines/draci/sound.h index ab0df52dea..28379b5429 100644 --- a/engines/draci/sound.h +++ b/engines/draci/sound.h @@ -41,7 +41,7 @@ struct SoundSample { uint _frequency; byte* _data; - void close(void) { + void close() { delete[] _data; _data = NULL; } diff --git a/engines/engine.cpp b/engines/engine.cpp index 291f036c5a..b6c8f10090 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -43,7 +43,7 @@ #include "engines/metaengine.h" #ifdef _WIN32_WCE -extern bool isSmartphone(void); +extern bool isSmartphone(); #endif // FIXME: HACK for MidiEmu & error() diff --git a/engines/gob/draw_bargon.cpp b/engines/gob/draw_bargon.cpp index 80ba7874b8..d335310dcf 100644 --- a/engines/gob/draw_bargon.cpp +++ b/engines/gob/draw_bargon.cpp @@ -33,7 +33,7 @@ namespace Gob { Draw_Bargon::Draw_Bargon(GobEngine *vm) : Draw_v2(vm) { } -void Draw_Bargon::initScreen(void) { +void Draw_Bargon::initScreen() { _vm->_global->_videoMode = 0x14; _vm->_video->_surfWidth = 640; _vm->_video->initPrimary(_vm->_global->_videoMode); diff --git a/engines/gob/expression.h b/engines/gob/expression.h index 894704e2a9..2c27ddc8e7 100644 --- a/engines/gob/expression.h +++ b/engines/gob/expression.h @@ -116,7 +116,7 @@ public: void skipExpr(char stopToken); void printExpr(char stopToken); - void printVarIndex(void); + void printVarIndex(); int16 parseVarIndex(uint16 *size = 0, uint16 *type = 0); int16 parseValExpr(byte stopToken = 99); diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp index 45fb643166..34d03d9e8c 100644 --- a/engines/gob/goblin.cpp +++ b/engines/gob/goblin.cpp @@ -168,7 +168,7 @@ int16 Goblin::peekGoblin(Gob_Object *_curGob) { return index; } -void Goblin::initList(void) { +void Goblin::initList() { _objList = new Util::List; _objList->pHead = 0; _objList->pTail = 0; @@ -210,7 +210,7 @@ void Goblin::playSound(SoundDesc &snd, int16 repCount, int16 freq) { } } -void Goblin::drawObjects(void) { +void Goblin::drawObjects() { Util::ListNode *ptr; Util::ListNode *ptr2; @@ -410,7 +410,7 @@ void Goblin::drawObjects(void) { } } -void Goblin::animateObjects(void) { +void Goblin::animateObjects() { Util::ListNode *node; Gob_Object *objDesc; Scenery::AnimLayer *pLayer; @@ -730,7 +730,7 @@ void Goblin::adjustDest(int16 posX, int16 posY) { _pressedMapY = CLIP((int) _pressedMapY, 0, _vm->_map->_mapHeight - 1); } -void Goblin::adjustTarget(void) { +void Goblin::adjustTarget() { if ((_gobAction == 4) && (_vm->_map->getItem(_pressedMapX, _pressedMapY) == 0)) { @@ -766,7 +766,7 @@ void Goblin::targetDummyItem(Gob_Object *gobDesc) { } } -void Goblin::targetItem(void) { +void Goblin::targetItem() { int16 tmpX; int16 tmpY; int16 items; @@ -1162,7 +1162,7 @@ int16 Goblin::doMove(Gob_Object *gobDesc, int16 cont, int16 action) { return gobIndex; } -void Goblin::zeroObjects(void) { +void Goblin::zeroObjects() { for (int i = 0; i < 4; i++) _goblins[i] = 0; @@ -1173,7 +1173,7 @@ void Goblin::zeroObjects(void) { _vm->_sound->sampleFree(&_soundData[i]); } -void Goblin::freeAllObjects(void) { +void Goblin::freeAllObjects() { _vm->_util->deleteList(_objList); _objList = 0; freeObjects(); @@ -1262,7 +1262,7 @@ void Goblin::saveGobDataToVars(int16 xPos, int16 yPos, int16 someVal) { _destItemType = obj->type; } -void Goblin::initVarPointers(void) { +void Goblin::initVarPointers() { _gobRetVarPtr.set(*_vm->_inter->_variables, 236); _curGobStateVarPtr.set(*_vm->_inter->_variables, 240); _curGobFrameVarPtr.set(*_vm->_inter->_variables, 244); @@ -1316,7 +1316,7 @@ void Goblin::initVarPointers(void) { _itemInPocketVarPtr = (uint32) -2; } -void Goblin::loadGobDataFromVars(void) { +void Goblin::loadGobDataFromVars() { Gob_Object *obj; _itemIndInPocket = (int32) _itemInPocketVarPtr; diff --git a/engines/gob/goblin.h b/engines/gob/goblin.h index 565afa1ad8..c2bcaa5752 100644 --- a/engines/gob/goblin.h +++ b/engines/gob/goblin.h @@ -198,20 +198,20 @@ public: // Functions char rotateState(int16 from, int16 to); void playSound(SoundDesc &snd, int16 repCount, int16 freq); - void drawObjects(void); - void animateObjects(void); + void drawObjects(); + void animateObjects(); int16 getObjMaxFrame(Gob_Object * obj); bool objIntersected(Gob_Object * obj1, Gob_Object * obj2); void setMultStates(Gob_Object * gobDesc); int16 nextLayer(Gob_Object * gobDesc); void showBoredom(int16 gobIndex); void switchGoblin(int16 index); - void zeroObjects(void); - void freeAllObjects(void); + void zeroObjects(); + void freeAllObjects(); void loadObjects(const char *source); - void initVarPointers(void); + void initVarPointers(); void saveGobDataToVars(int16 xPos, int16 yPos, int16 someVal); - void loadGobDataFromVars(void); + void loadGobDataFromVars(); void pickItem(int16 indexToPocket, int16 idToPocket); void placeItem(int16 indexInPocket, int16 idInPocket); void swapItems(int16 indexToPick, int16 idToPick); @@ -225,10 +225,10 @@ public: void move(int16 destX, int16 destY, int16 objIndex); void animate(Mult::Mult_Object *obj); - virtual void handleGoblins(void) = 0; + virtual void handleGoblins() = 0; virtual void placeObject(Gob_Object * objDesc, char animated, int16 index, int16 x, int16 y, int16 state) = 0; - virtual void freeObjects(void) = 0; + virtual void freeObjects() = 0; virtual void initiateMove(Mult::Mult_Object *obj) = 0; virtual void moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16 nextAct, int16 framesCount) = 0; @@ -243,12 +243,12 @@ protected: GobEngine *_vm; int16 peekGoblin(Gob_Object *curGob); - void initList(void); + void initList(); void sortByOrder(Util::List *list); void adjustDest(int16 posX, int16 posY); - void adjustTarget(void); + void adjustTarget(); void targetDummyItem(Gob_Object *gobDesc); - void targetItem(void); + void targetItem(); void moveFindItem(int16 posX, int16 posY); void moveCheckSelect(int16 framesCount, Gob_Object * gobDesc, int16 *pGobIndex, int16 *nextAct); @@ -265,10 +265,10 @@ protected: class Goblin_v1 : public Goblin { public: - virtual void handleGoblins(void) {} + virtual void handleGoblins() {} virtual void placeObject(Gob_Object * objDesc, char animated, int16 index, int16 x, int16 y, int16 state); - virtual void freeObjects(void); + virtual void freeObjects(); virtual void initiateMove(Mult::Mult_Object *obj); virtual void moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16 nextAct, int16 framesCount); @@ -285,10 +285,10 @@ protected: class Goblin_v2 : public Goblin_v1 { public: - virtual void handleGoblins(void); + virtual void handleGoblins(); virtual void placeObject(Gob_Object * objDesc, char animated, int16 index, int16 x, int16 y, int16 state); - virtual void freeObjects(void); + virtual void freeObjects(); virtual void initiateMove(Mult::Mult_Object *obj); virtual void moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc, int16 nextAct, int16 framesCount); diff --git a/engines/gob/goblin_v1.cpp b/engines/gob/goblin_v1.cpp index 266e224086..bc0878c426 100644 --- a/engines/gob/goblin_v1.cpp +++ b/engines/gob/goblin_v1.cpp @@ -42,7 +42,7 @@ Goblin_v1::Goblin_v1(GobEngine *vm) : Goblin(vm) { _rotStates[3][0] = 27; _rotStates[3][1] = 25; _rotStates[3][2] = 26; _rotStates[3][3] = 6; } -void Goblin_v1::freeObjects(void) { +void Goblin_v1::freeObjects() { int16 state; int16 col; diff --git a/engines/gob/goblin_v2.cpp b/engines/gob/goblin_v2.cpp index d763aeb01c..2747750abb 100644 --- a/engines/gob/goblin_v2.cpp +++ b/engines/gob/goblin_v2.cpp @@ -45,7 +45,7 @@ Goblin_v2::Goblin_v2(GobEngine *vm) : Goblin_v1(vm) { _rotStates[3][0] = 23; _rotStates[3][1] = 21; _rotStates[3][2] = 22; _rotStates[3][3] = 6; } -void Goblin_v2::freeObjects(void) { +void Goblin_v2::freeObjects() { if (_gobsCount < 0) return; @@ -463,7 +463,7 @@ void Goblin_v2::moveAdvance(Mult::Mult_Object *obj, Gob_Object *gobDesc, } } -void Goblin_v2::handleGoblins(void) { +void Goblin_v2::handleGoblins() { Mult::Mult_Object *obj0, *obj1; Mult::Mult_AnimData *anim0, *anim1; int16 pass; diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp index e0df00fedc..484962b0b3 100644 --- a/engines/gob/hotspots.cpp +++ b/engines/gob/hotspots.cpp @@ -1609,7 +1609,7 @@ int16 Hotspots::findCursor(uint16 x, uint16 y) const { return cursor; } -void Hotspots::oPlaytoons_F_1B(void) { +void Hotspots::oPlaytoons_F_1B() { int16 shortId; int16 longId; int16 var2; diff --git a/engines/gob/map.cpp b/engines/gob/map.cpp index cd90ed87db..9f1f5bdc59 100644 --- a/engines/gob/map.cpp +++ b/engines/gob/map.cpp @@ -461,7 +461,7 @@ int16 Map::checkLongPath(int16 x0, int16 y0, } } -void Map::loadMapsInitGobs(void) { +void Map::loadMapsInitGobs() { int16 layer; if (!_loadFromAvo) diff --git a/engines/gob/map.h b/engines/gob/map.h index 0c5f97b97a..4a63e84a63 100644 --- a/engines/gob/map.h +++ b/engines/gob/map.h @@ -100,7 +100,7 @@ public: int16 checkLongPath(int16 x0, int16 y0, int16 x1, int16 y1, int16 i0, int16 i1); - void loadMapsInitGobs(void); + void loadMapsInitGobs(); virtual int16 getItem(int x, int y) = 0; virtual void setItem(int x, int y, int16 item) = 0; @@ -166,7 +166,7 @@ public: virtual ~Map_v1(); protected: - void init(void); + void init(); void loadSounds(Common::SeekableReadStream &data); void loadGoblins(Common::SeekableReadStream &data, uint32 gobsPos); void loadObjects(Common::SeekableReadStream &data, uint32 objsPos); diff --git a/engines/gob/map_v1.cpp b/engines/gob/map_v1.cpp index dacc72d6c7..d8898c83d3 100644 --- a/engines/gob/map_v1.cpp +++ b/engines/gob/map_v1.cpp @@ -40,7 +40,7 @@ Map_v1::Map_v1(GobEngine *vm) : Map(vm) { Map_v1::~Map_v1() { } -void Map_v1::init(void) { +void Map_v1::init() { if (_passMap || _itemsMap) return; diff --git a/engines/gob/mult.cpp b/engines/gob/mult.cpp index d383d955c7..883f102ef9 100644 --- a/engines/gob/mult.cpp +++ b/engines/gob/mult.cpp @@ -109,7 +109,7 @@ Mult::~Mult() { delete _multData; } -void Mult::initAll(void) { +void Mult::initAll() { _objects = 0; _animSurf.reset(); _renderData = 0; @@ -117,7 +117,7 @@ void Mult::initAll(void) { _vm->_scenery->init(); } -void Mult::freeAll(void) { +void Mult::freeAll() { freeMult(); for (int i = 0; i < 10; i++) { @@ -149,12 +149,12 @@ void Mult::freeMult() { _vm->_draw->freeSprite(22); } -void Mult::checkFreeMult(void) { +void Mult::checkFreeMult() { if (_multData) freeMultKeys(); } -void Mult::zeroMultData(void) { +void Mult::zeroMultData() { _multData = 0; } diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp index aaba222654..6077b1ebb5 100644 --- a/engines/gob/util.cpp +++ b/engines/gob/util.cpp @@ -47,7 +47,7 @@ Util::Util(GobEngine *vm) : _vm(vm) { _startFrameTime = 0; } -uint32 Util::getTimeKey(void) { +uint32 Util::getTimeKey() { return g_system->getMillis() * _vm->_global->_speedFactor; } @@ -83,7 +83,7 @@ void Util::longDelay(uint16 msecs) { ((g_system->getMillis() * _vm->_global->_speedFactor) < time)); } -void Util::initInput(void) { +void Util::initInput() { _mouseButtons = kMouseButtonsNone; _keyBufferHead = _keyBufferTail = 0; } @@ -151,7 +151,7 @@ void Util::processInput(bool scroll) { } } -void Util::clearKeyBuf(void) { +void Util::clearKeyBuf() { processInput(); _keyBufferHead = _keyBufferTail = 0; } @@ -220,7 +220,7 @@ int16 Util::translateKey(const Common::KeyState &key) { return 0; } -int16 Util::getKey(void) { +int16 Util::getKey() { Common::KeyState key; while (!getKeyFromBuffer(key)) { @@ -232,7 +232,7 @@ int16 Util::getKey(void) { return translateKey(key); } -int16 Util::checkKey(void) { +int16 Util::checkKey() { Common::KeyState key; getKeyFromBuffer(key); @@ -266,7 +266,7 @@ void Util::setMousePos(int16 x, int16 y) { g_system->warpMouse(x, y); } -void Util::waitMouseUp(void) { +void Util::waitMouseUp() { do { processInput(); if (_mouseButtons != kMouseButtonsNone) @@ -274,7 +274,7 @@ void Util::waitMouseUp(void) { } while (_mouseButtons != kMouseButtonsNone); } -void Util::waitMouseDown(void) { +void Util::waitMouseDown() { int16 x; int16 y; MouseButtons buttons; @@ -309,7 +309,7 @@ void Util::forceMouseUp(bool onlyWhenSynced) { _mouseButtons = kMouseButtonsNone; } -void Util::clearPalette(void) { +void Util::clearPalette() { int16 i; byte colors[1024]; diff --git a/engines/gob/util.h b/engines/gob/util.h index ef972eb68c..6968db1a27 100644 --- a/engines/gob/util.h +++ b/engines/gob/util.h @@ -91,7 +91,7 @@ public: List() : pHead(0), pTail(0) {} }; - uint32 getTimeKey(void); + uint32 getTimeKey(); int16 getRandom(int16 max); void beep(int16 freq); @@ -100,21 +100,21 @@ public: void delay(uint16 msecs); void longDelay(uint16 msecs); - void initInput(void); + void initInput(); void processInput(bool scroll = false); - void clearKeyBuf(void); - int16 getKey(void); - int16 checkKey(void); + void clearKeyBuf(); + int16 getKey(); + int16 checkKey(); bool checkKey(int16 &key); void getMouseState(int16 *pX, int16 *pY, MouseButtons *pButtons); void setMousePos(int16 x, int16 y); - void waitMouseUp(void); - void waitMouseDown(void); + void waitMouseUp(); + void waitMouseDown(); void waitMouseRelease(char drawMouse); void forceMouseUp(bool onlyWhenSynced = false); - void clearPalette(void); + void clearPalette(); int16 getFrameRate(); void setFrameRate(int16 rate); void notifyNewAnim(); diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index 1532d10779..b504ffde1f 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -281,7 +281,7 @@ void MusicPlayerMidi::setTimerCallback(void *timer_param, Common::TimerManager:: _driver->setTimerCallback(timer_param, timer_proc); } -uint32 MusicPlayerMidi::getBaseTempo(void) { +uint32 MusicPlayerMidi::getBaseTempo() { if (_driver) return _driver->getBaseTempo(); else diff --git a/engines/groovie/music.h b/engines/groovie/music.h index fb1ddfe9c3..6302c81dcc 100644 --- a/engines/groovie/music.h +++ b/engines/groovie/music.h @@ -97,7 +97,7 @@ public: void send(uint32 b); void metaEvent(byte type, byte *data, uint16 length); void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc); - uint32 getBaseTempo(void); + uint32 getBaseTempo(); MidiChannel *allocateChannel(); MidiChannel *getPercussionChannel(); diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h index 994dd5a76e..98991dadd9 100644 --- a/engines/kyra/sound_intern.h +++ b/engines/kyra/sound_intern.h @@ -129,7 +129,7 @@ public: void metaEvent(byte type, byte *data, uint16 length) {} void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { } - uint32 getBaseTempo(void); + uint32 getBaseTempo(); //Channel allocation functions MidiChannel *allocateChannel() { return 0; } diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp index 24ff956052..0c4affd162 100644 --- a/engines/kyra/sound_midi.cpp +++ b/engines/kyra/sound_midi.cpp @@ -51,7 +51,7 @@ public: void metaEvent(byte type, byte *data, uint16 length); void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { _output->setTimerCallback(timerParam, timerProc); } - uint32 getBaseTempo(void) { return _output->getBaseTempo(); } + uint32 getBaseTempo() { return _output->getBaseTempo(); } // DUMMY int open() { return 0; } diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 7d46497e39..1d6470b7cc 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -3958,7 +3958,7 @@ void SoundTowns::send(uint32 b) { _driver->send(b); } -uint32 SoundTowns::getBaseTempo(void) { +uint32 SoundTowns::getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; } diff --git a/engines/lure/sound.h b/engines/lure/sound.h index cf5dca7e96..704cc3f608 100644 --- a/engines/lure/sound.h +++ b/engines/lure/sound.h @@ -89,7 +89,7 @@ public: void metaEvent(byte type, byte *data, uint16 length); void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { } - uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; } + uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; } //Channel allocation functions MidiChannel *allocateChannel() { return 0; } diff --git a/engines/m4/console.h b/engines/m4/console.h index 45c9d1abec..3ec8637d2b 100644 --- a/engines/m4/console.h +++ b/engines/m4/console.h @@ -35,7 +35,7 @@ class M4Engine; class Console : public GUI::Debugger { public: Console(M4Engine *vm); - virtual ~Console(void); + virtual ~Console(); private: bool cmdLoadScene(int argc, const char **argv); diff --git a/engines/m4/midi.h b/engines/m4/midi.h index 8e157cfbd1..6f99f1d868 100644 --- a/engines/m4/midi.h +++ b/engines/m4/midi.h @@ -60,7 +60,7 @@ public: void metaEvent(byte type, byte *data, uint16 length); void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { } - uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; } + uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; } //Channel allocation functions MidiChannel *allocateChannel() { return 0; } diff --git a/engines/made/music.h b/engines/made/music.h index 8ef39b4fd3..116ea7d5fd 100644 --- a/engines/made/music.h +++ b/engines/made/music.h @@ -72,7 +72,7 @@ public: void metaEvent(byte type, byte *data, uint16 length); void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { } - uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; } + uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; } //Channel allocation functions MidiChannel *allocateChannel() { return 0; } diff --git a/engines/made/redreader.cpp b/engines/made/redreader.cpp index 303d6ff14b..c89068b16e 100644 --- a/engines/made/redreader.cpp +++ b/engines/made/redreader.cpp @@ -239,7 +239,7 @@ void LzhDecompressor::read_c_len() { } } -unsigned int LzhDecompressor::decode_c(void) { +unsigned int LzhDecompressor::decode_c() { uint j, mask; if (_blocksize == 0) { _blocksize = getbits(16); diff --git a/engines/made/redreader.h b/engines/made/redreader.h index 362a94706e..b734ca02e1 100644 --- a/engines/made/redreader.h +++ b/engines/made/redreader.h @@ -86,11 +86,11 @@ private: void fillbuf(int count); uint getbits(int count); - void init_getbits(void); - void decode_start(void); + void init_getbits(); + void decode_start(); void decode(uint count, byte text[]); - void huf_decode_start(void); - unsigned int decode_c(void); + void huf_decode_start(); + unsigned int decode_c(); unsigned int decode_p(); void read_pt_len(int nn, int nbit, int i_special); void read_c_len(); diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index c78c4824b7..38a9467a91 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -241,7 +241,7 @@ public: Common::Platform getPlatform() const; protected: // members - bool detectGame(void); + bool detectGame(); private: const PARALLACTIONGameDescription *_gameDescription; diff --git a/engines/queen/music.h b/engines/queen/music.h index 389b158719..2f749d62e8 100644 --- a/engines/queen/music.h +++ b/engines/queen/music.h @@ -63,7 +63,7 @@ public: void metaEvent(byte type, byte *data, uint16 length); void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { } - uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; } + uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; } //Channel allocation functions MidiChannel *allocateChannel() { return 0; } diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp index 699eb39405..0ffbe66314 100644 --- a/engines/saga/actor.cpp +++ b/engines/saga/actor.cpp @@ -1210,7 +1210,7 @@ void Actor::drawActors() { drawSpeech(); } -void Actor::drawSpeech(void) { +void Actor::drawSpeech() { if (!isSpeaking() || !_activeSpeech.playing || _vm->_script->_skipSpeeches || (!_vm->_subtitlesEnabled && _vm->getGameId() == GID_ITE && !(_vm->getFeatures() & GF_ITE_FLOPPY)) || (!_vm->_subtitlesEnabled && (_vm->getGameId() == GID_IHNM))) diff --git a/engines/saga/animation.cpp b/engines/saga/animation.cpp index 95a850cfe2..8b9ada3e47 100644 --- a/engines/saga/animation.cpp +++ b/engines/saga/animation.cpp @@ -53,7 +53,7 @@ Anim::Anim(SagaEngine *vm) : _vm(vm) { _cutawayAnimations[i] = NULL; } -Anim::~Anim(void) { +Anim::~Anim() { reset(); #ifdef ENABLE_IHNM freeCutawayList(); @@ -77,7 +77,7 @@ void Anim::loadCutawayList(const byte *resourcePointer, size_t resourceLength) { } } -void Anim::freeCutawayList(void) { +void Anim::freeCutawayList() { free(_cutawayList); _cutawayList = NULL; _cutawayListLength = 0; @@ -206,14 +206,14 @@ int Anim::playCutaway(int cut, bool fade) { return MAX_ANIMATIONS + cutawaySlot; } -void Anim::endCutaway(void) { +void Anim::endCutaway() { // This is called by scripts after a cutaway is finished. At this time, // nothing needs to be done here. debug(0, "endCutaway()"); } -void Anim::returnFromCutaway(void) { +void Anim::returnFromCutaway() { // This is called by scripts after a cutaway is finished, to return back // to the scene that the cutaway was called from. It's not called by the // IHNM intro, as there is no old scene to return to. @@ -308,7 +308,7 @@ void Anim::returnFromCutaway(void) { } } -void Anim::clearCutaway(void) { +void Anim::clearCutaway() { PalEntry *pal; debug(1, "clearCutaway()"); @@ -383,13 +383,13 @@ void Anim::startVideo(int vid, bool fade) { playCutaway(vid, fade); } -void Anim::endVideo(void) { +void Anim::endVideo() { debug(0, "endVideo()"); clearCutaway(); } -void Anim::returnFromVideo(void) { +void Anim::returnFromVideo() { debug(0, "returnFromVideo()"); returnFromCutaway(); diff --git a/engines/saga/animation.h b/engines/saga/animation.h index 5495ab229e..72b145089c 100644 --- a/engines/saga/animation.h +++ b/engines/saga/animation.h @@ -109,19 +109,19 @@ struct AnimationData { class Anim { public: Anim(SagaEngine *vm); - ~Anim(void); + ~Anim(); void loadCutawayList(const byte *resourcePointer, size_t resourceLength); - void freeCutawayList(void); + void freeCutawayList(); int playCutaway(int cut, bool fade); - void endCutaway(void); - void returnFromCutaway(void); - void clearCutaway(void); + void endCutaway(); + void returnFromCutaway(); + void clearCutaway(); void showCutawayBg(int bg); void startVideo(int vid, bool fade); - void endVideo(void); - void returnFromVideo(void); + void endVideo(); + void returnFromVideo(); void load(uint16 animId, const byte *animResourceData, size_t animResourceLength); void freeId(uint16 animId); @@ -130,9 +130,9 @@ public: void setFlag(uint16 animId, uint16 flag); void clearFlag(uint16 animId, uint16 flag); void setFrameTime(uint16 animId, int time); - void reset(void); - void animInfo(void); - void cutawayInfo(void); + void reset(); + void animInfo(); + void cutawayInfo(); void setCycles(uint16 animId, int cycles); void stop(uint16 animId); void finish(uint16 animId); @@ -152,7 +152,7 @@ public: return (_animations[animId] != NULL); } - bool hasCutaway(void) { return _cutawayActive; } + bool hasCutaway() { return _cutawayActive; } void setCutAwayMode(int mode) { _cutAwayMode = mode; } int cutawayListLength() { return _cutawayListLength; } int cutawayBgResourceID(int cutaway) { return _cutawayList[cutaway].backgroundResourceId; } diff --git a/engines/saga/console.h b/engines/saga/console.h index 5fe4c3bf94..c2e563e019 100644 --- a/engines/saga/console.h +++ b/engines/saga/console.h @@ -35,7 +35,7 @@ namespace Saga { class Console : public GUI::Debugger { public: Console(SagaEngine *vm); - virtual ~Console(void); + virtual ~Console(); private: bool cmdActorWalkTo(int argc, const char **argv); diff --git a/engines/saga/events.cpp b/engines/saga/events.cpp index cce8464653..98f206b29d 100644 --- a/engines/saga/events.cpp +++ b/engines/saga/events.cpp @@ -47,7 +47,7 @@ Events::Events(SagaEngine *vm) : _vm(vm) { debug(8, "Initializing event subsystem..."); } -Events::~Events(void) { +Events::~Events() { debug(8, "Shutting down event subsystem..."); freeList(); } diff --git a/engines/saga/events.h b/engines/saga/events.h index 512e28bbf5..7492f01b60 100644 --- a/engines/saga/events.h +++ b/engines/saga/events.h @@ -162,7 +162,7 @@ enum EventStatusCode { class Events { public: Events(SagaEngine *vm); - ~Events(void); + ~Events(); int handleEvents(long msec); int clearList(bool playQueuedMusic = true); int freeList(); diff --git a/engines/saga/font.cpp b/engines/saga/font.cpp index d9634fc8cd..d414b903e6 100644 --- a/engines/saga/font.cpp +++ b/engines/saga/font.cpp @@ -51,7 +51,7 @@ Font::Font(SagaEngine *vm) : _vm(vm) { _fontMapping = 0; } -Font::~Font(void) { +Font::~Font() { debug(8, "Font::~Font(): Freeing fonts."); int i; diff --git a/engines/saga/font.h b/engines/saga/font.h index 0064c22afc..074b56bf0d 100644 --- a/engines/saga/font.h +++ b/engines/saga/font.h @@ -130,7 +130,7 @@ struct FontData { class Font { public: Font(SagaEngine *vm); - ~Font(void); + ~Font(); int getStringWidth(KnownFont font, const char *text, size_t count, FontEffectFlags flags) { return getStringWidth(knownFont2FontIdx(font), text, count, flags); } diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp index cae159049b..42336912d5 100644 --- a/engines/saga/interface.cpp +++ b/engines/saga/interface.cpp @@ -344,7 +344,7 @@ Interface::Interface(SagaEngine *vm) : _vm(vm) { _vm->getTimerManager()->installTimerProc(&saveReminderCallback, TIMETOSAVE, this); } -Interface::~Interface(void) { +Interface::~Interface() { free(_inventory); free(_mainPanel.image); @@ -2414,13 +2414,13 @@ void Interface::drawVerbPanelText(PanelButton *panelButton, KnownColor textKnown // Converse stuff -void Interface::converseInit(void) { +void Interface::converseInit() { for (int i = 0; i < CONVERSE_MAX_TEXTS; i++) _converseText[i].text = NULL; converseClear(); } -void Interface::converseClear(void) { +void Interface::converseClear() { for (int i = 0; i < CONVERSE_MAX_TEXTS; i++) { if (_converseText[i].text != NULL) { free(_converseText[i].text); diff --git a/engines/saga/interface.h b/engines/saga/interface.h index b58fed6676..0fbe5bef20 100644 --- a/engines/saga/interface.h +++ b/engines/saga/interface.h @@ -183,7 +183,7 @@ enum StatusTextInputState { class Interface { public: Interface(SagaEngine *vm); - ~Interface(void); + ~Interface(); int activate(); int deactivate(); @@ -196,7 +196,7 @@ public: } bool isActive() { return _active; } void setMode(int mode); - int getMode(void) const { return _panelMode; } + int getMode() const { return _panelMode; } void setFadeMode(int fadeMode) { _fadeMode = fadeMode; draw(); @@ -356,8 +356,8 @@ private: void processStatusTextInput(Common::KeyState keystate); public: - void converseInit(void); - void converseClear(void); + void converseInit(); + void converseClear(); bool converseAddText(const char *text, int strId, int replyId, byte replyFlags, int replyBit); void converseDisplayText(); void converseSetTextLines(int row); diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index 8ca946a127..31517f403e 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -443,17 +443,17 @@ void Music::play(uint32 resourceId, MusicFlags flags) { _midiMusicData = resourceData; } -void Music::pause(void) { +void Music::pause() { _player->setVolume(-1); _player->setPlaying(false); } -void Music::resume(void) { +void Music::resume() { _player->setVolume(_vm->_musicVolume); _player->setPlaying(true); } -void Music::stop(void) { +void Music::stop() { _player->stopMusic(); } diff --git a/engines/saga/music.h b/engines/saga/music.h index 79a3e62519..0469db7cf1 100644 --- a/engines/saga/music.h +++ b/engines/saga/music.h @@ -72,7 +72,7 @@ public: void metaEvent(byte type, byte *data, uint16 length); void setTimerCallback(void *timerParam, void (*timerProc)(void *)) { } - uint32 getBaseTempo(void) { return _driver ? _driver->getBaseTempo() : 0; } + uint32 getBaseTempo() { return _driver ? _driver->getBaseTempo() : 0; } //Channel allocation functions MidiChannel *allocateChannel() { return 0; } @@ -106,19 +106,19 @@ class Music { public: Music(SagaEngine *vm, Audio::Mixer *mixer, MidiDriver *driver); - ~Music(void); + ~Music(); void setNativeMT32(bool b) { _player->setNativeMT32(b); } bool hasNativeMT32() { return _player->hasNativeMT32(); } void setAdlib(bool b) { _adlib = b; } bool hasAdlib() { return _adlib; } void setPassThrough(bool b) { _player->setPassThrough(b); } - bool isPlaying(void); + bool isPlaying(); bool hasDigitalMusic() { return _digitalMusic; } void play(uint32 resourceId, MusicFlags flags = MUSIC_DEFAULT); - void pause(void); - void resume(void); - void stop(void); + void pause(); + void resume(); + void stop(); void setVolume(int volume, int time = 1); int getVolume() { return _currentVolume; } @@ -148,7 +148,7 @@ private: byte *_midiMusicData; static void musicVolumeGaugeCallback(void *refCon); - void musicVolumeGauge(void); + void musicVolumeGauge(); }; } // End of namespace Saga diff --git a/engines/saga/objectmap.cpp b/engines/saga/objectmap.cpp index 475eedc048..02179d1d49 100644 --- a/engines/saga/objectmap.cpp +++ b/engines/saga/objectmap.cpp @@ -286,7 +286,7 @@ int ObjectMap::hitTest(const Point& testPoint) { return -1; } -void ObjectMap::cmdInfo(void) { +void ObjectMap::cmdInfo() { _vm->_console->DebugPrintf("%d zone(s) loaded.\n\n", _hitZoneListCount); } diff --git a/engines/saga/objectmap.h b/engines/saga/objectmap.h index cc9e28143a..df0dcffe57 100644 --- a/engines/saga/objectmap.h +++ b/engines/saga/objectmap.h @@ -98,11 +98,11 @@ public: _hitZoneListCount = 0; } - ~ObjectMap(void) { + ~ObjectMap() { freeMem(); } void load(const byte *resourcePointer, size_t resourceLength); - void freeMem(void); + void freeMem(); void draw(const Point& testPoint, int color, int color2); // for debugging int hitTest(const Point& testPoint); HitZone *getHitZone(int16 index) { @@ -112,7 +112,7 @@ public: return _hitZoneList[index]; } - void cmdInfo(void); + void cmdInfo(); private: SagaEngine *_vm; diff --git a/engines/saga/palanim.cpp b/engines/saga/palanim.cpp index 7f0a7fda47..dc892b845a 100644 --- a/engines/saga/palanim.cpp +++ b/engines/saga/palanim.cpp @@ -40,7 +40,7 @@ PalAnim::PalAnim(SagaEngine *vm) : _vm(vm) { _entries = NULL; } -PalAnim::~PalAnim(void) { +PalAnim::~PalAnim() { } int PalAnim::loadPalAnim(const byte *resdata, size_t resdata_len) { diff --git a/engines/saga/palanim.h b/engines/saga/palanim.h index c8ff52eefa..52002e01c3 100644 --- a/engines/saga/palanim.h +++ b/engines/saga/palanim.h @@ -43,7 +43,7 @@ struct PalanimEntry { class PalAnim { public: PalAnim(SagaEngine *vm); - ~PalAnim(void); + ~PalAnim(); int loadPalAnim(const byte *, size_t); int cycleStart(); diff --git a/engines/saga/puzzle.cpp b/engines/saga/puzzle.cpp index 74d7608d2b..efce5fcb58 100644 --- a/engines/saga/puzzle.cpp +++ b/engines/saga/puzzle.cpp @@ -141,7 +141,7 @@ void Puzzle::initPieceInfo(int i, int16 curX, int16 curY, byte offX, byte offY, } -void Puzzle::execute(void) { +void Puzzle::execute() { _active = true; _vm->getTimerManager()->installTimerProc(&hintTimerCallback, kPuzzleHintTime, this); @@ -155,7 +155,7 @@ void Puzzle::execute(void) { //exitPuzzle(); } -void Puzzle::exitPuzzle(void) { +void Puzzle::exitPuzzle() { _active = false; _vm->getTimerManager()->removeTimerProc(&hintTimerCallback); @@ -164,7 +164,7 @@ void Puzzle::exitPuzzle(void) { _vm->_interface->setMode(kPanelMain); } -void Puzzle::initPieces(void) { +void Puzzle::initPieces() { SpriteInfo *spI; ActorData *puzzle = _vm->_actor->getActor(_vm->_actor->actorIndexToId(ITE_ACTOR_PUZZLE)); int frameNumber; @@ -185,7 +185,7 @@ void Puzzle::initPieces(void) { _newPuzzle = false; } -void Puzzle::showPieces(void) { +void Puzzle::showPieces() { ActorData *puzzle = _vm->_actor->getActor(_vm->_actor->actorIndexToId(ITE_ACTOR_PUZZLE)); int frameNumber; SpriteList *spriteList; @@ -282,7 +282,7 @@ void Puzzle::handleClick(Point mousePt) { _vm->_interface->setStatusText(pieceNames[_lang][_puzzlePiece]); } -void Puzzle::alterPiecePriority(void) { +void Puzzle::alterPiecePriority() { for (int i = 1; i < PUZZLE_PIECES; i++) { if (_puzzlePiece == _piecePriority[i]) { for (int j = i - 1; j >= 0; j--) @@ -401,7 +401,7 @@ void Puzzle::hintTimerCallback(void *refCon) { ((Puzzle *)refCon)->solicitHint(); } -void Puzzle::solicitHint(void) { +void Puzzle::solicitHint() { int i; _vm->_actor->setSpeechColor(1, kITEColorBlack); @@ -513,7 +513,7 @@ void Puzzle::handleReply(int reply) { } } -void Puzzle::giveHint(void) { +void Puzzle::giveHint() { int i, total = 0; _vm->_interface->converseClear(); @@ -573,7 +573,7 @@ void Puzzle::giveHint(void) { _vm->getTimerManager()->installTimerProc(&hintTimerCallback, kPuzzleHintTime, this); } -void Puzzle::clearHint(void) { +void Puzzle::clearHint() { _vm->_interface->converseClear(); _vm->_interface->converseAddText(optionsStr[_lang][kROLater], 0, 0, 0, 0); _vm->_interface->converseDisplayText(); diff --git a/engines/saga/puzzle.h b/engines/saga/puzzle.h index 9226fb61ae..312f0d71b1 100644 --- a/engines/saga/puzzle.h +++ b/engines/saga/puzzle.h @@ -72,11 +72,11 @@ private: public: Puzzle(SagaEngine *vm); - void execute(void); - void exitPuzzle(void); + void execute(); + void exitPuzzle(); - bool isSolved(void) { return _solved; } - bool isActive(void) { return _active; } + bool isSolved() { return _solved; } + bool isActive() { return _active; } void handleReply(int reply); void handleClick(Point mousePt); @@ -90,17 +90,17 @@ private: static void hintTimerCallback(void *refCon); - void solicitHint(void); + void solicitHint(); - void initPieces(void); - void showPieces(void); + void initPieces(); + void showPieces(); void slidePiece(int x1, int y1, int x2, int y2); void dropPiece(Point mousePt); - void alterPiecePriority(void); - void drawCurrentPiece(void); + void alterPiecePriority(); + void drawCurrentPiece(); - void giveHint(void); - void clearHint(void); + void giveHint(); + void clearHint(); private: struct PieceInfo { diff --git a/engines/saga/render.cpp b/engines/saga/render.cpp index 105a854314..ec168d296e 100644 --- a/engines/saga/render.cpp +++ b/engines/saga/render.cpp @@ -63,7 +63,7 @@ Render::Render(SagaEngine *vm, OSystem *system) { _initialized = true; } -Render::~Render(void) { +Render::~Render() { #ifdef SAGA_DEBUG _vm->getTimerManager()->removeTimerProc(&fpsTimerCallback); #endif @@ -272,7 +272,7 @@ void Render::fpsTimerCallback(void *refCon) { ((Render *)refCon)->fpsTimer(); } -void Render::fpsTimer(void) { +void Render::fpsTimer() { _fps = _renderedFrameCount; _renderedFrameCount = 0; } diff --git a/engines/saga/render.h b/engines/saga/render.h index 8fc2eaa663..f0241e8ecf 100644 --- a/engines/saga/render.h +++ b/engines/saga/render.h @@ -55,9 +55,9 @@ enum RENDER_DEBUG_FLAGS { class Render { public: Render(SagaEngine *vm, OSystem *system); - ~Render(void); + ~Render(); bool initialized(); - void drawScene(void); + void drawScene(); unsigned int getFlags() const { return _flags; @@ -99,7 +99,7 @@ public: private: #ifdef SAGA_DEBUG static void fpsTimerCallback(void *refCon); - void fpsTimer(void); + void fpsTimer(); unsigned int _fps; unsigned int _renderedFrameCount; #endif diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 7265860d86..24a7b9eb7f 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -533,7 +533,7 @@ public: const char *getObjectName(uint16 objectId); public: - int processInput(void); + int processInput(); Point mousePos() const; int getMouseClickCount() { @@ -586,7 +586,7 @@ public: int32 _frameCount; public: - bool initGame(void); + bool initGame(); bool isBigEndian() const; bool isMacResources() const; diff --git a/engines/saga/scene.h b/engines/saga/scene.h index 2eb9a8bb70..985e5e5286 100644 --- a/engines/saga/scene.h +++ b/engines/saga/scene.h @@ -318,7 +318,7 @@ class Scene { void getSlopes(int &beginSlope, int &endSlope); - void clearSceneQueue(void) { + void clearSceneQueue() { _sceneQueue.clear(); } void changeScene(int16 sceneNumber, int actorsEntrance, SceneTransitionType transitionType, int chapter = NO_CHAPTER_CHANGE); diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp index 6fd6adfa10..8ddcc7d0bb 100644 --- a/engines/saga/script.cpp +++ b/engines/saga/script.cpp @@ -258,10 +258,10 @@ void Script::setupScriptOpcodeList() { // Function calling OPCODE(opCall), // 23: Call function OPCODE(opCcall), // 24: Call C function - OPCODE(opCcallV), // 25: Call C function (void) + OPCODE(opCcallV), // 25: Call C function () OPCODE(opEnter), // 26: Enter a function OPCODE(opReturn), // 27: Return from a function - OPCODE(opReturnV), // 28: Return from a function (void) + OPCODE(opReturnV), // 28: Return from a function () // Branching OPCODE(opJmp), // 29 OPCODE(opJmpTrueV), // 30: Test argument and consume it @@ -374,12 +374,12 @@ void Script::setupScriptOpcodeList() { OPCODE(opCallNear), // 29: Call function in the same segment OPCODE(opCallFar), // 30: Call function in other segment OPCODE(opCcall), // 31: Call C function - OPCODE(opCcallV), // 32: Call C function (void) + OPCODE(opCcallV), // 32: Call C function () OPCODE(opCallMember), // 33: Call member function - OPCODE(opCallMemberV), // 34: Call member function (void) + OPCODE(opCallMemberV), // 34: Call member function () OPCODE(opEnter), // 35: Enter a function OPCODE(opReturn), // 36: Return from a function - OPCODE(opReturnV), // 37: Return from a function (void) + OPCODE(opReturnV), // 37: Return from a function () // Branching OPCODE(opJmp), // 38 OPCODE(opJmpTrueV), // 39: Test argument and consume it diff --git a/engines/saga/script.h b/engines/saga/script.h index fa2ea35c5d..664e16bf6e 100644 --- a/engines/saga/script.h +++ b/engines/saga/script.h @@ -414,8 +414,8 @@ public: ScriptThread &createThread(uint16 scriptModuleNumber, uint16 scriptEntryPointNumber); int executeThread(ScriptThread *thread, int entrypointNumber); void executeThreads(uint msec); - void completeThread(void); - void abortAllThreads(void); + void completeThread(); + void abortAllThreads(); void wakeUpActorThread(int waitType, void *threadObj); void wakeUpThreads(int waitType); diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp index 6a5bc03206..7296637c2c 100644 --- a/engines/saga/sprite.cpp +++ b/engines/saga/sprite.cpp @@ -76,7 +76,7 @@ Sprite::Sprite(SagaEngine *vm) : _vm(vm) { } } -Sprite::~Sprite(void) { +Sprite::~Sprite() { debug(8, "Shutting down sprite subsystem..."); _mainSprites.freeMem(); if (_vm->getGameId() == GID_IHNM) { diff --git a/engines/saga/sprite.h b/engines/saga/sprite.h index ebccc2c1f0..b7365fd28f 100644 --- a/engines/saga/sprite.h +++ b/engines/saga/sprite.h @@ -70,7 +70,7 @@ public: SpriteList _inventorySprites; Sprite(SagaEngine *vm); - ~Sprite(void); + ~Sprite(); // draw scaled sprite using background scene mask void drawOccluded(SpriteList &spriteList, int spriteNumber, const Point &screenCoord, int scale, int depth); diff --git a/engines/saga/sthread.cpp b/engines/saga/sthread.cpp index 5edd40ac16..c133f8de88 100644 --- a/engines/saga/sthread.cpp +++ b/engines/saga/sthread.cpp @@ -166,7 +166,7 @@ void Script::executeThreads(uint msec) { } -void Script::abortAllThreads(void) { +void Script::abortAllThreads() { ScriptThreadList::iterator threadIterator; threadIterator = _threadList.begin(); @@ -179,7 +179,7 @@ void Script::abortAllThreads(void) { executeThreads(0); } -void Script::completeThread(void) { +void Script::completeThread() { int limit = (_vm->getGameId() == GID_IHNM) ? 100 : 40; for (int i = 0; i < limit && !_threadList.empty(); i++) diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp index 3e46586914..c4cb899262 100644 --- a/engines/sci/engine/kpathing.cpp +++ b/engines/sci/engine/kpathing.cpp @@ -689,7 +689,7 @@ static void clockwise(const Vertex *vertex_cur, const Vertex *v, const Common::P // Orders the points of an edge clockwise around vertex_cur. If all three // points are collinear the original order is used // Parameters: (const Vertex *) v: The first vertex of the edge - // Returns : (void) + // Returns : () // (const Common::Point *&) p1: The first point in clockwise order // (const Common::Point *&) p2: The second point in clockwise order Vertex *w = CLIST_NEXT(v); diff --git a/engines/sci/engine/said.y b/engines/sci/engine/said.y index 02350e0d60..1a3b2f52c8 100644 --- a/engines/sci/engine/said.y +++ b/engines/sci/engine/said.y @@ -100,7 +100,7 @@ static tree_t said_paren(tree_t, tree_t); static tree_t said_value(int, tree_t); static tree_t said_terminal(int); -static int yylex(void); +static int yylex(); static int yyerror(const char *s) { said_parse_error = strdup(s); @@ -237,7 +237,7 @@ recref : YY_LT wordset recref int parse_yy_token_lookup[] = {YY_COMMA, YY_AMP, YY_SLASH, YY_PARENO, YY_PARENC, YY_BRACKETSO, YY_BRACKETSC, YY_HASH, YY_LT, YY_GT}; -static int yylex(void) { +static int yylex() { int retval = said_tokens[said_token++]; if (retval < SAID_LONG(SAID_FIRST)) { diff --git a/engines/sci/gui/gui_animate.h b/engines/sci/gui/gui_animate.h index f3c19448e0..ca6400d0da 100644 --- a/engines/sci/gui/gui_animate.h +++ b/engines/sci/gui/gui_animate.h @@ -77,7 +77,7 @@ public: void addToPicDrawView(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, int16 leftPos, int16 topPos, int16 priority, int16 control); private: - void init(void); + void init(); EngineState *_s; SciGuiGfx *_gfx; diff --git a/engines/sci/gui/gui_controls.h b/engines/sci/gui/gui_controls.h index 426cd6b96e..95e4a0e34f 100644 --- a/engines/sci/gui/gui_controls.h +++ b/engines/sci/gui/gui_controls.h @@ -42,7 +42,7 @@ public: void TexteditChange(reg_t controlObject, reg_t eventObject); private: - void init(void); + void init(); void TexteditSetBlinkTime(); SegManager *_segMan; diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp index b87079b69f..021c9e7d6c 100644 --- a/engines/sci/gui/gui_gfx.cpp +++ b/engines/sci/gui/gui_gfx.cpp @@ -93,7 +93,7 @@ GuiPort *SciGuiGfx::SetPort(GuiPort *newPort) { return oldPort; } -GuiPort *SciGuiGfx::GetPort(void) { +GuiPort *SciGuiGfx::GetPort() { return _curPort; } @@ -146,7 +146,7 @@ void SciGuiGfx::TextFace(int16 textFace) { _curPort->textFace = textFace; } -int16 SciGuiGfx::GetPointSize(void) { +int16 SciGuiGfx::GetPointSize() { return _curPort->fontHeight; } diff --git a/engines/sci/gui/gui_gfx.h b/engines/sci/gui/gui_gfx.h index 28242d41b7..a5d1d35cee 100644 --- a/engines/sci/gui/gui_gfx.h +++ b/engines/sci/gui/gui_gfx.h @@ -69,7 +69,7 @@ public: void BackColor(int16 color); void PenMode(int16 mode); void TextFace(int16 textFace); - int16 GetPointSize(void); + int16 GetPointSize(); void ClearScreen(byte color = 255); void InvertRect(const Common::Rect &rect); diff --git a/engines/sci/gui/gui_portrait.h b/engines/sci/gui/gui_portrait.h index 3305c53f93..b97f3dd2a6 100644 --- a/engines/sci/gui/gui_portrait.h +++ b/engines/sci/gui/gui_portrait.h @@ -34,7 +34,7 @@ public: ~SciGuiPortrait(); private: - void init(void); + void init(); ResourceManager *_resMan; SciGuiScreen *_screen; diff --git a/engines/sci/gui/gui_text.h b/engines/sci/gui/gui_text.h index 75bd90e326..8002cdcf0c 100644 --- a/engines/sci/gui/gui_text.h +++ b/engines/sci/gui/gui_text.h @@ -66,7 +66,7 @@ public: SciGuiFont *_font; private: - void init(void); + void init(); ResourceManager *_resMan; SciGuiGfx *_gfx; diff --git a/engines/sci/gui/gui_transitions.h b/engines/sci/gui/gui_transitions.h index 279a086d86..b20e22fa5b 100644 --- a/engines/sci/gui/gui_transitions.h +++ b/engines/sci/gui/gui_transitions.h @@ -69,7 +69,7 @@ public: void doit(Common::Rect picRect); private: - void init(void); + void init(); const GuiTransitionTranslateEntry *translateNumber(int16 number, const GuiTransitionTranslateEntry *tablePtr); void doTransition(int16 number, bool blackout); void setNewPalette(bool blackoutFlag); diff --git a/engines/sci/resource.h b/engines/sci/resource.h index 6f00425402..4478bebf31 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -246,7 +246,7 @@ public: /* Unlocks a previously locked resource ** (Resource *) res: The resource to free - ** Returns : (void) + ** Returns : () */ void unlockResource(Resource *res); diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp index 01177837b2..acc89f6df8 100644 --- a/engines/sci/sfx/core.cpp +++ b/engines/sci/sfx/core.cpp @@ -136,7 +136,7 @@ public: void setVolume(int vol); - int getVolume(void); + int getVolume(); }; SfxPlayer::SfxPlayer() { @@ -324,7 +324,7 @@ void SfxPlayer::setVolume(int vol) { _mididrv->setVolume(vol); } -int SfxPlayer::getVolume(void) { +int SfxPlayer::getVolume() { return _mididrv->getVolume(); } diff --git a/engines/sci/sfx/seq/gm.cpp b/engines/sci/sfx/seq/gm.cpp index 2fe5675150..f1937e063a 100644 --- a/engines/sci/sfx/seq/gm.cpp +++ b/engines/sci/sfx/seq/gm.cpp @@ -52,7 +52,7 @@ static Common::Error midi_gm_open(int patch_len, byte *data, int patch2_len, byt return Common::kNoError; } -static Common::Error midi_gm_close(void) { +static Common::Error midi_gm_close() { return Common::kNoError; } @@ -101,7 +101,7 @@ static Common::Error midi_gm_volume(uint8 volume) { return Common::kNoError; } -static Common::Error midi_gm_allstop(void) { +static Common::Error midi_gm_allstop() { byte data[3] = { 0xb0, 0x78, /* all sound off */ 0 diff --git a/engines/scumm/he/logic_he.h b/engines/scumm/he/logic_he.h index f5ecdd429a..7dd141c5b1 100644 --- a/engines/scumm/he/logic_he.h +++ b/engines/scumm/he/logic_he.h @@ -41,7 +41,7 @@ public: int getFromArray(int arg0, int idx2, int idx1); void putInArray(int arg0, int idx2, int idx1, int val); - void beforeBootScript(void) {} + void beforeBootScript() {} void initOnce() {} void startOfFrame() {} void endOfFrame() {} diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp index 93f565941d..3876bd4e80 100644 --- a/engines/scumm/insane/insane.cpp +++ b/engines/scumm/insane/insane.cpp @@ -74,7 +74,7 @@ Insane::Insane(ScummEngine_v7 *scumm) { _smush_icons2Nut = new NutRenderer(_vm, "icons2.nut"); } -Insane::~Insane(void) { +Insane::~Insane() { free(_smush_roadrashRip); free(_smush_roadrsh2Rip); free(_smush_roadrsh3Rip); @@ -95,7 +95,7 @@ void Insane::setSmushParams(int speed) { _speed = speed; } -void Insane::initvars(void) { +void Insane::initvars() { int i, j; _speed = 12; @@ -517,7 +517,7 @@ void Insane::setEnemyAnimation(int32 actornum, int anim) { actorAnimationData[_actor[actornum].weaponClass * 7 + anim - 6] + d, 180); } -int32 Insane::processMouse(void) { +int32 Insane::processMouse() { int32 buttons = 0; _enemyState[EN_BEN][0] = _vm->_mouse.x; @@ -529,7 +529,7 @@ int32 Insane::processMouse(void) { return buttons; } -int32 Insane::processKeyboard(void) { +int32 Insane::processKeyboard() { int32 retval = 0; int dx = 0, dy = 0; int tmpx, tmpy; @@ -623,7 +623,7 @@ void Insane::smush_warpMouse(int x, int y, int buttons) { _player->warpMouse(x, y, buttons); } -void Insane::putActors(void) { +void Insane::putActors() { smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1, _smlayer_room); smlayer_putActor(0, 0, _actor[0].x, _actor[0].y1, _smlayer_room); smlayer_putActor(0, 1, _actor[0].x, _actor[0].y1, _smlayer_room); @@ -632,7 +632,7 @@ void Insane::putActors(void) { smlayer_putActor(1, 1, _actor[0].x, _actor[0].y1, _smlayer_room); } -void Insane::readState(void) { // PATCH +void Insane::readState() { // PATCH if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC)) { _actor[0].inventory[INV_CHAIN] = 0; @@ -708,7 +708,7 @@ void Insane::readState(void) { // PATCH } } -void Insane::setupValues(void) { +void Insane::setupValues() { _actor[0].x = 160; _actor[0].y = 200; _actor[0].tilt = 0; @@ -727,15 +727,15 @@ void Insane::setupValues(void) { smush_warpMouse(160, 100, -1); } -bool Insane::idx1Compare(void) { +bool Insane::idx1Compare() { return _objArray1Idx == _objArray1Idx2; } -bool Insane::idx2Compare(void) { +bool Insane::idx2Compare() { return _objArray2Idx == _objArray2Idx2; } -int32 Insane::idx1Tweak(void) { +int32 Insane::idx1Tweak() { _objArray1Idx++; if (_objArray1Idx >= 100) _objArray1Idx = 0; @@ -743,7 +743,7 @@ int32 Insane::idx1Tweak(void) { return _objArray1[_objArray1Idx]; } -int32 Insane::idx2Tweak(void) { +int32 Insane::idx2Tweak() { if (!_idx2Exceeded) if (_objArray2Idx >= _objArray2Idx2) return false; @@ -756,7 +756,7 @@ int32 Insane::idx2Tweak(void) { return _objArray2[_objArray2Idx]; } -void Insane::smush_setToFinish(void) { +void Insane::smush_setToFinish() { debugC(DEBUG_INSANE, "Video is set to finish"); _vm->_smushVideoShouldFinish = true; } @@ -766,7 +766,7 @@ void Insane::smlayer_stopSound(int idx) { _vm->_imuseDigital->stopSound(readArray(idx)); } -void Insane::switchSceneIfNeeded(void) { +void Insane::switchSceneIfNeeded() { if (_needSceneSwitch && !_smush_isSanFileSetup) { putActors(); stopSceneSounds(_currSceneId); @@ -899,7 +899,7 @@ int32 Insane::weaponDamage(int32 actornum) { return map[_actor[actornum].weapon]; } -void Insane::reinitActors(void) { +void Insane::reinitActors() { if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC)) { smlayer_setActorCostume(0, 2, readArray(11)); smlayer_setActorCostume(0, 0, readArray(13)); @@ -952,7 +952,7 @@ bool Insane::actor1StateFlags(int state) { return retvalue; } -void Insane::escapeKeyHandler(void) { +void Insane::escapeKeyHandler() { struct fluConf *flu; // The Macintosh demo has just one scene @@ -1363,7 +1363,7 @@ const char *Insane::handleTrsTag(int32 trsId) { return _player->getString(trsId); } -bool Insane::smush_eitherNotStartNewFrame(void) { +bool Insane::smush_eitherNotStartNewFrame() { if (_smush_setupsan17) return false; diff --git a/engines/scumm/insane/insane.h b/engines/scumm/insane/insane.h index c2c964b311..499eb70a90 100644 --- a/engines/scumm/insane/insane.h +++ b/engines/scumm/insane/insane.h @@ -60,14 +60,14 @@ class Insane { void setSmushParams(int speed); void runScene(int arraynum); - void procPreRendering(void); + void procPreRendering(); void procPostRendering(byte *renderBitmap, int32 codecparam, int32 setupsan12, int32 setupsan13, int32 curFrame, int32 maxFrame); void procIACT(byte *renderBitmap, int32 codecparam, int32 setupsan12, int32 setupsan13, Common::SeekableReadStream &b, int32 size, int32 flags, int16 par1, int16 par2, int16 par3, int16 par4); void procSKIP(int32 subSize, Common::SeekableReadStream &b); - void escapeKeyHandler(void); + void escapeKeyHandler(); private: @@ -262,20 +262,20 @@ class Insane { struct actor _actor[2]; - void initvars(void); + void initvars(); void readFileToMem(const char *name, byte **buf); void startVideo(const char *filename, int num, int argC, int frameRate, int doMainLoop, byte *fluPtr = 0, int32 startFrame = 0); void smush_warpMouse(int x, int y, int buttons); - void putActors(void); - void readState(void); + void putActors(); + void readState(); int initScene(int sceneId); void stopSceneSounds(int sceneId); - void shutCurrentScene(void); + void shutCurrentScene(); int loadSceneData(int scene, int flag, int phase); void setSceneCostumes(int sceneId); - void setupValues(void); - void setEnemyCostumes (void); + void setupValues(); + void setEnemyCostumes (); void smlayer_stopSound (int idx); int smlayer_loadSound(int id, int flag, int phase); int smlayer_loadCostume(int id, int phase); @@ -287,11 +287,11 @@ class Insane { int32 readArray(int item); void writeArray(int item, int value); - bool idx1Compare(void); - bool idx2Compare(void); - int32 idx1Tweak(void); - int32 idx2Tweak(void); - void smush_setToFinish(void); + bool idx1Compare(); + bool idx2Compare(); + int32 idx1Tweak(); + int32 idx2Tweak(); + void smush_setToFinish(); void postCase11(byte *renderBitmap, int32 codecparam, int32 setupsan12, int32 setupsan13, int32 curFrame, int32 maxFrame); void postCase0(byte *renderBitmap, int32 codecparam, int32 setupsan12, @@ -328,7 +328,7 @@ class Insane { int32 setupsan13, int32 curFrame, int32 maxFrame); void postCaseMore(byte *renderBitmap, int32 codecparam, int32 setupsan12, int32 setupsan13, int32 curFrame, int32 maxFrame); - void switchSceneIfNeeded(void); + void switchSceneIfNeeded(); int smush_changeState(int state); void init_actStruct(int actornum, int actnum, int32 actorval, byte state, int32 room, int32 animtilt, int32 tilt, int32 frame); @@ -383,20 +383,20 @@ class Insane { void actor01Reaction(int32 buttons); void actor03Reaction(int32 buttons); void turnEnemy(bool battle); - int32 actionBen(void); + int32 actionBen(); void chooseBenWeaponAnim(int buttons); void setBenAnimation(int32 actornum, int anim); int calcTilt(int speed); - bool smush_eitherNotStartNewFrame(void); + bool smush_eitherNotStartNewFrame(); void smlayer_setActorFacing(int actornum, int actnum, int frame, int direction); int32 weaponMaxRange(int32 actornum); int32 weaponMinRange(int32 actornum); - void switchBenWeapon(void); + void switchBenWeapon(); void prepareScenePropScene(int32 scenePropNum, bool arg_4, bool arg_8); int32 calcBenDamage(bool arg_0, bool arg_4); int32 weaponDamage(int32 actornum); void proc47(int32 actornum, int32 val); - bool weaponBenIsEffective(void); + bool weaponBenIsEffective(); bool actor1StateFlags(int state); bool actor0StateFlags1(int state); bool actor0StateFlags2(int state); @@ -404,11 +404,11 @@ class Insane { void init_scenePropStruct(int32 n, int32 n1, int32 actornum, int32 sound, int32 trsId, byte r, byte g, byte b, int32 counter, int32 maxCounter, int32 index); - int32 setBenState(void); + int32 setBenState(); bool smlayer_actorNeedRedraw(int actornum, int actnum); - void reinitActors(void); + void reinitActors(); const char *handleTrsTag(int32 trsId); - void ouchSoundBen(void); + void ouchSoundBen(); int32 smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 step1, int32 step2, int32 setupsan1, byte *fluPtr, int32 numFrames); void smush_setupSanFromStart(const char *filename, int32 setupsan2, int32 step1, @@ -420,16 +420,16 @@ class Insane { void actor12Reaction(int32 buttons); void actor13Reaction(int32 buttons); void actor10Reaction(int32 buttons); - int32 actionEnemy(void); - int32 processKeyboard(void); - int32 processMouse(void); + int32 actionEnemy(); + int32 processKeyboard(); + int32 processMouse(); void setEnemyAnimation(int32 actornum, int anim); void chooseEnemyWeaponAnim(int32 buttons); - void switchEnemyWeapon(void); - void setEnemyState(void); + void switchEnemyWeapon(); + void setEnemyState(); int32 calcEnemyDamage(bool arg_0, bool arg_4); - void ouchSoundEnemy(void); - bool weaponEnemyIsEffective(void); + void ouchSoundEnemy(); + bool weaponEnemyIsEffective(); void iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12, int32 setupsan13, Common::SeekableReadStream &b, int32 size, int32 flags, int16 par1, int16 par2, int16 par3, int16 par4); @@ -451,8 +451,8 @@ class Insane { bool isBitSet(int n); void setBit(int n); void clearBit(int n); - void chooseEnemy(void); - void removeEmptyEnemies(void); + void chooseEnemy(); + void removeEmptyEnemies(); void removeEnemyFromMetList(int32); }; } // End of namespace Insane diff --git a/engines/scumm/insane/insane_ben.cpp b/engines/scumm/insane/insane_ben.cpp index 0c7a3e250e..9ddb4c6670 100644 --- a/engines/scumm/insane/insane_ben.cpp +++ b/engines/scumm/insane/insane_ben.cpp @@ -123,7 +123,7 @@ void Insane::turnBen(bool controllable) { } } -int32 Insane::actionBen(void) { +int32 Insane::actionBen() { int32 buttons, tmp; bool doDamage = false; int sound; @@ -472,7 +472,7 @@ void Insane::drawSpeedyActor(int32 buttons) { _smlayer_room2); } -bool Insane::weaponBenIsEffective(void) { +bool Insane::weaponBenIsEffective() { if ((_actor[1].x - _actor[0].x > weaponMaxRange(0)) || (_actor[1].x - _actor[0].x < weaponMinRange(0)) || !_actor[1].kicking) @@ -1894,7 +1894,7 @@ void Insane::chooseBenWeaponAnim(int buttons) { } } -void Insane::switchBenWeapon(void) { +void Insane::switchBenWeapon() { do { _actor[0].weapon++; if (_actor[0].weapon > 7) @@ -1967,7 +1967,7 @@ void Insane::switchBenWeapon(void) { } } -int32 Insane::setBenState(void) { +int32 Insane::setBenState() { _actor[0].act[2].animTilt = -1000; switch (_actor[0].weapon) { @@ -2003,7 +2003,7 @@ int32 Insane::setBenState(void) { return _actor[0].act[2].state; } -void Insane::ouchSoundBen(void) { +void Insane::ouchSoundBen() { _actor[0].act[3].state = 52; if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC)) { diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp index 5087adcf51..2291b2c37b 100644 --- a/engines/scumm/insane/insane_enemy.cpp +++ b/engines/scumm/insane/insane_enemy.cpp @@ -1246,7 +1246,7 @@ int32 Insane::enemy8initializer(int32 actor1, int32 actor2, int32 probability) { } -void Insane::ouchSoundEnemy(void) { +void Insane::ouchSoundEnemy() { int32 tmp; _actor[1].act[3].state = 52; @@ -1538,7 +1538,7 @@ void Insane::chooseEnemyWeaponAnim(int32 buttons) { } } -void Insane::switchEnemyWeapon(void) { +void Insane::switchEnemyWeapon() { do { _actor[1].weapon++; if (_actor[1].weapon > 7) @@ -1573,7 +1573,7 @@ void Insane::switchEnemyWeapon(void) { } } -void Insane::setEnemyState(void) { +void Insane::setEnemyState() { if (_actor[1].lost) return; @@ -2589,7 +2589,7 @@ int32 Insane::calcEnemyDamage(bool arg_0, bool arg_4) { return 1; } -bool Insane::weaponEnemyIsEffective(void) { +bool Insane::weaponEnemyIsEffective() { if ((_actor[1].x - _actor[0].x > weaponMaxRange(1)) || (_actor[1].x - _actor[0].x < weaponMinRange(1)) || !_actor[0].kicking) @@ -2739,7 +2739,7 @@ void Insane::actor10Reaction(int32 buttons) { smlayer_putActor(1, 0, tmpx, tmpy, _smlayer_room); } -int32 Insane::actionEnemy(void) { +int32 Insane::actionEnemy() { int32 buttons; if (_actor[1].enemyHandler != -1) diff --git a/engines/scumm/insane/insane_iact.cpp b/engines/scumm/insane/insane_iact.cpp index f620994195..942256b1a4 100644 --- a/engines/scumm/insane/insane_iact.cpp +++ b/engines/scumm/insane/insane_iact.cpp @@ -173,7 +173,7 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12, } } -void Insane::chooseEnemy(void) { +void Insane::chooseEnemy() { if ((_vm->_game.features & GF_DEMO) && (_vm->_game.platform == Common::kPlatformPC)) { _currEnemy = EN_ROTT1; return; @@ -265,7 +265,7 @@ void Insane::chooseEnemy(void) { _currEnemy = en2; } -void Insane::removeEmptyEnemies(void) { +void Insane::removeEmptyEnemies() { if (_metEnemiesListTail > 0) { for (int i = 0; i < _metEnemiesListTail; i++) if (_enemy[i].isEmpty == 1) diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp index 0b28d46b19..36a3f5a8b7 100644 --- a/engines/scumm/insane/insane_scenes.cpp +++ b/engines/scumm/insane/insane_scenes.cpp @@ -294,7 +294,7 @@ void Insane::stopSceneSounds(int sceneId) { return; } -void Insane::shutCurrentScene(void) { +void Insane::shutCurrentScene() { debugC(DEBUG_INSANE, "shutCurrentScene()"); _currScenePropIdx = 0; @@ -670,7 +670,7 @@ void Insane::setSceneCostumes(int sceneId) { } } -void Insane::setEnemyCostumes(void) { +void Insane::setEnemyCostumes() { int i; debugC(DEBUG_INSANE, "setEnemyCostumes(%d)", _currEnemy); @@ -807,7 +807,7 @@ void Insane::setEnemyCostumes(void) { smush_warpMouse(160, 100, -1); } -void Insane::procPreRendering(void) { +void Insane::procPreRendering() { _smush_isSanFileSetup = 0; // FIXME: This shouldn't be here switchSceneIfNeeded(); diff --git a/engines/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp index 2a3cb438be..539dbc61a9 100644 --- a/engines/scumm/player_nes.cpp +++ b/engines/scumm/player_nes.cpp @@ -112,14 +112,14 @@ protected: bool Enabled, ValidFreq, Active; bool EnvClk, SwpClk; - void CheckActive(void); + void CheckActive(); public: - void Reset(void); + void Reset(); void Write(int Reg, byte Val); - void Run(void); - void QuarterFrame(void); - void HalfFrame(void); + void Run(); + void QuarterFrame(); + void HalfFrame(); }; static const int8 Duties[4][8] = { @@ -129,14 +129,14 @@ static const int8 Duties[4][8] = { {+4,-4,-4,+4,+4,+4,+4,+4} }; -void Square::Reset(void) { +void Square::Reset() { memset(this, 0, sizeof(*this)); Cycles = 1; EnvCtr = 1; BendCtr = 1; } -void Square::CheckActive(void) { +void Square::CheckActive() { ValidFreq = (freq >= 0x8) && ((swpdir) || !((freq + (freq >> swpstep)) & 0x800)); Active = Timer && ValidFreq; Pos = Active ? (Duties[duty][CurD] * Vol) : 0; @@ -185,7 +185,7 @@ void Square::Write(int Reg, byte Val) { CheckActive(); } -void Square::Run(void) { +void Square::Run() { Cycles = (freq + 1) << 1; CurD = (CurD + 1) & 0x7; @@ -193,7 +193,7 @@ void Square::Run(void) { Pos = Duties[duty][CurD] * Vol; } -void Square::QuarterFrame(void) { +void Square::QuarterFrame() { if (EnvClk) { EnvClk = false; Envelope = 0xF; @@ -211,7 +211,7 @@ void Square::QuarterFrame(void) { CheckActive(); } -void Square::HalfFrame(void) { +void Square::HalfFrame() { if (!--BendCtr) { BendCtr = swpspeed + 1; @@ -241,14 +241,14 @@ protected: bool Enabled, Active; bool LinClk; - void CheckActive(void); + void CheckActive(); public: - void Reset(void); + void Reset(); void Write(int Reg, byte Val); - void Run(void); - void QuarterFrame(void); - void HalfFrame(void); + void Run(); + void QuarterFrame(); + void HalfFrame(); }; static const int8 TriDuty[32] = { @@ -258,12 +258,12 @@ static const int8 TriDuty[32] = { -1,-2,-3,-4,-5,-6,-7,-8 }; -void Triangle::Reset(void) { +void Triangle::Reset() { memset(this, 0, sizeof(*this)); Cycles = 1; } -void Triangle::CheckActive(void) { +void Triangle::CheckActive() { Active = Timer && LinCtr; if (freq < 4) @@ -303,7 +303,7 @@ void Triangle::Write(int Reg, byte Val) { CheckActive(); } -void Triangle::Run(void) { +void Triangle::Run() { Cycles = freq + 1; if (Active) { @@ -317,7 +317,7 @@ void Triangle::Run(void) { } } -void Triangle::QuarterFrame(void) { +void Triangle::QuarterFrame() { if (LinClk) LinCtr = linear; else if (LinCtr) @@ -329,7 +329,7 @@ void Triangle::QuarterFrame(void) { CheckActive(); } -void Triangle::HalfFrame(void) { +void Triangle::HalfFrame() { if (Timer && !wavehold) Timer--; @@ -344,14 +344,14 @@ protected: bool Enabled; bool EnvClk; - void CheckActive(void); + void CheckActive(); public: - void Reset(void); + void Reset(); void Write(int Reg, byte Val); - void Run(void); - void QuarterFrame(void); - void HalfFrame(void); + void Run(); + void QuarterFrame(); + void HalfFrame(); }; static const uint32 NoiseFreq[16] = { @@ -359,7 +359,7 @@ static const uint32 NoiseFreq[16] = { 0x0CA,0x0FE,0x17C,0x1FC,0x2FA,0x3F8,0x7F2,0xFE4 }; -void Noise::Reset(void) { +void Noise::Reset() { memset(this, 0, sizeof(*this)); CurD = 1; Cycles = 1; @@ -399,7 +399,7 @@ void Noise::Write(int Reg, byte Val) { } } -void Noise::Run(void) { +void Noise::Run() { Cycles = NoiseFreq[freq]; /* no + 1 here */ if (datatype) @@ -411,7 +411,7 @@ void Noise::Run(void) { Pos = ((CurD & 0x4000) ? -2 : 2) * Vol; } -void Noise::QuarterFrame(void) { +void Noise::QuarterFrame() { if (EnvClk) { EnvClk = false; Envelope = 0xF; @@ -431,7 +431,7 @@ void Noise::QuarterFrame(void) { Pos = ((CurD & 0x4000) ? -2 : 2) * Vol; } -void Noise::HalfFrame(void) { +void Noise::HalfFrame() { if (Timer && !wavehold) Timer--; } @@ -457,9 +457,9 @@ public: } void WriteReg(int Addr, byte Val); - byte Read4015(void); - void Reset (void); - int16 GetSample(void); + byte Read4015(); + void Reset (); + int16 GetSample(); }; void APU::WriteReg(int Addr, byte Val) { @@ -488,7 +488,7 @@ void APU::WriteReg(int Addr, byte Val) { } } -byte APU::Read4015(void) { +byte APU::Read4015() { byte result = (( _square0.GetTimer()) ? 0x01 : 0) | (( _square1.GetTimer()) ? 0x02 : 0) | @@ -497,7 +497,7 @@ byte APU::Read4015(void) { return result; } -void APU::Reset (void) { +void APU::Reset () { BufPos = 0; _square0.Reset(); @@ -556,7 +556,7 @@ int step(T &obj, int sampcycles, uint frame_Cycles, int frame_Num) { return samppos; } -int16 APU::GetSample(void) { +int16 APU::GetSample() { int samppos = 0; const int sampcycles = 1+(1789773-BufPos-1)/SampleRate; diff --git a/engines/scumm/player_v2a.cpp b/engines/scumm/player_v2a.cpp index 7217dd2eb3..1453f01711 100644 --- a/engines/scumm/player_v2a.cpp +++ b/engines/scumm/player_v2a.cpp @@ -34,7 +34,7 @@ namespace Scumm { static uint32 CRCtable[256]; -static void InitCRC (void) { +static void InitCRC () { const uint32 poly = 0xEDB88320; int i, j; uint32 n; diff --git a/engines/sky/autoroute.cpp b/engines/sky/autoroute.cpp index bd0d18d442..dae4b94291 100644 --- a/engines/sky/autoroute.cpp +++ b/engines/sky/autoroute.cpp @@ -50,7 +50,7 @@ AutoRoute::AutoRoute(Grid *pGrid, SkyCompact *compact) { _routeBuf = (uint16 *)malloc(ROUTE_SPACE); } -AutoRoute::~AutoRoute(void) { +AutoRoute::~AutoRoute() { free(_routeGrid); free(_routeBuf); } diff --git a/engines/sky/autoroute.h b/engines/sky/autoroute.h index 37818f378a..c40cf647d5 100644 --- a/engines/sky/autoroute.h +++ b/engines/sky/autoroute.h @@ -38,7 +38,7 @@ class SkyCompact; class AutoRoute { public: AutoRoute(Grid *pGrid, SkyCompact *compact); - ~AutoRoute(void); + ~AutoRoute(); uint16 autoRoute(Compact *cpt); private: uint16 checkBlock(uint16 *blockPos); diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp index 1d3233eb41..78884e96dc 100644 --- a/engines/sky/compact.cpp +++ b/engines/sky/compact.cpp @@ -125,7 +125,7 @@ static const uint32 turnTableOffsets[] = { #define MEGASET_SIZE (sizeof(megaSetOffsets)/sizeof(uint32)) #define TURNTABLE_SIZE (sizeof(turnTableOffsets)/sizeof(uint32)) -SkyCompact::SkyCompact(void) { +SkyCompact::SkyCompact() { _cptFile = new Common::File(); if (!_cptFile->open("sky.cpt")) { GUI::MessageDialog dialog("Unable to find \"sky.cpt\" file!\n" @@ -239,7 +239,7 @@ SkyCompact::SkyCompact(void) { _resetDataPos = _cptFile->pos(); } -SkyCompact::~SkyCompact(void) { +SkyCompact::~SkyCompact() { free(_rawBuf); free(_asciiBuf); free(_saveIds); @@ -461,7 +461,7 @@ uint16 SkyCompact::findCptId(const char *cptName) { return 0; } -uint16 SkyCompact::giveNumDataLists(void) { +uint16 SkyCompact::giveNumDataLists() { return _numDataLists; } diff --git a/engines/sky/compact.h b/engines/sky/compact.h index 1b595e9dcc..cd80d5cfbe 100644 --- a/engines/sky/compact.h +++ b/engines/sky/compact.h @@ -61,8 +61,8 @@ namespace Sky { class SkyCompact { public: - SkyCompact(void); - ~SkyCompact(void); + SkyCompact(); + ~SkyCompact(); Compact *fetchCpt(uint16 cptId); Compact *fetchCptInfo(uint16 cptId, uint16 *elems = NULL, uint16 *type = NULL, char *name = NULL); static uint16 *getSub(Compact *cpt, uint16 mode); @@ -77,7 +77,7 @@ public: // - debugging functions uint16 findCptId(void *cpt); uint16 findCptId(const char *cptName); - uint16 giveNumDataLists(void); + uint16 giveNumDataLists(); uint16 giveDataListLen(uint16 listNum); const char *nameForType(uint16 type); private: diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index 4b5887da69..2e17d2595f 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -101,11 +101,11 @@ TextResource::TextResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, u _oldX = GAME_SCREEN_WIDTH; } -TextResource::~TextResource(void) { +TextResource::~TextResource() { free(_oldScreen); } -void TextResource::flushForRedraw(void) { +void TextResource::flushForRedraw() { if (_oldX < GAME_SCREEN_WIDTH) { uint16 cpWidth = (PAN_LINE_WIDTH > (GAME_SCREEN_WIDTH - _oldX))?(GAME_SCREEN_WIDTH - _oldX):(PAN_LINE_WIDTH); for (uint8 cnty = 0; cnty < PAN_CHAR_HEIGHT; cnty++) @@ -164,7 +164,7 @@ ControlStatus::ControlStatus(Text *skyText, OSystem *system, uint8 *scrBuf) { _statusText = new TextResource(NULL, 2, 1, 64, 163, 0, DO_NOTHING, _system, _screenBuf); } -ControlStatus::~ControlStatus(void) { +ControlStatus::~ControlStatus() { if (_textData) free(_textData); delete _statusText; @@ -192,7 +192,7 @@ void ControlStatus::setToText(uint16 textNum) { _statusText->drawToScreen(WITH_MASK); } -void ControlStatus::drawToScreen(void) { +void ControlStatus::drawToScreen() { _statusText->flushForRedraw(); _statusText->drawToScreen(WITH_MASK); } @@ -223,7 +223,7 @@ ConResource *Control::createResource(void *pSpData, uint32 pNSprites, uint32 pCu return new ConResource(pSpData, pNSprites, pCurSprite, pX, pY, pText, pOnClick, _system, _screenBuf); } -void Control::removePanel(void) { +void Control::removePanel() { free(_screenBuf); free(_sprites.controlPanel); free(_sprites.button); free(_sprites.buttonDown); free(_sprites.savePanel); @@ -249,7 +249,7 @@ void Control::removePanel(void) { } } -void Control::initPanel(void) { +void Control::initPanel() { _screenBuf = (uint8 *)malloc(GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT); memset(_screenBuf, 0, GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT); @@ -399,7 +399,7 @@ void Control::animClick(ConResource *pButton) { } } -void Control::drawMainPanel(void) { +void Control::drawMainPanel() { memset(_screenBuf, 0, GAME_SCREEN_WIDTH * FULL_SCREEN_HEIGHT); _system->copyRectToScreen(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, FULL_SCREEN_HEIGHT); _controlPanel->drawToScreen(NO_MASK); @@ -419,7 +419,7 @@ void Control::drawMainPanel(void) { _statusBar->drawToScreen(); } -void Control::doLoadSavePanel(void) { +void Control::doLoadSavePanel() { if (SkyEngine::isDemo()) return; // I don't think this can even happen initPanel(); @@ -448,7 +448,7 @@ void Control::doLoadSavePanel(void) { _skyText->fnSetFont(_savedCharSet); } -void Control::doControlPanel(void) { +void Control::doControlPanel() { if (SkyEngine::isDemo()) { return; } @@ -653,7 +653,7 @@ bool Control::getYesNo(char *text) { return retVal; } -uint16 Control::doMusicSlide(void) { +uint16 Control::doMusicSlide() { Common::Point mouse = _system->getEventManager()->getMousePos(); int ofsY = _slide2->_y - mouse.y; uint8 volume; @@ -680,7 +680,7 @@ uint16 Control::doMusicSlide(void) { return 0; } -uint16 Control::doSpeedSlide(void) { +uint16 Control::doSpeedSlide() { Common::Point mouse = _system->getEventManager()->getMousePos(); int ofsY = _slide->_y - mouse.y; uint16 speedDelay = _slide->_y - (MPNL_Y + 93); @@ -726,7 +726,7 @@ void Control::toggleFx(ConResource *pButton) { _system->updateScreen(); } -uint16 Control::toggleText(void) { +uint16 Control::toggleText() { uint32 flags = SkyEngine::_systemVars.systemFlags & TEXT_FLAG_MASK; SkyEngine::_systemVars.systemFlags &= ~TEXT_FLAG_MASK; @@ -804,7 +804,7 @@ uint16 Control::shiftUp(uint8 speed) { return SHIFTED; } -bool Control::autoSaveExists(void) { +bool Control::autoSaveExists() { bool test = false; Common::InSaveFile *f; char fName[20]; @@ -1050,7 +1050,7 @@ void Control::loadDescriptions(Common::StringList &savenames) { } } -bool Control::loadSaveAllowed(void) { +bool Control::loadSaveAllowed() { if (SkyEngine::_systemVars.systemFlags & SF_CHOOSING) return false; // texts get lost during load/save, so don't allow it during choosing if (Logic::_scriptVariables[SCREEN] >= 101) @@ -1095,7 +1095,7 @@ void Control::saveDescriptions(const Common::StringList &list) { displayMessage(NULL, "Unable to store Savegame names to file SKY-VM.SAV. (%s)", _saveFileMan->popErrorDesc().c_str()); } -void Control::doAutoSave(void) { +void Control::doAutoSave() { char fName[20]; if (SkyEngine::isCDVersion()) strcpy(fName, "SKY-VM-CD.ASD"); @@ -1121,7 +1121,7 @@ void Control::doAutoSave(void) { free(saveData); } -uint16 Control::saveGameToFile(void) { +uint16 Control::saveGameToFile() { char fName[20]; sprintf(fName,"SKY-VM.%03d", _selectedGame); @@ -1471,7 +1471,7 @@ uint16 Control::quickXRestore(uint16 slot) { return result; } -void Control::restartGame(void) { +void Control::restartGame() { if (SkyEngine::_systemVars.gameVersion <= 267) return; // no restart for floppy demo @@ -1537,7 +1537,7 @@ void Control::delay(unsigned int amount) { } while (cur < start + amount); } -void Control::showGameQuitMsg(void) { +void Control::showGameQuitMsg() { _skyText->fnSetFont(0); uint8 *textBuf1 = (uint8 *)malloc(GAME_SCREEN_WIDTH * 14 + sizeof(DataFileHeader)); uint8 *textBuf2 = (uint8 *)malloc(GAME_SCREEN_WIDTH * 14 + sizeof(DataFileHeader)); diff --git a/engines/sky/control.h b/engines/sky/control.h index c975e0d2e2..9c0e3c3cac 100644 --- a/engines/sky/control.h +++ b/engines/sky/control.h @@ -137,7 +137,7 @@ 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) {} + virtual ~ConResource() {} 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; } @@ -157,9 +157,9 @@ private: class TextResource : public ConResource { public: TextResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen); - virtual ~TextResource(void); + virtual ~TextResource(); virtual void drawToScreen(bool doMask); - void flushForRedraw(void); + void flushForRedraw(); private: uint16 _oldX, _oldY; uint8 *_oldScreen; @@ -168,10 +168,10 @@ private: class ControlStatus { public: ControlStatus(Text *skyText, OSystem *system, uint8 *scrBuf); - ~ControlStatus(void); + ~ControlStatus(); void setToText(const char *newText); void setToText(uint16 textNum); - void drawToScreen(void); + void drawToScreen(); private: TextResource *_statusText; DataFileHeader *_textData; @@ -183,16 +183,16 @@ private: class Control { public: Control(Common::SaveFileManager *saveFileMan, Screen *screen, Disk *disk, Mouse *mouse, Text *text, MusicBase *music, Logic *logic, Sound *sound, SkyCompact *skyCompact, OSystem *system); - void doControlPanel(void); - void doLoadSavePanel(void); - void restartGame(void); - void showGameQuitMsg(void); - void doAutoSave(void); + void doControlPanel(); + void doLoadSavePanel(); + void restartGame(); + void showGameQuitMsg(); + void doAutoSave(); uint16 quickXRestore(uint16 slot); - bool loadSaveAllowed(void); + bool loadSaveAllowed(); uint16 _selectedGame; - uint16 saveGameToFile(void); + uint16 saveGameToFile(); void loadDescriptions(Common::StringList &list); void saveDescriptions(const Common::StringList &list); @@ -200,10 +200,10 @@ public: private: int displayMessage(const char *altButton, const char *message, ...) GCC_PRINTF(3, 4); - void initPanel(void); - void removePanel(void); + void initPanel(); + void removePanel(); - void drawMainPanel(void); + void drawMainPanel(); void delay(unsigned int amount); @@ -211,10 +211,10 @@ private: bool getYesNo(char *text); void buttonControl(ConResource *pButton); uint16 handleClick(ConResource *pButton); - uint16 doMusicSlide(void); - uint16 doSpeedSlide(void); + uint16 doMusicSlide(); + uint16 doSpeedSlide(); void toggleFx(ConResource *pButton); - uint16 toggleText(void); + uint16 toggleText(); void toggleMusic(ConResource *pButton); uint16 shiftDown(uint8 speed); uint16 shiftUp(uint8 speed); @@ -228,7 +228,7 @@ private: uint32 prepareSaveData(uint8 *destBuf); - bool autoSaveExists(void); + bool autoSaveExists(); uint16 restoreGameFromFile(bool autoSave); void importOldMegaSet(uint8 **srcPos, MegaSet *mega); void importOldCompact(Compact* destCpt, uint8 **srcPos, uint16 numElems, uint16 type, char *name); diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp index 6edf2bdad9..90b55133ed 100644 --- a/engines/sky/disk.cpp +++ b/engines/sky/disk.cpp @@ -68,7 +68,7 @@ Disk::Disk() { delete dnrHandle; } -Disk::~Disk(void) { +Disk::~Disk() { if (_dataDiskHandle->isOpen()) _dataDiskHandle->close(); fnFlushBuffers(); @@ -224,7 +224,7 @@ void Disk::fnCacheFast(uint16 *fList) { } } -void Disk::fnCacheFiles(void) { +void Disk::fnCacheFiles() { uint16 lCnt, bCnt, targCnt; targCnt = lCnt = 0; bool found; @@ -306,7 +306,7 @@ void Disk::fnMiniLoad(uint16 fileNum) { SkyEngine::_itemList[fileNum & 2047] = (void**)loadFile(fileNum); } -void Disk::fnFlushBuffers(void) { +void Disk::fnFlushBuffers() { // dump all loaded sprites uint8 lCnt = 0; while (_loadedFilesList[lCnt]) { diff --git a/engines/sky/disk.h b/engines/sky/disk.h index c1016b834d..3338cce385 100644 --- a/engines/sky/disk.h +++ b/engines/sky/disk.h @@ -42,7 +42,7 @@ namespace Sky { class Disk { public: Disk(); - ~Disk(void); + ~Disk(); uint8 *loadFile(uint16 fileNr); uint16 *loadScriptFile(uint16 fileNr); @@ -55,9 +55,9 @@ public: void fnMiniLoad(uint16 fileNum); void fnCacheFast(uint16 *fList); void fnCacheChip(uint16 *fList); - void fnCacheFiles(void); - void fnFlushBuffers(void); - uint32 *giveLoadedFilesList(void) { return _loadedFilesList; } + void fnCacheFiles(); + void fnFlushBuffers(); + uint32 *giveLoadedFilesList() { return _loadedFilesList; } void refreshFilesList(uint32 *list); protected: diff --git a/engines/sky/grid.cpp b/engines/sky/grid.cpp index 7b473c7934..e2a96ebf1e 100644 --- a/engines/sky/grid.cpp +++ b/engines/sky/grid.cpp @@ -140,13 +140,13 @@ Grid::Grid(Disk *pDisk, SkyCompact *skyCompact) { _skyCompact = skyCompact; } -Grid::~Grid(void) { +Grid::~Grid() { for (uint8 cnt = 0; cnt < TOT_NO_GRIDS; cnt++) if (_gameGrids[cnt]) free(_gameGrids[cnt]); } -void Grid::loadGrids(void) { +void Grid::loadGrids() { // no endian conversion necessary as I'm using uint8* instead of uint32* for (uint8 cnt = 0; cnt < TOT_NO_GRIDS; cnt++) { if (_gameGrids[cnt]) diff --git a/engines/sky/grid.h b/engines/sky/grid.h index 7f3bc48e54..823462f8dd 100644 --- a/engines/sky/grid.h +++ b/engines/sky/grid.h @@ -39,10 +39,10 @@ class SkyCompact; class Grid { public: Grid(Disk *pDisk, SkyCompact *skyCompact); - ~Grid(void); + ~Grid(); // grid.asm routines - void loadGrids(void); + void loadGrids(); void removeObjectFromWalk(Compact *cpt); void objectToWalk(Compact *cpt); diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index eb82d9dbaf..bb715442bb 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -638,7 +638,7 @@ Intro::Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *t _relDelay = 0; } -Intro::~Intro(void) { +Intro::~Intro() { if (_skyScreen->sequenceRunning()) _skyScreen->stopSequence(); free(_textBuf); @@ -767,7 +767,7 @@ bool Intro::nextPart(uint16 *&data) { return true; } -bool Intro::floppyScrollFlirt(void) { +bool Intro::floppyScrollFlirt() { uint8 *scrollScreen = (uint8*)malloc(FRAME_SIZE * 2); memset(scrollScreen, 0, FRAME_SIZE); memcpy(scrollScreen + FRAME_SIZE, _skyScreen->giveCurrent(), FRAME_SIZE); @@ -848,7 +848,7 @@ bool Intro::commandFlirt(uint16 *&data) { return true; } -void Intro::showTextBuf(void) { +void Intro::showTextBuf() { uint16 x = ((DataFileHeader*)_textBuf)->s_x; uint16 y = ((DataFileHeader*)_textBuf)->s_y; uint16 width = ((DataFileHeader*)_textBuf)->s_width; @@ -870,7 +870,7 @@ void Intro::showTextBuf(void) { _system->copyRectToScreen(screenBuf, GAME_SCREEN_WIDTH, x, y, width, height); } -void Intro::restoreScreen(void) { +void Intro::restoreScreen() { uint16 x = ((DataFileHeader*)_saveBuf)->s_x; uint16 y = ((DataFileHeader*)_saveBuf)->s_y; uint16 width = ((DataFileHeader*)_saveBuf)->s_width; diff --git a/engines/sky/intro.h b/engines/sky/intro.h index 796bcf7e36..213361eae5 100644 --- a/engines/sky/intro.h +++ b/engines/sky/intro.h @@ -41,7 +41,7 @@ class Text; class Intro { public: Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *text, Audio::Mixer *mixer, OSystem *system); - ~Intro(void); + ~Intro(); bool doIntro(bool floppyIntro); private: static uint16 _mainIntroSeq[]; @@ -65,10 +65,10 @@ private: bool escDelay(uint32 msecs); bool nextPart(uint16 *&data); - bool floppyScrollFlirt(void); + bool floppyScrollFlirt(); bool commandFlirt(uint16 *&data); - void showTextBuf(void); - void restoreScreen(void); + void showTextBuf(); + void restoreScreen(); }; } // End of namespace Sky diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp index c67b7fe675..e19cbb27e8 100644 --- a/engines/sky/logic.cpp +++ b/engines/sky/logic.cpp @@ -98,7 +98,7 @@ Logic::Logic(SkyCompact *skyCompact, Screen *skyScreen, Disk *skyDisk, Text *sky initScriptVariables(); } -Logic::~Logic(void) { +Logic::~Logic() { delete _skyGrid; delete _skyAutoRoute; @@ -107,7 +107,7 @@ Logic::~Logic(void) { free(_moduleList[i]); } -void Logic::initScreen0(void) { +void Logic::initScreen0() { fnEnterSection(0, 0, 0); _skyMusic->startMusic(2); SkyEngine::_systemVars.currentMusic = 2; @@ -121,7 +121,7 @@ void Logic::parseSaveData(uint32 *data) { fnEnterSection(_scriptVariables[CUR_SECTION], 0, 0); } -bool Logic::checkProtection(void) { +bool Logic::checkProtection() { if (_scriptVariables[ENTER_DIGITS]) { if (_scriptVariables[CONSOLE_TYPE] == 5) // reactor code _scriptVariables[FS_COMMAND] = 240; diff --git a/engines/sky/logic.h b/engines/sky/logic.h index 3d5ba36edf..2274b6e2c5 100644 --- a/engines/sky/logic.h +++ b/engines/sky/logic.h @@ -144,7 +144,7 @@ public: MusicBase *skyMusic, Mouse *skyMouse, Sound *skySound); - ~Logic(void); + ~Logic(); void engine(); void useControlInstance(Control *control) { _skyControl = control; } @@ -154,7 +154,7 @@ public: Grid *_skyGrid; uint16 script(uint16 scriptNo, uint16 offset); - void initScreen0(void); + void initScreen0(); void parseSaveData(uint32 *data); private: @@ -172,7 +172,7 @@ protected: void mainAnim(); void runGetOff(); void stopAndWait(); - bool checkProtection(void); + bool checkProtection(); void nop(); void logicScript(); diff --git a/engines/sky/mouse.cpp b/engines/sky/mouse.cpp index 7d9d0d29f8..ca0ebcc19c 100644 --- a/engines/sky/mouse.cpp +++ b/engines/sky/mouse.cpp @@ -117,7 +117,7 @@ void Mouse::replaceMouseCursors(uint16 fileNo) { _objectMouseData = _skyDisk->loadFile(fileNo); } -bool Mouse::fnAddHuman(void) { +bool Mouse::fnAddHuman() { //reintroduce the mouse so that the human can control the player //could still be switched out at high-level @@ -146,16 +146,16 @@ bool Mouse::fnAddHuman(void) { return true; } -void Mouse::fnSaveCoods(void) { +void Mouse::fnSaveCoods() { Logic::_scriptVariables[SAFEX] = _mouseX + TOP_LEFT_X; Logic::_scriptVariables[SAFEY] = _mouseY + TOP_LEFT_Y; } -void Mouse::lockMouse(void) { +void Mouse::lockMouse() { SkyEngine::_systemVars.systemFlags |= SF_MOUSE_LOCKED; } -void Mouse::unlockMouse(void) { +void Mouse::unlockMouse() { SkyEngine::_systemVars.systemFlags &= ~SF_MOUSE_LOCKED; } @@ -279,7 +279,7 @@ void Mouse::mouseMoved(uint16 mouseX, uint16 mouseY) { _mouseY = mouseY; } -void Mouse::buttonEngine1(void) { +void Mouse::buttonEngine1() { //checks for clicking on special item //"compare the size of this routine to S1 mouse_button" @@ -331,7 +331,7 @@ void Mouse::fnOpenCloseHand(bool open) { spriteMouse(0, 5, 5); } -bool Mouse::wasClicked(void) { +bool Mouse::wasClicked() { if (_logicClick) { _logicClick = false; return true; diff --git a/engines/sky/mouse.h b/engines/sky/mouse.h index e131134699..a0e3ef4aaf 100644 --- a/engines/sky/mouse.h +++ b/engines/sky/mouse.h @@ -42,34 +42,34 @@ class Mouse { public: Mouse(OSystem *system, Disk *skyDisk, SkyCompact *skyCompact); - ~Mouse(void); + ~Mouse(); void mouseEngine(); void replaceMouseCursors(uint16 fileNo); - bool fnAddHuman(void); - void fnSaveCoods(void); + bool fnAddHuman(); + void fnSaveCoods(); void fnOpenCloseHand(bool open); uint16 findMouseCursor(uint32 itemNum); - void lockMouse(void); - void unlockMouse(void); + void lockMouse(); + void unlockMouse(); void restoreMouseData(uint16 frameNum); - void drawNewMouse(void); + void drawNewMouse(); void spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY); void useLogicInstance(Logic *skyLogic) { _skyLogic = skyLogic; }; void buttonPressed(uint8 button); void mouseMoved(uint16 mouseX, uint16 mouseY); void waitMouseNotPressed(int minDelay = 0); - uint16 giveMouseX(void) { return _mouseX; }; - uint16 giveMouseY(void) { return _mouseY; }; - uint16 giveCurrentMouseType(void) { return _currentCursor; }; - bool wasClicked(void); - void logicClick(void) { _logicClick = true; }; + uint16 giveMouseX() { return _mouseX; }; + uint16 giveMouseY() { return _mouseY; }; + uint16 giveCurrentMouseType() { return _currentCursor; }; + bool wasClicked(); + void logicClick() { _logicClick = true; }; void resetCursor(); protected: void pointerEngine(uint16 xPos, uint16 yPos); - void buttonEngine1(void); + void buttonEngine1(); bool _logicClick; diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp index 52c5a397b3..87de3cf1b9 100644 --- a/engines/sky/music/adlibchannel.cpp +++ b/engines/sky/music/adlibchannel.cpp @@ -79,11 +79,11 @@ AdlibChannel::AdlibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfData) { _instruments = (InstrumentStruct*)(_instrumentMap+0x80); } -AdlibChannel::~AdlibChannel(void) { +AdlibChannel::~AdlibChannel() { stopNote(); } -bool AdlibChannel::isActive(void) { +bool AdlibChannel::isActive() { return _channelData.channelActive; } @@ -102,14 +102,14 @@ void AdlibChannel::setRegister(uint8 regNum, uint8 value) { } } -void AdlibChannel::stopNote(void) { +void AdlibChannel::stopNote() { if (_channelData.note & 0x20) { _channelData.note &= ~0x20; setRegister(0xB0 | _channelData.adlibChannelNumber, _channelData.note); } } -int32 AdlibChannel::getNextEventTime(void) { +int32 AdlibChannel::getNextEventTime() { int32 retV = 0; uint8 cnt, lVal = 0; for (cnt = 0; cnt < 4; cnt++) { @@ -226,7 +226,7 @@ void AdlibChannel::setupChannelVolume(uint8 volume) { setRegister(0x40 | _channelData.adlibReg1, resultOp); } -void AdlibChannel::adlibSetupInstrument(void) { +void AdlibChannel::adlibSetupInstrument() { setRegister(0x60 | _channelData.adlibReg1, _channelData.instrumentData->ad_Op1); setRegister(0x60 | _channelData.adlibReg2, _channelData.instrumentData->ad_Op2); setRegister(0x80 | _channelData.adlibReg1, _channelData.instrumentData->sr_Op1); @@ -255,18 +255,18 @@ uint16 AdlibChannel::getNextNote(uint8 param) { //- command 90h routines -void AdlibChannel::com90_caseNoteOff(void) { +void AdlibChannel::com90_caseNoteOff() { if (_musicData[_channelData.eventDataPtr] == _channelData.lastCommand) stopNote(); _channelData.eventDataPtr++; } -void AdlibChannel::com90_stopChannel(void) { +void AdlibChannel::com90_stopChannel() { stopNote(); _channelData.channelActive = false; } -void AdlibChannel::com90_setupInstrument(void) { +void AdlibChannel::com90_setupInstrument() { _channelData.channelVolume = 0x7F; _channelData.freqOffset = 0x40; _channelData.assignedInstrument = _musicData[_channelData.eventDataPtr]; @@ -275,11 +275,11 @@ void AdlibChannel::com90_setupInstrument(void) { adlibSetupInstrument(); } -uint8 AdlibChannel::com90_updateTempo(void) { +uint8 AdlibChannel::com90_updateTempo() { return _musicData[_channelData.eventDataPtr++]; } -void AdlibChannel::com90_getFreqOffset(void) { +void AdlibChannel::com90_getFreqOffset() { _channelData.freqOffset = _musicData[_channelData.eventDataPtr++]; if (_channelData.note & 0x20) { uint16 nextNote = getNextNote( @@ -290,23 +290,23 @@ void AdlibChannel::com90_getFreqOffset(void) { } } -void AdlibChannel::com90_getChannelVolume(void) { +void AdlibChannel::com90_getChannelVolume() { _channelData.channelVolume = _musicData[_channelData.eventDataPtr++]; } -void AdlibChannel::com90_getTremoVibro(void) { +void AdlibChannel::com90_getTremoVibro() { _channelData.tremoVibro = _musicData[_channelData.eventDataPtr++]; } -void AdlibChannel::com90_loopMusic(void) { +void AdlibChannel::com90_loopMusic() { _channelData.eventDataPtr = _channelData.loopPoint; } -void AdlibChannel::com90_keyOff(void) { +void AdlibChannel::com90_keyOff() { stopNote(); } -void AdlibChannel::com90_setLoopPoint(void) { +void AdlibChannel::com90_setLoopPoint() { _channelData.loopPoint = _channelData.eventDataPtr; } diff --git a/engines/sky/music/adlibchannel.h b/engines/sky/music/adlibchannel.h index 67c0b5d176..b37936ec70 100644 --- a/engines/sky/music/adlibchannel.h +++ b/engines/sky/music/adlibchannel.h @@ -64,10 +64,10 @@ typedef struct { class AdlibChannel : public ChannelBase { public: AdlibChannel (FM_OPL *opl, uint8 *pMusicData, uint16 startOfData); - virtual ~AdlibChannel(void); + virtual ~AdlibChannel(); virtual uint8 process(uint16 aktTime); virtual void updateVolume(uint16 pVolume); - virtual bool isActive(void); + virtual bool isActive(); private: FM_OPL *_opl; uint8 *_musicData; @@ -81,28 +81,28 @@ private: // normal subs void setRegister(uint8 regNum, uint8 value); - int32 getNextEventTime(void); + int32 getNextEventTime(); uint16 getNextNote(uint8 param); - void adlibSetupInstrument(void); + void adlibSetupInstrument(); void setupInstrument(uint8 opcode); void setupChannelVolume(uint8 volume); - void stopNote(void); + void stopNote(); // Streamfunctions from Command90hTable - void com90_caseNoteOff(void); // 0 - void com90_stopChannel(void); // 1 - void com90_setupInstrument(void); // 2 - uint8 com90_updateTempo(void); // 3 - //void com90_dummy(void); // 4 - void com90_getFreqOffset(void); // 5 - void com90_getChannelVolume(void); // 6 - void com90_getTremoVibro(void); // 7 - void com90_loopMusic(void); // 8 - void com90_keyOff(void); // 9 - //void com90_error(void); // 10 - //void com90_doLodsb(void); // 11 - void com90_setLoopPoint(void); // 12 - //void com90_do_two_Lodsb(void); // 13 + void com90_caseNoteOff(); // 0 + void com90_stopChannel(); // 1 + void com90_setupInstrument(); // 2 + uint8 com90_updateTempo(); // 3 + //void com90_dummy(); // 4 + void com90_getFreqOffset(); // 5 + void com90_getChannelVolume(); // 6 + void com90_getTremoVibro(); // 7 + void com90_loopMusic(); // 8 + void com90_keyOff(); // 9 + //void com90_error(); // 10 + //void com90_doLodsb(); // 11 + void com90_setLoopPoint(); // 12 + //void com90_do_two_Lodsb(); // 13 }; } // End of namespace Sky diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index 77852786fd..da04b4fc95 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -43,7 +43,7 @@ AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pDisk) { _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true); } -AdlibMusic::~AdlibMusic(void) { +AdlibMusic::~AdlibMusic() { OPLDestroy(_opl); _mixer->stopHandle(_soundHandle); } @@ -76,7 +76,7 @@ int AdlibMusic::readBuffer(int16 *data, const int numSamples) { return numSamples; } -void AdlibMusic::setupPointers(void) { +void AdlibMusic::setupPointers() { if (SkyEngine::_systemVars.gameVersion == 109) { // disk demo uses a different adlib driver version, some offsets have changed //_musicDataLoc = (_musicData[0x11CC] << 8) | _musicData[0x11CB]; @@ -103,7 +103,7 @@ void AdlibMusic::setupChannels(uint8 *channelData) { } } -void AdlibMusic::startDriver(void) { +void AdlibMusic::startDriver() { uint16 cnt = 0; while (_initSequence[cnt] || _initSequence[cnt + 1]) { OPLWriteReg (_opl, _initSequence[cnt], _initSequence[cnt + 1]); @@ -116,15 +116,15 @@ void AdlibMusic::setVolume(uint16 param) { _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, 2 * param); } -bool AdlibMusic::isStereo(void) const { +bool AdlibMusic::isStereo() const { return false; } -bool AdlibMusic::endOfData(void) const { +bool AdlibMusic::endOfData() const { return false; } -int AdlibMusic::getRate(void) const { +int AdlibMusic::getRate() const { return _sampleRate; } diff --git a/engines/sky/music/adlibmusic.h b/engines/sky/music/adlibmusic.h index bccf0cbbec..7727979b4a 100644 --- a/engines/sky/music/adlibmusic.h +++ b/engines/sky/music/adlibmusic.h @@ -36,13 +36,13 @@ namespace Sky { class AdlibMusic : public Audio::AudioStream, public MusicBase { public: AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk); - ~AdlibMusic(void); + ~AdlibMusic(); // AudioStream API int readBuffer(int16 *buffer, const int numSamples); - bool isStereo(void) const; - bool endOfData(void) const; - int getRate(void) const; + bool isStereo() const; + bool endOfData() const; + int getRate() const; virtual void setVolume(uint16 param); private: @@ -51,9 +51,9 @@ private: Audio::SoundHandle _soundHandle; uint8 *_initSequence; uint32 _sampleRate, _nextMusicPoll; - virtual void setupPointers(void); + virtual void setupPointers(); virtual void setupChannels(uint8 *channelData); - virtual void startDriver(void); + virtual void startDriver(); void premixerCall(int16 *buf, uint len); }; diff --git a/engines/sky/music/gmchannel.cpp b/engines/sky/music/gmchannel.cpp index 97ac2ebc28..e589642458 100644 --- a/engines/sky/music/gmchannel.cpp +++ b/engines/sky/music/gmchannel.cpp @@ -44,11 +44,11 @@ GmChannel::GmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv _currentChannelVolume = 0x7F; } -GmChannel::~GmChannel(void) { +GmChannel::~GmChannel() { stopNote(); } -bool GmChannel::isActive(void) { +bool GmChannel::isActive() { return _channelData.channelActive; } @@ -61,14 +61,14 @@ void GmChannel::updateVolume(uint16 pVolume) { _midiDrv->send((0xB0 | _channelData.midiChannelNumber) | 0x700 | (newVol << 16)); } -void GmChannel::stopNote(void) { +void GmChannel::stopNote() { // All Notes Off _midiDrv->send((0xB0 | _channelData.midiChannelNumber) | 0x7B00 | 0 | 0x79000000); // Reset the Pitch Wheel. See bug #1016556. _midiDrv->send((0xE0 | _channelData.midiChannelNumber) | 0x400000); } -int32 GmChannel::getNextEventTime(void) { +int32 GmChannel::getNextEventTime() { int32 retV = 0; uint8 cnt, lVal = 0; for (cnt = 0; cnt < 4; cnt++) { @@ -139,17 +139,17 @@ uint8 GmChannel::process(uint16 aktTime) { //- command 90h routines -void GmChannel::com90_caseNoteOff(void) { +void GmChannel::com90_caseNoteOff() { _midiDrv->send((0x90 | _channelData.midiChannelNumber) | (_musicData[_channelData.eventDataPtr] << 8)); _channelData.eventDataPtr++; } -void GmChannel::com90_stopChannel(void) { +void GmChannel::com90_stopChannel() { stopNote(); _channelData.channelActive = false; } -void GmChannel::com90_setupInstrument(void) { +void GmChannel::com90_setupInstrument() { byte instrument = _musicData[_channelData.eventDataPtr]; if (_instMap) instrument = _instMap[instrument]; @@ -157,39 +157,39 @@ void GmChannel::com90_setupInstrument(void) { _channelData.eventDataPtr++; } -uint8 GmChannel::com90_updateTempo(void) { +uint8 GmChannel::com90_updateTempo() { return _musicData[_channelData.eventDataPtr++]; } -void GmChannel::com90_getPitch(void) { +void GmChannel::com90_getPitch() { _midiDrv->send((0xE0 | _channelData.midiChannelNumber) | 0 | (_musicData[_channelData.eventDataPtr] << 16)); _channelData.eventDataPtr++; } -void GmChannel::com90_getChannelVolume(void) { +void GmChannel::com90_getChannelVolume() { _currentChannelVolume = _musicData[_channelData.eventDataPtr++]; uint8 newVol = (uint8)((_currentChannelVolume * _musicVolume) >> 7); _midiDrv->send((0xB0 | _channelData.midiChannelNumber) | 0x700 | (newVol << 16)); } -void GmChannel::com90_loopMusic(void) { +void GmChannel::com90_loopMusic() { _channelData.eventDataPtr = _channelData.loopPoint; } -void GmChannel::com90_keyOff(void) { +void GmChannel::com90_keyOff() { _midiDrv->send((0x90 | _channelData.midiChannelNumber) | (_channelData.note << 8) | 0); } -void GmChannel::com90_setLoopPoint(void) { +void GmChannel::com90_setLoopPoint() { _channelData.loopPoint = _channelData.eventDataPtr; } -void GmChannel::com90_getChannelPanValue(void) { +void GmChannel::com90_getChannelPanValue() { _midiDrv->send((0xB0 | _channelData.midiChannelNumber) | 0x0A00 | (_musicData[_channelData.eventDataPtr] << 16)); _channelData.eventDataPtr++; } -void GmChannel::com90_getChannelControl(void) { +void GmChannel::com90_getChannelControl() { uint8 conNum = _musicData[_channelData.eventDataPtr++]; uint8 conDat = _musicData[_channelData.eventDataPtr++]; _midiDrv->send((0xB0 | _channelData.midiChannelNumber) | (conNum << 8) | (conDat << 16)); diff --git a/engines/sky/music/gmchannel.h b/engines/sky/music/gmchannel.h index 555054315e..e831b03424 100644 --- a/engines/sky/music/gmchannel.h +++ b/engines/sky/music/gmchannel.h @@ -44,11 +44,11 @@ typedef struct { class GmChannel : public ChannelBase { public: GmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, const byte *pInstMap, const byte *veloTab); - ~GmChannel(void); - virtual void stopNote(void); + ~GmChannel(); + virtual void stopNote(); virtual uint8 process(uint16 aktTime); virtual void updateVolume(uint16 pVolume); - virtual bool isActive(void); + virtual bool isActive(); private: const byte *_instMap; const byte *_veloTab; @@ -59,26 +59,26 @@ private: uint8 _currentChannelVolume; //- normal subs void setRegister(uint8 regNum, uint8 value); - int32 getNextEventTime(void); + int32 getNextEventTime(); uint16 getNextNote(uint8 param); - void adlibSetupInstrument(void); + void adlibSetupInstrument(); void setupInstrument(uint8 opcode); void setupChannelVolume(uint8 volume); //- Streamfunctions from Command90hTable - void com90_caseNoteOff(void); // 0 - void com90_stopChannel(void); // 1 - void com90_setupInstrument(void); // 2 - uint8 com90_updateTempo(void); // 3 - //void com90_dummy(void); // 4 - void com90_getPitch(void); // 5 - void com90_getChannelVolume(void); // 6 - //void com90_skipTremoVibro(void); // 7 - void com90_loopMusic(void); // 8 - void com90_keyOff(void); // 9 - //void com90_error(void); // 10 - void com90_getChannelPanValue(void); // 11 - void com90_setLoopPoint(void); // 12 - void com90_getChannelControl(void); // 13 + void com90_caseNoteOff(); // 0 + void com90_stopChannel(); // 1 + void com90_setupInstrument(); // 2 + uint8 com90_updateTempo(); // 3 + //void com90_dummy(); // 4 + void com90_getPitch(); // 5 + void com90_getChannelVolume(); // 6 + //void com90_skipTremoVibro(); // 7 + void com90_loopMusic(); // 8 + void com90_keyOff(); // 9 + //void com90_error(); // 10 + void com90_getChannelPanValue(); // 11 + void com90_setLoopPoint(); // 12 + void com90_getChannelControl(); // 13 }; } // End of namespace Sky diff --git a/engines/sky/music/gmmusic.cpp b/engines/sky/music/gmmusic.cpp index 46832a8255..f2abb3f277 100644 --- a/engines/sky/music/gmmusic.cpp +++ b/engines/sky/music/gmmusic.cpp @@ -46,7 +46,7 @@ GmMusic::GmMusic(MidiDriver *pMidiDrv, Disk *pDisk) : MusicBase(pDisk) { _midiDrv->setTimerCallback(this, passTimerFunc); } -GmMusic::~GmMusic(void) { +GmMusic::~GmMusic() { _midiDrv->setTimerCallback(NULL, NULL); if (_currentMusic) stopMusic(); @@ -65,7 +65,7 @@ void GmMusic::setVolume(uint16 param) { _channels[cnt]->updateVolume(_musicVolume); } -void GmMusic::timerCall(void) { +void GmMusic::timerCall() { _timerCount += _midiDrv->getBaseTempo(); if (_timerCount > (1000 * 1000 / 50)) { // call pollMusic() 50 times per second @@ -75,7 +75,7 @@ void GmMusic::timerCall(void) { } } -void GmMusic::setupPointers(void) { +void GmMusic::setupPointers() { if (SkyEngine::_systemVars.gameVersion == 109) { _musicDataLoc = READ_LE_UINT16(_musicData + 0x79B); _sysExSequence = _musicData + 0x1EF2; @@ -95,7 +95,7 @@ void GmMusic::setupChannels(uint8 *channelData) { } } -void GmMusic::startDriver(void) { +void GmMusic::startDriver() { // Send GM System On to reset channel parameters etc. uint8 sysEx[] = { 0x7e, 0x7f, 0x09, 0x01 }; _midiDrv->sysEx(sysEx, sizeof(sysEx)); diff --git a/engines/sky/music/gmmusic.h b/engines/sky/music/gmmusic.h index c4f3216b79..baabf2c9ea 100644 --- a/engines/sky/music/gmmusic.h +++ b/engines/sky/music/gmmusic.h @@ -35,20 +35,20 @@ namespace Sky { class GmMusic : public MusicBase { public: GmMusic(MidiDriver *pMidiDrv, Disk *pDisk); - ~GmMusic(void); + ~GmMusic(); virtual void setVolume(uint16 param); private: static void passTimerFunc(void *param); - void timerCall(void); + void timerCall(); uint32 _timerCount; uint8 *_sysExSequence; MidiDriver *_midiDrv; static const byte _veloTab[128]; - virtual void setupPointers(void); + virtual void setupPointers(); virtual void setupChannels(uint8 *channelData); - virtual void startDriver(void); + virtual void startDriver(); }; } // End of namespace Sky diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp index 816a77fa9a..0051998188 100644 --- a/engines/sky/music/mt32music.cpp +++ b/engines/sky/music/mt32music.cpp @@ -46,13 +46,13 @@ MT32Music::MT32Music(MidiDriver *pMidiDrv, Disk *pDisk) : MusicBase(pDisk) { _midiDrv->setTimerCallback(this, passTimerFunc); } -MT32Music::~MT32Music(void) { +MT32Music::~MT32Music() { _midiDrv->close(); _midiDrv->setTimerCallback(NULL, NULL); delete _midiDrv; } -void MT32Music::timerCall(void) { +void MT32Music::timerCall() { _timerCount += _midiDrv->getBaseTempo(); if (_timerCount > (1000000 / 50)) { // call pollMusic() 50 times per second @@ -73,7 +73,7 @@ void MT32Music::setVolume(uint16 volume) { _midiDrv->sysEx(sysEx, 9); } -void MT32Music::setupPointers(void) { +void MT32Music::setupPointers() { _musicDataLoc = READ_LE_UINT16(_musicData + 0x7DC); _sysExSequence = READ_LE_UINT16(_musicData + 0x7E0) + _musicData; } @@ -117,7 +117,7 @@ bool MT32Music::processPatchSysEx(uint8 *sysExData) { return true; } -void MT32Music::startDriver(void) { +void MT32Music::startDriver() { // setup timbres and patches using SysEx data uint8* sysExData = _sysExSequence; uint8 timbreNum = sysExData[0]; diff --git a/engines/sky/music/mt32music.h b/engines/sky/music/mt32music.h index cf77240be8..0b5573ffff 100644 --- a/engines/sky/music/mt32music.h +++ b/engines/sky/music/mt32music.h @@ -35,10 +35,10 @@ namespace Sky { class MT32Music : public MusicBase { public: MT32Music(MidiDriver *pMidiDrv, Disk *pDisk); - ~MT32Music(void); + ~MT32Music(); private: static void passTimerFunc(void *param); - void timerCall(void); + void timerCall(); bool processPatchSysEx(uint8 *sysExData); virtual void setVolume(uint16 volume); @@ -46,9 +46,9 @@ private: uint8 *_sysExSequence; MidiDriver *_midiDrv; - virtual void setupPointers(void); + virtual void setupPointers(); virtual void setupChannels(uint8 *channelData); - virtual void startDriver(void); + virtual void startDriver(); }; } // End of namespace Sky diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp index 17d022e774..a4eeaa017d 100644 --- a/engines/sky/music/musicbase.cpp +++ b/engines/sky/music/musicbase.cpp @@ -38,7 +38,7 @@ MusicBase::MusicBase(Disk *pDisk) { _numberOfChannels = _currentMusic = 0; } -MusicBase::~MusicBase(void) { +MusicBase::~MusicBase() { stopMusic(); if (_musicData) free(_musicData); @@ -63,33 +63,33 @@ void MusicBase::loadSection(uint8 pSection) { _mutex.unlock(); } -bool MusicBase::musicIsPlaying(void) { +bool MusicBase::musicIsPlaying() { for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) if (_channels[cnt]->isActive()) return true; return false; } -void MusicBase::stopMusic(void) { +void MusicBase::stopMusic() { _mutex.lock(); stopMusicInternal(); _mutex.unlock(); } -void MusicBase::stopMusicInternal(void) { +void MusicBase::stopMusicInternal() { for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) delete _channels[cnt]; _numberOfChannels = 0; } -void MusicBase::updateTempo(void) { +void MusicBase::updateTempo() { uint16 tempoMul = _musicTempo0 * _musicTempo1; uint16 divisor = 0x4446390/ 23864; _tempo = (tempoMul / divisor) << 16; _tempo |= (((tempoMul % divisor) << 16) | (tempoMul / divisor)) / divisor; } -void MusicBase::loadNewMusic(void) { +void MusicBase::loadNewMusic() { uint16 musicPos; if (_onNextPoll.musicToProcess > _musicData[_musicDataLoc]) { error("Music %d requested but doesn't exist in file.", _onNextPoll.musicToProcess); @@ -114,7 +114,7 @@ void MusicBase::loadNewMusic(void) { } } -void MusicBase::pollMusic(void) { +void MusicBase::pollMusic() { _mutex.lock(); uint8 newTempo; if (_onNextPoll.musicToProcess != _currentMusic) @@ -137,11 +137,11 @@ void MusicBase::startMusic(uint16 param) { _onNextPoll.musicToProcess = param & 0xF; } -uint8 MusicBase::giveVolume(void) { +uint8 MusicBase::giveVolume() { return (uint8)_musicVolume; } -uint8 MusicBase::giveCurrentMusic(void) { +uint8 MusicBase::giveCurrentMusic() { return _currentMusic; } diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h index ecb369c217..1ad78b2cf7 100644 --- a/engines/sky/music/musicbase.h +++ b/engines/sky/music/musicbase.h @@ -45,20 +45,20 @@ public: virtual ~ChannelBase() {} virtual uint8 process(uint16 aktTime) = 0; virtual void updateVolume(uint16 pVolume) = 0; - virtual bool isActive(void) = 0; + virtual bool isActive() = 0; private: }; class MusicBase { public: MusicBase(Disk *pDisk); - virtual ~MusicBase(void); + virtual ~MusicBase(); void loadSection(uint8 pSection); void startMusic(uint16 param); void stopMusic(); - bool musicIsPlaying(void); - uint8 giveVolume(void); - uint8 giveCurrentMusic(void); + bool musicIsPlaying(); + uint8 giveVolume(); + uint8 giveCurrentMusic(); virtual void setVolume(uint16 param) = 0; protected: @@ -79,15 +79,15 @@ protected: ChannelBase *_channels[10]; Common::Mutex _mutex; - virtual void setupPointers(void) = 0; + virtual void setupPointers() = 0; virtual void setupChannels(uint8 *channelData) = 0; - virtual void startDriver(void) = 0; + virtual void startDriver() = 0; - void updateTempo(void); - void loadNewMusic(void); - void pollMusic(void); + void updateTempo(); + void loadNewMusic(); + void pollMusic(); - void stopMusicInternal(void); + void stopMusicInternal(); }; } // End of namespace Sky diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp index 09da44bf2d..86949eb73e 100644 --- a/engines/sky/screen.cpp +++ b/engines/sky/screen.cpp @@ -91,7 +91,7 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) { _seqInfo.running = false; } -Screen::~Screen(void) { +Screen::~Screen() { free(_gameGrid); if (_currentScreen) free(_currentScreen); @@ -99,7 +99,7 @@ Screen::~Screen(void) { free(_scrollScreen); } -void Screen::clearScreen(void) { +void Screen::clearScreen() { memset(_currentScreen, 0, FULL_SCREEN_WIDTH * FULL_SCREEN_HEIGHT); _system->copyRectToScreen(_currentScreen, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT); _system->updateScreen(); @@ -129,7 +129,7 @@ void Screen::setPaletteEndian(uint8 *pal) { _system->updateScreen(); } -void Screen::halvePalette(void) { +void Screen::halvePalette() { uint8 halfPalette[1024]; for (uint8 cnt = 0; cnt < GAME_COLOURS; cnt++) { halfPalette[(cnt << 2) | 0] = _palette[(cnt << 2) | 0] >> 1; @@ -179,7 +179,7 @@ void Screen::convertPalette(uint8 *inPal, uint8* outPal) { //convert 3 byte 0..6 } } -void Screen::recreate(void) { +void Screen::recreate() { // check the game grid for changed blocks if (!Logic::_scriptVariables[LAYER_0_ID]) return; @@ -377,7 +377,7 @@ void Screen::fnFadeUp(uint32 palNum, uint32 scroll) { } } -void Screen::waitForTimer(void) { +void Screen::waitForTimer() { Common::EventManager *eventMan = _system->getEventManager(); _gotTick = false; while (!_gotTick) { @@ -389,7 +389,7 @@ void Screen::waitForTimer(void) { } } -void Screen::waitForSequence(void) { +void Screen::waitForSequence() { Common::EventManager *eventMan = _system->getEventManager(); while (_seqInfo.running) { Common::Event event; @@ -400,7 +400,7 @@ void Screen::waitForSequence(void) { } } -void Screen::handleTimer(void) { +void Screen::handleTimer() { _gotTick = true; if (_seqInfo.running) processSequence(); @@ -433,7 +433,7 @@ void Screen::stopSequence() { _seqInfo.seqData = _seqInfo.seqDataPos = NULL; } -void Screen::processSequence(void) { +void Screen::processSequence() { uint32 screenPos = 0; _seqInfo.delay--; @@ -510,13 +510,13 @@ void Screen::processSequence(void) { //- sprites.asm routines -void Screen::spriteEngine(void) { +void Screen::spriteEngine() { doSprites(BACK); sortSprites(); doSprites(FORE); } -void Screen::sortSprites(void) { +void Screen::sortSprites() { StSortList sortList[30]; uint32 currDrawList = DRAW_LIST_NO; uint32 loadDrawList; @@ -746,7 +746,7 @@ void Screen::vertMaskSub(uint16 *grid, uint32 gridOfs, uint8 *screenPtr, uint32 } // next_x } -void Screen::verticalMask(void) { +void Screen::verticalMask() { if (_sprWidth == 0) return; uint32 startGridOfs = (_sprY + _sprHeight - 1) * GRID_X + _sprX; diff --git a/engines/sky/screen.h b/engines/sky/screen.h index 6f3631c670..e587958c7b 100644 --- a/engines/sky/screen.h +++ b/engines/sky/screen.h @@ -60,7 +60,7 @@ typedef struct { class Screen { public: Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact); - ~Screen(void); + ~Screen(); void setPalette(uint8 *pal); void setPaletteEndian(uint8 *pal); void setPalette(uint16 fileNum); @@ -70,28 +70,28 @@ public: void showScreen(uint16 fileNum); void showScreen(uint8 *pScreen); - void handleTimer(void); + void handleTimer(); void startSequence(uint16 fileNum); void startSequenceItem(uint16 itemNum); - void stopSequence(void); - bool sequenceRunning(void) { return _seqInfo.running; } - void waitForSequence(void); - uint32 seqFramesLeft(void) { return _seqInfo.framesLeft; } - uint8 *giveCurrent(void) { return _currentScreen; } - void halvePalette(void); + void stopSequence(); + bool sequenceRunning() { return _seqInfo.running; } + void waitForSequence(); + uint32 seqFramesLeft() { return _seqInfo.framesLeft; } + uint8 *giveCurrent() { return _currentScreen; } + void halvePalette(); //- regular screen.asm routines - void forceRefresh(void) { memset(_gameGrid, 0x80, GRID_X * GRID_Y); } + void forceRefresh() { memset(_gameGrid, 0x80, GRID_X * GRID_Y); } void fnFadeUp(uint32 palNum, uint32 scroll); void fnFadeDown(uint32 scroll); void fnDrawScreen(uint32 palette, uint32 scroll); - void clearScreen(void); + void clearScreen(); void setFocusRectangle(const Common::Rect& rect); - void recreate(void); + void recreate(); void flip(bool doUpdate = true); - void spriteEngine(void); + void spriteEngine(); void paintBox(uint16 x, uint16 y); void showGrid(uint8 *gridBuf); @@ -106,8 +106,8 @@ private: uint8 _seqGrid[20 * 12]; bool volatile _gotTick; - void waitForTimer(void); - void processSequence(void); + void waitForTimer(); + void processSequence(); uint8 *_gameGrid; uint8 *_currentScreen; @@ -129,9 +129,9 @@ private: // fixme: get rid of these globals uint32 _sprWidth, _sprHeight, _sprX, _sprY, _maskX1, _maskX2; void doSprites(uint8 layer); - void sortSprites(void); + void sortSprites(); void drawSprite(uint8 *spriteData, Compact *sprCompact); - void verticalMask(void); + void verticalMask(); void vertMaskSub(uint16 *grid, uint32 gridOfs, uint8 *screenPtr, uint32 layerId); void vectorToGame(uint8 gridVal); }; diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index e85da6297a..6b42141ee7 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -108,7 +108,7 @@ void SkyEngine::initVirgin() { _skyScreen->showScreen(60110); } -void SkyEngine::handleKey(void) { +void SkyEngine::handleKey() { if (_keyPressed.keycode && _systemVars.paused) { _skySound->fnUnPauseFx(); _systemVars.paused = false; @@ -361,7 +361,7 @@ void SkyEngine::initItemList() { _itemList[i] = NULL; } -void SkyEngine::loadFixedItems(void) { +void SkyEngine::loadFixedItems() { _itemList[49] = _skyDisk->loadFile(49); _itemList[50] = _skyDisk->loadFile(50); _itemList[73] = _skyDisk->loadFile(73); @@ -388,7 +388,7 @@ void SkyEngine::timerHandler(void *refCon) { ((SkyEngine *)refCon)->gotTimerTick(); } -void SkyEngine::gotTimerTick(void) { +void SkyEngine::gotTimerTick() { _skyScreen->handleTimer(); } @@ -434,7 +434,7 @@ void SkyEngine::delay(int32 amount) { } while (_system->getMillis() < start + amount); } -bool SkyEngine::isDemo(void) { +bool SkyEngine::isDemo() { switch (_systemVars.gameVersion) { case 109: // PC Gamer demo case 267: // English floppy demo @@ -453,7 +453,7 @@ bool SkyEngine::isDemo(void) { } } -bool SkyEngine::isCDVersion(void) { +bool SkyEngine::isCDVersion() { switch (_systemVars.gameVersion) { case 109: case 267: diff --git a/engines/sky/sky.h b/engines/sky/sky.h index 71ac716113..ff89068c2d 100644 --- a/engines/sky/sky.h +++ b/engines/sky/sky.h @@ -76,8 +76,8 @@ public: SkyEngine(OSystem *syst); virtual ~SkyEngine(); - static bool isDemo(void); - static bool isCDVersion(void); + static bool isDemo(); + static bool isCDVersion(); Common::Error loadGameState(int slot); Common::Error saveGameState(int slot, const char *desc); @@ -106,7 +106,7 @@ protected: byte _fastMode; void delay(int32 amount); - void handleKey(void); + void handleKey(); uint32 _lastSaveTime; diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index 596204b999..c4bfd52b64 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -1028,7 +1028,7 @@ Sound::Sound(Audio::Mixer *mixer, Disk *pDisk, uint8 pVolume) { _isPaused = false; } -Sound::~Sound(void) { +Sound::~Sound() { _mixer->stopAll(); if (_soundData) free(_soundData); @@ -1175,7 +1175,7 @@ void Sound::fnStartFx(uint32 sound, uint8 channel) { playSound(sfx->soundNo, volume, channel); } -void Sound::checkFxQueue(void) { +void Sound::checkFxQueue() { for (uint8 cnt = 0; cnt < MAX_QUEUED_FX; cnt++) { if (_sfxQueue[cnt].count) { _sfxQueue[cnt].count--; @@ -1185,7 +1185,7 @@ void Sound::checkFxQueue(void) { } } -void Sound::restoreSfx(void) { +void Sound::restoreSfx() { // queue sfx, so they will be started when the player exits the control panel memset(_sfxQueue, 0, sizeof(_sfxQueue)); uint8 queueSlot = 0; @@ -1204,13 +1204,13 @@ void Sound::restoreSfx(void) { } } -void Sound::fnStopFx(void) { +void Sound::fnStopFx() { _mixer->stopID(SOUND_CH0); _mixer->stopID(SOUND_CH1); _saveSounds[0] = _saveSounds[1] = 0xFFFF; } -void Sound::stopSpeech(void) { +void Sound::stopSpeech() { _mixer->stopID(SOUND_SPEECH); } @@ -1246,7 +1246,7 @@ bool Sound::startSpeech(uint16 textNum) { return true; } -void Sound::fnPauseFx(void) { +void Sound::fnPauseFx() { if (!_isPaused) { _isPaused = true; _mixer->pauseID(SOUND_CH0, true); @@ -1254,7 +1254,7 @@ void Sound::fnPauseFx(void) { } } -void Sound::fnUnPauseFx(void) { +void Sound::fnUnPauseFx() { if (_isPaused) { _isPaused = false; _mixer->pauseID(SOUND_CH0, false); diff --git a/engines/sky/sound.h b/engines/sky/sound.h index 0ad509700e..2aecd6ab7f 100644 --- a/engines/sky/sound.h +++ b/engines/sky/sound.h @@ -67,19 +67,19 @@ protected: public: Sound(Audio::Mixer *mixer, Disk *pDisk, uint8 pVolume); - ~Sound(void); + ~Sound(); void loadSection(uint8 pSection); 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); } - void fnPauseFx(void); - void fnUnPauseFx(void); - void fnStopFx(void); - void stopSpeech(void); - void checkFxQueue(void); - void restoreSfx(void); + bool speechFinished() { return !_mixer->isSoundHandleActive(_ingameSpeech); } + void fnPauseFx(); + void fnUnPauseFx(); + void fnStopFx(); + void stopSpeech(); + void checkFxQueue(); + void restoreSfx(); uint8 _soundsTotal; private: diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp index 497c8a1ba3..66e03b08bc 100644 --- a/engines/sky/text.cpp +++ b/engines/sky/text.cpp @@ -71,7 +71,7 @@ Text::Text(Disk *skyDisk, SkyCompact *skyCompact) { } } -Text::~Text(void) { +Text::~Text() { for (int i = FIRST_TEXT_BUFFER; i <= LAST_TEXT_BUFFER; i++) if (SkyEngine::_itemList[i]) { free(SkyEngine::_itemList[i]); @@ -416,7 +416,7 @@ void Text::changeTextSpriteColour(uint8 *sprData, uint8 newCol) { sprData[cnt] = newCol; } -uint32 Text::giveCurrentCharSet(void) { +uint32 Text::giveCurrentCharSet() { return _curCharSet; } diff --git a/engines/sky/text.h b/engines/sky/text.h index 5682d39355..890cfb2e47 100644 --- a/engines/sky/text.h +++ b/engines/sky/text.h @@ -51,7 +51,7 @@ struct PatchMessage { class Text { public: Text(Disk *skyDisk, SkyCompact *skyCompact); - ~Text(void); + ~Text(); struct DisplayedText displayText(uint32 textNum, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color); struct DisplayedText displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color); struct DisplayedText lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool centre); @@ -60,7 +60,7 @@ public: void fnPointerText(uint32 pointedId, uint16 mouseX, uint16 mouseY); void logicCursor(Compact *textCompact, uint16 mouseX, uint16 mouseY); void changeTextSpriteColour(uint8 *sprData, uint8 newCol); - uint32 giveCurrentCharSet(void); + uint32 giveCurrentCharSet(); uint32 _numLetters; //no of chars in message diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index 60e9bb13fa..80e8573c44 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -73,7 +73,7 @@ MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSys _decoderType = decoderType; } -MoviePlayer::~MoviePlayer(void) { +MoviePlayer::~MoviePlayer() { delete _decoder; delete _bgSoundHandle; } @@ -145,7 +145,7 @@ bool MoviePlayer::load(uint32 id) { return _decoder->loadFile(filename); } -void MoviePlayer::play(void) { +void MoviePlayer::play() { if (_bgSoundStream) { _snd->playInputStream(Audio::Mixer::kSFXSoundType, _bgSoundHandle, _bgSoundStream); } diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h index 1a380d40b0..629198a63d 100644 --- a/engines/sword1/animation.h +++ b/engines/sword1/animation.h @@ -70,9 +70,9 @@ private: class MoviePlayer : public Graphics::VideoPlayer { public: MoviePlayer(SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Graphics::VideoDecoder *decoder, DecoderType decoderType); - virtual ~MoviePlayer(void); + virtual ~MoviePlayer(); bool load(uint32 id); - void play(void); + void play(); protected: SwordEngine *_vm; Text *_textMan; diff --git a/engines/sword1/collision.h b/engines/sword1/collision.h index 1ed3980d0a..4079136da1 100644 --- a/engines/sword1/collision.h +++ b/engines/sword1/collision.h @@ -35,10 +35,10 @@ class Logic; class Collision { public: Collision(ObjectMan *pObjMan, Logic *pLogic); - ~Collision(void); - void checkCollisions(void); - void fnBumpOff(void); - void fnBumpOn(void); + ~Collision(); + void checkCollisions(); + void fnBumpOff(); + void fnBumpOn(); private: int32 getIntersect(int32 x0, int32 y0, int32 x1, int32 y1, int32 x2, int32 y2, int32 x3, int32 y3); int noCol; diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index 2b6509163e..dd57d8f98e 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -129,15 +129,15 @@ ControlButton::ControlButton(uint16 x, uint16 y, uint32 resId, uint8 id, uint8 f _system = system; } -ControlButton::~ControlButton(void) { +ControlButton::~ControlButton() { _resMan->resClose(_resId); } -bool ControlButton::isSaveslot(void) { +bool ControlButton::isSaveslot() { return ((_resId >= SR_SLAB1) && (_resId <= SR_SLAB4)); } -void ControlButton::draw(void) { +void ControlButton::draw() { FrameHeader *fHead = _resMan->fetchFrame(_resMan->fetchRes(_resId), _frameIdx); uint8 *src = (uint8*)fHead + sizeof(FrameHeader); uint8 *dst = _dstBuf; @@ -241,7 +241,7 @@ Control::Control(Common::SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMa _panelShown = false; } -void Control::askForCd(void) { +void Control::askForCd() { _screenBuf = (uint8*)malloc(640 * 480); uint32 fontId = SR_FONT; if (SwordEngine::_systemVars.language == BS1_CZECH) @@ -298,7 +298,7 @@ static int volToBalance(int volL, int volR) { } } -uint8 Control::runPanel(void) { +uint8 Control::runPanel() { _panelShown = true; _mouseDown = false; _restoreBuf = NULL; @@ -530,12 +530,12 @@ uint8 Control::handleButtonClick(uint8 id, uint8 mode, uint8 *retVal) { return 0; } -void Control::deselectSaveslots(void) { +void Control::deselectSaveslots() { for (uint8 cnt = 0; cnt < 8; cnt++) _buttons[cnt]->setSelected(0); } -void Control::setupMainPanel(void) { +void Control::setupMainPanel() { uint32 panelId; if (SwordEngine::_systemVars.controlPanelMode == CP_DEATHSCREEN) @@ -602,7 +602,7 @@ void Control::setupSaveRestorePanel(bool saving) { showSavegameNames(); } -void Control::setupVolumePanel(void) { +void Control::setupVolumePanel() { ControlButton *panel = new ControlButton(0, 0, SR_VOLUME, 0, 0, _resMan, _screenBuf, _system); panel->draw(); delete panel; @@ -623,7 +623,7 @@ void Control::setupVolumePanel(void) { renderVolumeBar(3, volL, volR); } -void Control::handleVolumeClicks(void) { +void Control::handleVolumeClicks() { if (_mouseDown) { uint8 clickedId = 0; for (uint8 cnt = 1; cnt < 4; cnt++) @@ -774,21 +774,21 @@ void Control::handleSaveKey(Common::KeyState kbd) { } } -bool Control::saveToFile(void) { +bool Control::saveToFile() { if ((_selectedSavegame == 255) || _saveNames[_selectedSavegame].size() == 0) return false; // no saveslot selected or no name entered saveGameToFile(_selectedSavegame); return true; } -bool Control::restoreFromFile(void) { +bool Control::restoreFromFile() { if (_selectedSavegame < 255) { return restoreGameFromFile(_selectedSavegame); } else return false; } -void Control::readSavegameDescriptions(void) { +void Control::readSavegameDescriptions() { char saveName[40]; Common::String pattern = "sword1.???"; Common::StringList filenames = _saveFileMan->listSavefiles(pattern); @@ -827,7 +827,7 @@ void Control::readSavegameDescriptions(void) { _saveFiles = _numSaves = _saveNames.size(); } -bool Control::isPanelShown(void) { +bool Control::isPanelShown() { return _panelShown; } @@ -845,7 +845,7 @@ int Control::displayMessage(const char *altButton, const char *message, ...) { return result; } -bool Control::savegamesExist(void) { +bool Control::savegamesExist() { Common::String pattern = "sword1.???"; Common::StringList saveNames = _saveFileMan->listSavefiles(pattern); return saveNames.size() > 0; @@ -900,7 +900,7 @@ void Control::checkForOldSaveGames() { _saveFileMan->removeSavefile("SAVEGAME.INF"); } -void Control::showSavegameNames(void) { +void Control::showSavegameNames() { for (uint8 cnt = 0; cnt < 8; cnt++) { _buttons[cnt]->draw(); uint8 textMode = TEXT_LEFT_ALIGN; @@ -981,7 +981,7 @@ void Control::createButtons(const ButtonInfo *buttons, uint8 num) { _numButtons = num; } -void Control::destroyButtons(void) { +void Control::destroyButtons() { for (uint8 cnt = 0; cnt < _numButtons; cnt++) delete _buttons[cnt]; _numButtons = 0; @@ -1301,7 +1301,7 @@ bool Control::convertSaveGame(uint8 slot, char* desc) { return true; } -void Control::doRestore(void) { +void Control::doRestore() { uint8 *bufPos = _restoreBuf; _objMan->loadLiveList((uint16*)bufPos); bufPos += TOTAL_SECTIONS * 2; diff --git a/engines/sword1/control.h b/engines/sword1/control.h index 0193afc7f1..6741b3dd79 100644 --- a/engines/sword1/control.h +++ b/engines/sword1/control.h @@ -55,11 +55,11 @@ class Sound; class ControlButton { public: ControlButton(uint16 x, uint16 y, uint32 resId, uint8 id, uint8 flag, ResMan *pResMan, uint8 *screenBuf, OSystem *system); - ~ControlButton(void); - void draw(void); + ~ControlButton(); + void draw(); bool wasClicked(uint16 mouseX, uint16 mouseY); void setSelected(uint8 selected); - bool isSaveslot(void); + bool isSaveslot(); uint8 _id; uint8 _flag; private: @@ -86,15 +86,15 @@ struct ButtonInfo { class Control { public: Control(Common::SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic); - uint8 runPanel(void); - void doRestore(void); - void askForCd(void); - bool savegamesExist(void); - void readSavegameDescriptions(void); + uint8 runPanel(); + void doRestore(); + void askForCd(); + bool savegamesExist(); + void readSavegameDescriptions(); void saveGameToFile(uint8 slot); bool restoreGameFromFile(uint8 slot); - void checkForOldSaveGames(void); - bool isPanelShown(void); + void checkForOldSaveGames(); + bool isPanelShown(); void setSaveDescription(int slot, const char *desc) { _saveNames[slot] = desc; @@ -104,8 +104,8 @@ private: int displayMessage(const char *altButton, const char *message, ...) GCC_PRINTF(3, 4); bool convertSaveGame(uint8 slot, char* desc); - void showSavegameNames(void); - void deselectSaveslots(void); + void showSavegameNames(); + void deselectSaveslots(); uint8 *_restoreBuf; uint8 _saveFiles; uint8 _numSaves; @@ -119,18 +119,18 @@ private: uint8 getClicks(uint8 mode, uint8 *retVal); uint8 handleButtonClick(uint8 id, uint8 mode, uint8 *retVal); - void handleVolumeClicks(void); + void handleVolumeClicks(); void changeVolume(uint8 id, uint8 action); - void setupMainPanel(void); + void setupMainPanel(); void setupSaveRestorePanel(bool saving); - void setupVolumePanel(void); + void setupVolumePanel(); bool getConfirm(const uint8 *title); void saveNameScroll(uint8 scroll, bool saving); void saveNameSelect(uint8 id, bool saving); - bool saveToFile(void); - bool restoreFromFile(void); + bool saveToFile(); + bool restoreFromFile(); bool keyAccepted(uint16 ascii); void handleSaveKey(Common::KeyState kbd); @@ -140,7 +140,7 @@ private: uint8 _numButtons; uint8 _selectedButton; void createButtons(const ButtonInfo *buttons, uint8 num); - void destroyButtons(void); + void destroyButtons(); ControlButton *_buttons[MAX_BUTTONS]; static const ButtonInfo _deathButtons[3], _panelButtons[7], _saveButtons[16], _volumeButtons[4]; static const uint8 _languageStrings[8 * 20][43]; diff --git a/engines/sword1/eventman.cpp b/engines/sword1/eventman.cpp index 59841c12ea..55a438f506 100644 --- a/engines/sword1/eventman.cpp +++ b/engines/sword1/eventman.cpp @@ -30,12 +30,12 @@ namespace Sword1 { -EventManager::EventManager(void) { +EventManager::EventManager() { for (uint8 cnt = 0; cnt < TOTAL_EVENT_SLOTS; cnt++) _eventPendingList[cnt].delay = _eventPendingList[cnt].eventNumber = 0; } -void EventManager::serviceGlobalEventList(void) { +void EventManager::serviceGlobalEventList() { for (uint8 slot = 0; slot < TOTAL_EVENT_SLOTS; slot++) if (_eventPendingList[slot].delay) _eventPendingList[slot].delay--; diff --git a/engines/sword1/eventman.h b/engines/sword1/eventman.h index 552f59977a..7a50b9a297 100644 --- a/engines/sword1/eventman.h +++ b/engines/sword1/eventman.h @@ -39,8 +39,8 @@ struct GlobalEvent { class EventManager { public: - EventManager(void); - void serviceGlobalEventList(void); + EventManager(); + void serviceGlobalEventList(); void checkForEvent(Object *compact); int fnCheckForEvent(Object *cpt, int32 id, int32 pause); void fnIssueEvent(Object *compact, int32 id, int32 event, int32 delay); diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp index f32c422540..35d8e14f27 100644 --- a/engines/sword1/logic.cpp +++ b/engines/sword1/logic.cpp @@ -75,13 +75,13 @@ Logic::Logic(SwordEngine *vm, ObjectMan *pObjMan, ResMan *resMan, Screen *pScree setupMcodeTable(); } -Logic::~Logic(void) { +Logic::~Logic() { delete _textMan; delete _router; delete _eventMan; } -void Logic::initialize(void) { +void Logic::initialize() { memset(_scriptVars, 0, NUM_SCRIPT_VARS * sizeof(uint32)); for (uint8 cnt = 0; cnt < NON_ZERO_SCRIPT_VARS; cnt++) _scriptVars[_scriptVarInit[cnt][0]] = _scriptVarInit[cnt][1]; @@ -132,7 +132,7 @@ void Logic::newScreen(uint32 screen) { } } -void Logic::engine(void) { +void Logic::engine() { debug(8, "\n\nNext logic cycle"); _eventMan->serviceGlobalEventList(); @@ -429,7 +429,7 @@ int Logic::animDriver(Object *compact) { return 0; } -void Logic::updateScreenParams(void) { +void Logic::updateScreenParams() { Object *compact = (Object*)_objMan->fetchObject(PLAYER); _screen->setScrolling((int16)(compact->o_xcoord - _scriptVars[FEET_X]), (int16)(compact->o_ycoord - _scriptVars[FEET_Y])); diff --git a/engines/sword1/logic.h b/engines/sword1/logic.h index 6e3f08c4af..aabfb7fce9 100644 --- a/engines/sword1/logic.h +++ b/engines/sword1/logic.h @@ -53,11 +53,11 @@ typedef int (Logic::*BSMcodeTable)(Object *, int32, int32, int32, int32, int32, class Logic { public: Logic(SwordEngine *vm, ObjectMan *pObjMan, ResMan *resMan, Screen *pScreen, Mouse *pMouse, Sound *pSound, Music *pMusic, Menu *pMenu, OSystem *system, Audio::Mixer *mixer); - ~Logic(void); - void initialize(void); + ~Logic(); + void initialize(); void newScreen(uint32 screen); - void engine(void); - void updateScreenParams(void); + void engine(); + void updateScreenParams(); void runMouseScript(Object *cpt, int32 scriptId); void startPositions(uint32 pos); diff --git a/engines/sword1/memman.cpp b/engines/sword1/memman.cpp index f6e4e17658..b08631dfc8 100644 --- a/engines/sword1/memman.cpp +++ b/engines/sword1/memman.cpp @@ -29,12 +29,12 @@ namespace Sword1 { -MemMan::MemMan(void) { +MemMan::MemMan() { _alloced = 0; _memListFree = _memListFreeEnd = NULL; } -MemMan::~MemMan(void) { +MemMan::~MemMan() { flush(); if (_alloced) warning("deleting MemMan, still %d bytes alloced", _alloced); @@ -76,7 +76,7 @@ void MemMan::setCondition(MemHandle *bsMem, uint16 pCond) { } } -void MemMan::flush(void) { +void MemMan::flush() { while (_memListFree) { free(_memListFreeEnd->data); _memListFreeEnd->data = NULL; @@ -88,7 +88,7 @@ void MemMan::flush(void) { warning("MemMan::flush: Something's wrong: still %d bytes alloced", _alloced); } -void MemMan::checkMemoryUsage(void) { +void MemMan::checkMemoryUsage() { while ((_alloced > MAX_ALLOC) && _memListFree) { free(_memListFreeEnd->data); _memListFreeEnd->data = NULL; diff --git a/engines/sword1/memman.h b/engines/sword1/memman.h index d482fff7b1..845a8638a2 100644 --- a/engines/sword1/memman.h +++ b/engines/sword1/memman.h @@ -50,17 +50,17 @@ struct MemHandle { class MemMan { public: - MemMan(void); - ~MemMan(void); + MemMan(); + ~MemMan(); void alloc(MemHandle *bsMem, uint32 pSize, uint16 pCond = MEM_DONT_FREE); void setCondition(MemHandle *bsMem, uint16 pCond); void freeNow(MemHandle *bsMem); void initHandle(MemHandle *bsMem); - void flush(void); + void flush(); private: void addToFreeList(MemHandle *bsMem); void removeFromFreeList(MemHandle *bsMem); - void checkMemoryUsage(void); + void checkMemoryUsage(); uint32 _alloced; //currently allocated memory MemHandle *_memListFree; MemHandle *_memListFreeEnd; diff --git a/engines/sword1/menu.cpp b/engines/sword1/menu.cpp index 1c7f18ba98..34f6daf276 100644 --- a/engines/sword1/menu.cpp +++ b/engines/sword1/menu.cpp @@ -107,7 +107,7 @@ Menu::Menu(Screen *pScreen, Mouse *pMouse) { _inMenu = 0; } -Menu::~Menu(void) { +Menu::~Menu() { int i; // the menu may be open, so delete the icons for (i = 0; i < TOTAL_pockets; i++) { @@ -214,7 +214,7 @@ uint8 Menu::checkMenuClick(uint8 menuType) { return 0; } -void Menu::buildSubjects(void) { +void Menu::buildSubjects() { uint8 cnt; for (cnt = 0; cnt < 16; cnt++) if (_subjects[cnt]) { @@ -288,7 +288,7 @@ void Menu::refresh(uint8 menuType) { } } -void Menu::buildMenu(void) { +void Menu::buildMenu() { uint32 *pockets = Logic::_scriptVars + POCKET_1; for (uint8 cnt = 0; cnt < _inMenu; cnt++) if (_objects[cnt]) { @@ -336,7 +336,7 @@ void Menu::showMenu(uint8 menuType) { } } -void Menu::fnStartMenu(void) { +void Menu::fnStartMenu() { Logic::_scriptVars[OBJECT_HELD] = 0; // icon no longer selected Logic::_scriptVars[SECOND_ITEM] = 0; // second icon no longer selected (after using one on another) Logic::_scriptVars[MENU_LOOKING] = 0; // no longer 'looking at' an icon @@ -344,7 +344,7 @@ void Menu::fnStartMenu(void) { showMenu(MENU_TOP); } -void Menu::fnEndMenu(void) { +void Menu::fnEndMenu() { if (_objectBarStatus != MENU_CLOSED) _objectBarStatus = MENU_CLOSING; } @@ -358,7 +358,7 @@ void Menu::fnChooser(Object *compact) { _subjectBarStatus = MENU_OPENING; } -void Menu::fnEndChooser(void) { +void Menu::fnEndChooser() { Logic::_scriptVars[OBJECT_HELD] = 0; _subjectBarStatus = MENU_CLOSING; _objectBarStatus = MENU_CLOSING; @@ -366,7 +366,7 @@ void Menu::fnEndChooser(void) { _mouse->setLuggage(0, 0); } -void Menu::checkTopMenu(void) { +void Menu::checkTopMenu() { if (_objectBarStatus == MENU_OPEN) checkMenuClick(MENU_TOP); } @@ -389,7 +389,7 @@ void Menu::fnAddSubject(int32 sub) { Logic::_scriptVars[IN_SUBJECT]++; } -void Menu::cfnReleaseMenu(void) { +void Menu::cfnReleaseMenu() { _objectBarStatus = MENU_CLOSING; } diff --git a/engines/sword1/menu.h b/engines/sword1/menu.h index d23097c9bc..f45f59a1e0 100644 --- a/engines/sword1/menu.h +++ b/engines/sword1/menu.h @@ -68,28 +68,28 @@ private: class Menu { public: Menu(Screen *pScreen, Mouse *pMouse); - ~Menu(void); + ~Menu(); void fnChooser(Object *compact); - void fnEndChooser(void); + void fnEndChooser(); void fnAddSubject(int32 sub); - void cfnReleaseMenu(void); + void cfnReleaseMenu(); int logicChooser(Object *compact); - void engine(void); + void engine(); void refresh(uint8 menuType); - void fnStartMenu(void); - void fnEndMenu(void); - void checkTopMenu(void); + void fnStartMenu(); + void fnEndMenu(); + void checkTopMenu(); static const MenuObject _objectDefs[TOTAL_pockets + 1]; private: - void buildSubjects(void); - void buildMenu(void); + void buildSubjects(); + void buildMenu(); void showMenu(uint8 menuType); byte _subjectBarStatus; byte _objectBarStatus; int8 _fadeSubject; int8 _fadeObject; - void refreshMenus(void); + void refreshMenus(); uint8 checkMenuClick(uint8 menuType); //- lower menu, speech subjects: MenuIcon *_subjects[16]; diff --git a/engines/sword1/mouse.cpp b/engines/sword1/mouse.cpp index 77e58f8116..725254d76b 100644 --- a/engines/sword1/mouse.cpp +++ b/engines/sword1/mouse.cpp @@ -47,7 +47,7 @@ Mouse::Mouse(OSystem *system, ResMan *pResMan, ObjectMan *pObjMan) { _currentPtr = NULL; } -Mouse::~Mouse(void) { +Mouse::~Mouse() { setLuggage(0, 0); setPointer(0, 0); @@ -55,7 +55,7 @@ Mouse::~Mouse(void) { _resMan->resClose(MSE_POINTER + cnt); } -void Mouse::initialize(void) { +void Mouse::initialize() { _numObjs = 0; Logic::_scriptVars[MOUSE_STATUS] = 0; // mouse off and unlocked _getOff = 0; @@ -189,7 +189,7 @@ void Mouse::engine(uint16 x, uint16 y, uint16 eventFlags) { _numObjs = 0; } -uint16 Mouse::testEvent(void) { +uint16 Mouse::testEvent() { return _state; } @@ -302,7 +302,7 @@ void Mouse::setLuggage(uint32 resId, uint32 rate) { createPointer(_currentPtrId, resId); } -void Mouse::animate(void) { +void Mouse::animate() { if ((Logic::_scriptVars[MOUSE_STATUS] == 1) || (_mouseOverride && _currentPtr)) { _frame = (_frame + 1) % _currentPtr->numFrames; uint8 *ptrData = (uint8*)_currentPtr + sizeof(MousePtr); @@ -311,7 +311,7 @@ void Mouse::animate(void) { } } -void Mouse::fnNoHuman(void) { +void Mouse::fnNoHuman() { if (Logic::_scriptVars[MOUSE_STATUS] & 2) // locked, can't do anything return ; Logic::_scriptVars[MOUSE_STATUS] = 0; // off & unlocked @@ -319,7 +319,7 @@ void Mouse::fnNoHuman(void) { setPointer(0, 0); } -void Mouse::fnAddHuman(void) { +void Mouse::fnAddHuman() { if (Logic::_scriptVars[MOUSE_STATUS] & 2) // locked, can't do anything return ; Logic::_scriptVars[MOUSE_STATUS] = 1; @@ -328,19 +328,19 @@ void Mouse::fnAddHuman(void) { setPointer(MSE_POINTER, 0); } -void Mouse::fnBlankMouse(void) { +void Mouse::fnBlankMouse() { setPointer(0, 0); } -void Mouse::fnNormalMouse(void) { +void Mouse::fnNormalMouse() { setPointer(MSE_POINTER, 0); } -void Mouse::fnLockMouse(void) { +void Mouse::fnLockMouse() { Logic::_scriptVars[MOUSE_STATUS] |= 2; } -void Mouse::fnUnlockMouse(void) { +void Mouse::fnUnlockMouse() { Logic::_scriptVars[MOUSE_STATUS] &= 1; } diff --git a/engines/sword1/mouse.h b/engines/sword1/mouse.h index 1be35c4039..50b7431c48 100644 --- a/engines/sword1/mouse.h +++ b/engines/sword1/mouse.h @@ -72,22 +72,22 @@ class ObjectMan; class Mouse { public: Mouse(OSystem *system, ResMan *pResMan, ObjectMan *pObjMan); - ~Mouse(void); - void initialize(void); + ~Mouse(); + void initialize(); void addToList(int id, Object *compact); void useLogicAndMenu(Logic *pLogic, Menu *pMenu); void setLuggage(uint32 resID, uint32 rate); void setPointer(uint32 resID, uint32 rate); - void animate(void); + void animate(); void engine(uint16 x, uint16 y, uint16 eventFlags); - uint16 testEvent(void); + uint16 testEvent(); void giveCoords(uint16 *x, uint16 *y); - void fnNoHuman(void); - void fnAddHuman(void); - void fnBlankMouse(void); - void fnNormalMouse(void); - void fnLockMouse(void); - void fnUnlockMouse(void); + void fnNoHuman(); + void fnAddHuman(); + void fnBlankMouse(); + void fnNormalMouse(); + void fnLockMouse(); + void fnUnlockMouse(); void controlPanel(bool on); private: void createPointer(uint32 ptrId, uint32 luggageId); diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index 8c0315052f..67ea0bf376 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -287,15 +287,15 @@ bool MusicHandle::endOfData() const { } // if we don't have an audiosource, return some dummy values. -bool MusicHandle::streaming(void) const { +bool MusicHandle::streaming() const { return (_audioSource) ? (!_audioSource->endOfStream()) : false; } -bool MusicHandle::isStereo(void) const { +bool MusicHandle::isStereo() const { return (_audioSource) ? _audioSource->isStereo() : false; } -int MusicHandle::getRate(void) const { +int MusicHandle::getRate() const { return (_audioSource) ? _audioSource->getRate() : 11025; } diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp index 703f422b8b..9ac2c7a255 100644 --- a/engines/sword1/objectman.cpp +++ b/engines/sword1/objectman.cpp @@ -37,7 +37,7 @@ ObjectMan::ObjectMan(ResMan *pResourceMan) { _resMan = pResourceMan; } -void ObjectMan::initialize(void) { +void ObjectMan::initialize() { uint16 cnt; for (cnt = 0; cnt < TOTAL_SECTIONS; cnt++) _liveList[cnt] = 0; // we don't need to close the files here. When this routine is @@ -55,7 +55,7 @@ void ObjectMan::initialize(void) { } } -ObjectMan::~ObjectMan(void) { +ObjectMan::~ObjectMan() { for (uint16 cnt = 0; cnt < TOTAL_SECTIONS; cnt++) if (_liveList[cnt]) _resMan->resClose(_objectList[cnt]); diff --git a/engines/sword1/objectman.h b/engines/sword1/objectman.h index fdb26e2e68..f4b8fe8906 100644 --- a/engines/sword1/objectman.h +++ b/engines/sword1/objectman.h @@ -37,8 +37,8 @@ namespace Sword1 { class ObjectMan { public: ObjectMan(ResMan *pResourceMan); - ~ObjectMan(void); - void initialize(void); + ~ObjectMan(); + void initialize(); Object *fetchObject(uint32 id); uint32 fetchNoObjects(int section); diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp index 90ea5fe677..3b11f6cca5 100644 --- a/engines/sword1/resman.cpp +++ b/engines/sword1/resman.cpp @@ -59,7 +59,7 @@ ResMan::ResMan(const char *fileName, bool isMacFile) { loadCluDescript(fileName); } -ResMan::~ResMan(void) { +ResMan::~ResMan() { #if 0 for (uint32 clusCnt = 0; clusCnt < _prj.noClu; clusCnt++) { Clu *cluster = _prj.clu[clusCnt]; @@ -150,7 +150,7 @@ void ResMan::loadCluDescript(const char *fileName) { _srIdList[cnt] = 0x04050000 | cnt; } -void ResMan::freeCluDescript(void) { +void ResMan::freeCluDescript() { for (uint32 clusCnt = 0; clusCnt < _prj.noClu; clusCnt++) { Clu *cluster = _prj.clu + clusCnt; @@ -173,7 +173,7 @@ void ResMan::freeCluDescript(void) { delete[] _prj.clu; } -void ResMan::flush(void) { +void ResMan::flush() { for (uint32 clusCnt = 0; clusCnt < _prj.noClu; clusCnt++) { Clu *cluster = _prj.clu + clusCnt; for (uint32 grpCnt = 0; grpCnt < cluster->noGrp; grpCnt++) { diff --git a/engines/sword1/resman.h b/engines/sword1/resman.h index a0a8bb6c4c..ee1d55cd14 100644 --- a/engines/sword1/resman.h +++ b/engines/sword1/resman.h @@ -67,8 +67,8 @@ struct Prj { class ResMan { public: ResMan(const char *fileName, bool isMacFile); - ~ResMan(void); - void flush(void); + ~ResMan(); + void flush(); void resClose(uint32 id); void resOpen(uint32 id); void *fetchRes(uint32 id); @@ -120,7 +120,7 @@ private: void openScriptResourceLittleEndian(uint32 id); void loadCluDescript(const char *fileName); - void freeCluDescript(void); + void freeCluDescript(); Prj _prj; MemMan *_memMan; static const uint32 _scriptList[TOTAL_SECTIONS]; //a table of resource tags diff --git a/engines/sword1/router.h b/engines/sword1/router.h index 7ea459d9aa..97fa42488b 100644 --- a/engines/sword1/router.h +++ b/engines/sword1/router.h @@ -138,7 +138,7 @@ private: bool _slidyWalkAnimatorState; int32 LoadWalkResources(Object *mega, int32 x, int32 y, int32 dir); - int32 getRoute(void); + int32 getRoute(); int32 checkTarget(int32 x, int32 y); bool scan(int32 level); diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp index bef715199c..928cfafd10 100644 --- a/engines/sword1/screen.cpp +++ b/engines/sword1/screen.cpp @@ -57,14 +57,14 @@ Screen::Screen(OSystem *system, ResMan *pResMan, ObjectMan *pObjMan) { _psxCache.extPlxCache = NULL; } -Screen::~Screen(void) { +Screen::~Screen() { free(_screenBuf); free(_screenGrid); if (_currentScreen != 0xFFFF) quitScreen(); } -void Screen::clearScreen(void) { +void Screen::clearScreen() { if (_screenBuf) { _fullRefresh = true; memset(_screenBuf, 0, _scrnSizeX * _scrnSizeY); @@ -119,14 +119,14 @@ void Screen::setScrolling(int16 offsetX, int16 offsetY) { } } -void Screen::fadeDownPalette(void) { +void Screen::fadeDownPalette() { if (!_isBlack) { // don't fade down twice _fadingStep = 15; _fadingDirection = FADE_DOWN; } } -void Screen::fadeUpPalette(void) { +void Screen::fadeUpPalette() { _fadingStep = 1; _fadingDirection = FADE_UP; } @@ -157,16 +157,16 @@ void Screen::fnSetPalette(uint8 start, uint16 length, uint32 id, bool fadeUp) { _system->setPalette(_targetPalette + 4 * start, start, length); } -void Screen::fullRefresh(void) { +void Screen::fullRefresh() { _fullRefresh = true; _system->setPalette(_targetPalette, 0, 256); } -bool Screen::stillFading(void) { +bool Screen::stillFading() { return (_fadingStep != 0); } -bool Screen::showScrollFrame(void) { +bool Screen::showScrollFrame() { if ((!_fullRefresh) || Logic::_scriptVars[NEW_PALETTE] || _updatePalette) return false; // don't draw an additional frame if we aren't scrolling or have to change the palette if ((_oldScrollX == Logic::_scriptVars[SCROLL_OFFSET_X]) && @@ -181,7 +181,7 @@ bool Screen::showScrollFrame(void) { return true; } -void Screen::updateScreen(void) { +void Screen::updateScreen() { if (Logic::_scriptVars[NEW_PALETTE]) { _fadingStep = 1; _fadingDirection = FADE_UP; @@ -346,7 +346,7 @@ void Screen::newScreen(uint32 screen) { _fullRefresh = true; } -void Screen::quitScreen(void) { +void Screen::quitScreen() { uint8 cnt; if (SwordEngine::isPsx()) flushPsxCache(); @@ -361,7 +361,7 @@ void Screen::quitScreen(void) { _currentScreen = 0xFFFF; } -void Screen::draw(void) { +void Screen::draw() { uint8 cnt; debug(8, "Screen::draw() -> _currentScreen %u", _currentScreen); @@ -1114,7 +1114,7 @@ void Screen::decompressHIF(uint8 *src, uint8 *dest) { } } -void Screen::flushPsxCache(void) { +void Screen::flushPsxCache() { if (_psxCache.decodedBackground) { free(_psxCache.decodedBackground); _psxCache.decodedBackground = NULL; @@ -1126,7 +1126,7 @@ void Screen::flushPsxCache(void) { } } -void Screen::fadePalette(void) { +void Screen::fadePalette() { if (_fadingStep == 16) memcpy(_currentPalette, _targetPalette, 256 * 4); else if ((_fadingStep == 1) && (_fadingDirection == FADE_DOWN)) { diff --git a/engines/sword1/screen.h b/engines/sword1/screen.h index 72a55b94d3..fc998c6f28 100644 --- a/engines/sword1/screen.h +++ b/engines/sword1/screen.h @@ -76,25 +76,25 @@ class Text; // Text objects use sprites that are created internally at run-time class Screen { public: Screen(OSystem *system, ResMan *pResMan, ObjectMan *pObjMan); - ~Screen(void); - void clearScreen(void); + ~Screen(); + void clearScreen(); void useTextManager(Text *pTextMan); - void draw(void); + void draw(); - void quitScreen(void); + void quitScreen(); void newScreen(uint32 screen); void setScrolling(int16 offsetX, int16 offsetY); void addToGraphicList(uint8 listId, uint32 objId); - void fadeDownPalette(void); - void fadeUpPalette(void); + void fadeDownPalette(); + void fadeUpPalette(); void fnSetPalette(uint8 start, uint16 length, uint32 id, bool fadeUp); - bool stillFading(void); - void fullRefresh(void); + bool stillFading(); + void fullRefresh(); - bool showScrollFrame(void); - void updateScreen(void); + bool showScrollFrame(); + void updateScreen(); void showFrame(uint16 x, uint16 y, uint32 resId, uint32 frameNo, const byte *fadeMask = NULL, int8 fadeStatus = 0); void fnSetParallax(uint32 screen, uint32 resId); @@ -130,9 +130,9 @@ private: void decompressTony(uint8 *src, uint32 compSize, uint8 *dest); void fastShrink(uint8 *src, uint32 width, uint32 height, uint32 scale, uint8 *dest); int32 inRange(int32 a, int32 b, int32 c); - void fadePalette(void); + void fadePalette(); - void flushPsxCache(void); + void flushPsxCache(); OSystem *_system; ResMan *_resMan; diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index 1aee713370..d8e664fed3 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -59,7 +59,7 @@ Sound::Sound(const char *searchPath, Audio::Mixer *mixer, ResMan *pResMan) { _speechVolL = _speechVolR = _sfxVolL = _sfxVolR = 192; } -Sound::~Sound(void) { +Sound::~Sound() { // clean up fx queue _mixer->stopAll(); for (uint8 cnt = 0; cnt < _endOfQueue; cnt++) @@ -168,7 +168,7 @@ int Sound::addToQueue(int32 fxNo) { return 0; } -void Sound::engine(void) { +void Sound::engine() { // first of all, add any random sfx to the queue... for (uint16 cnt = 0; cnt < TOTAL_FX_PER_ROOM; cnt++) { uint16 fxNo = _roomsFixedFx[Logic::_scriptVars[SCREEN]][cnt]; @@ -211,12 +211,12 @@ void Sound::fnStopFx(int32 fxNo) { debug(8, "fnStopFx: id not found in queue"); } -bool Sound::amISpeaking(void) { +bool Sound::amISpeaking() { _waveVolPos++; return _waveVolume[_waveVolPos - 1]; } -bool Sound::speechFinished(void) { +bool Sound::speechFinished() { return !_mixer->isSoundHandleActive(_speechHandle); } @@ -238,7 +238,7 @@ void Sound::newScreen(uint32 screen) { } } -void Sound::quitScreen(void) { +void Sound::quitScreen() { // stop all running SFX while (_endOfQueue) fnStopFx(_fxQueue[0].id); @@ -540,11 +540,11 @@ void Sound::calcWaveVolume(int16 *data, uint32 length) { } } -void Sound::stopSpeech(void) { +void Sound::stopSpeech() { _mixer->stopID(SOUND_SPEECH_ID); } -void Sound::initCowSystem(void) { +void Sound::initCowSystem() { char cowName[25]; /* look for speech1/2.clu in the data dir and speech/speech.clu (running from cd or using cd layout) @@ -633,7 +633,7 @@ void Sound::initCowSystem(void) { warning("Sound::initCowSystem: Can't open SPEECH%d.CLU", SwordEngine::_systemVars.currentCD); } -void Sound::closeCowSystem(void) { +void Sound::closeCowSystem() { _cowFile.close(); free(_cowHeader); _cowHeader = NULL; diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h index c105d06b50..68be0e56e2 100644 --- a/engines/sword1/sound.h +++ b/engines/sword1/sound.h @@ -76,31 +76,31 @@ enum CowMode { class Sound { public: Sound(const char *searchPath, Audio::Mixer *mixer, ResMan *pResMan); - ~Sound(void); + ~Sound(); void setSpeechVol(uint8 volL, uint8 volR) { _speechVolL = volL; _speechVolR = volR; } void setSfxVol(uint8 volL, uint8 volR) { _sfxVolL = volL; _sfxVolR = volR; } void giveSpeechVol(uint8 *volL, uint8 *volR) { *volL = _speechVolL; *volR = _speechVolR; } void giveSfxVol(uint8 *volL, uint8 *volR) { *volL = _sfxVolL; *volR = _sfxVolR; } void newScreen(uint32 screen); - void quitScreen(void); - void closeCowSystem(void); + void quitScreen(); + void closeCowSystem(); bool startSpeech(uint16 roomNo, uint16 localNo); - bool speechFinished(void); + bool speechFinished(); void stopSpeech(); - bool amISpeaking(void); + bool amISpeaking(); void fnStopFx(int32 fxNo); int addToQueue(int32 fxNo); - void engine(void); + void engine(); void checkSpeechFileEndianness(); private: uint8 _sfxVolL, _sfxVolR, _speechVolL, _speechVolR; void playSample(QueueElement *elem); - void initCowSystem(void); + void initCowSystem(); int16 *uncompressSpeech(uint32 index, uint32 cSize, uint32 *size); void calcWaveVolume(int16 *data, uint32 length); diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 180537f4ec..a1ff5087cf 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -152,7 +152,7 @@ Common::Error SwordEngine::init() { return Common::kNoError; } -void SwordEngine::reinitialize(void) { +void SwordEngine::reinitialize() { _sound->quitScreen(); _resMan->flush(); // free everything that's currently alloced and opened. (*evil*) @@ -414,7 +414,7 @@ void SwordEngine::showFileErrorMsg(uint8 type, bool *fileExists) { error("%s", msg); } -void SwordEngine::checkCdFiles(void) { // check if we're running from cd, hdd or what... +void SwordEngine::checkCdFiles() { // check if we're running from cd, hdd or what... bool fileExists[30]; bool isFullVersion = false; // default to demo version bool missingTypes[8] = { false, false, false, false, false, false, false, false }; @@ -595,7 +595,7 @@ Common::Error SwordEngine::go() { return Common::kNoError; } -void SwordEngine::checkCd(void) { +void SwordEngine::checkCd() { uint8 needCd = _cdList[Logic::_scriptVars[NEW_SCREEN]]; if (_systemVars.runningFromCd) { // are we running from cd? if (needCd == 0) { // needCd == 0 means we can use either CD1 or CD2. @@ -617,7 +617,7 @@ void SwordEngine::checkCd(void) { } } -uint8 SwordEngine::mainLoop(void) { +uint8 SwordEngine::mainLoop() { uint8 retCode = 0; _keyPressed.reset(); @@ -736,7 +736,7 @@ bool SwordEngine::mouseIsActive() { } // The following function is needed to restore proper status after GMM load game -void SwordEngine::reinitRes(void) { +void SwordEngine::reinitRes() { checkCd(); // Reset currentCD var to correct value _screen->newScreen(Logic::_scriptVars[NEW_SCREEN]); _logic->newScreen(Logic::_scriptVars[NEW_SCREEN]); diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h index 4877f99582..b3d7aee717 100644 --- a/engines/sword1/sword1.h +++ b/engines/sword1/sword1.h @@ -75,7 +75,7 @@ public: SwordEngine(OSystem *syst); virtual ~SwordEngine(); static SystemVars _systemVars; - void reinitialize(void); + void reinitialize(); uint32 _features; @@ -107,14 +107,14 @@ protected: private: void delay(int32 amount); - void checkCdFiles(void); - void checkCd(void); + void checkCdFiles(); + void checkCd(); void showFileErrorMsg(uint8 type, bool *fileExists); void flagsToBool(bool *dest, uint8 flags); - void reinitRes(void); //Reinits the resources after a GMM load + void reinitRes(); //Reinits the resources after a GMM load - uint8 mainLoop(void); + uint8 mainLoop(); Common::Point _mouseCoord; uint16 _mouseState; diff --git a/engines/sword1/text.cpp b/engines/sword1/text.cpp index d71b5027b8..e8a20ec2b7 100644 --- a/engines/sword1/text.cpp +++ b/engines/sword1/text.cpp @@ -55,7 +55,7 @@ Text::Text(ObjectMan *pObjMan, ResMan *pResMan, bool czechVersion) { _textBlocks[i] = NULL; } -Text::~Text(void) { +Text::~Text() { for (int i = 0; i < MAX_TEXT_OBS; i++) free(_textBlocks[i]); //_resMan->resClose(_fontId); => wiped automatically by _resMan->flush(); diff --git a/engines/sword1/text.h b/engines/sword1/text.h index 803d8c3fd0..9bfc88fce0 100644 --- a/engines/sword1/text.h +++ b/engines/sword1/text.h @@ -49,7 +49,7 @@ struct LineInfo { class Text { public: Text(ObjectMan *pObjMan, ResMan *pResMan, bool czechVersion); - ~Text(void); + ~Text(); FrameHeader *giveSpriteData(uint32 textTarget); uint32 lowTextManager(uint8 *text, int32 width, uint8 pen); void makeTextSprite(uint8 slot, uint8 *text, uint16 maxWidth, uint8 pen); diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 0f3d369ee9..629fc3d8bc 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -52,7 +52,7 @@ MoviePlayer::MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, A _decoderType = decoderType; } -MoviePlayer:: ~MoviePlayer(void) { +MoviePlayer:: ~MoviePlayer() { delete _bgSoundHandle; delete _decoder; } diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h index f2b44baaa0..7f9ae0ff2d 100644 --- a/engines/sword2/animation.h +++ b/engines/sword2/animation.h @@ -72,7 +72,7 @@ private: class MoviePlayer : public Graphics::VideoPlayer { public: MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Graphics::VideoDecoder *decoder, DecoderType decoderType); - virtual ~MoviePlayer(void); + virtual ~MoviePlayer(); bool load(const char *name); void play(MovieText *movieTexts, uint32 numMovieTexts, uint32 leadIn, uint32 leadOut); diff --git a/engines/tinsel/actors.cpp b/engines/tinsel/actors.cpp index 284e166899..efcefb442c 100644 --- a/engines/tinsel/actors.cpp +++ b/engines/tinsel/actors.cpp @@ -215,7 +215,7 @@ void SetLeadId(int leadID) { /** * No comment. */ -int GetLeadId(void) { +int GetLeadId() { return LeadActorId; } @@ -471,7 +471,7 @@ void StartTaggedActors(SCNHANDLE ah, int numActors, bool bRunScript) { /** * Called between scenes, zeroises all actors. */ -void DropActors(void) { +void DropActors() { for (int i = 0; i < NumActors; i++) { if (TinselV2) { @@ -614,7 +614,7 @@ SCNHANDLE GetActorTag(int ano) { * NextTagged Actor is repeatedly called until the caller gets fed up * or there are no more tagged actors to look at. */ -void FirstTaggedActor(void) { +void FirstTaggedActor() { ti = 0; } @@ -623,7 +623,7 @@ void FirstTaggedActor(void) { * NextTagged Actor is repeatedly called until the caller gets fed up * or there are no more tagged actors to look at. */ -int NextTaggedActor(void) { +int NextTaggedActor() { PMOVER pActor; bool hid; @@ -1406,7 +1406,7 @@ void RestoreActorZ(byte *saveActorZ) { memcpy(zFactors, saveActorZ, NumActors); } -void setactorson(void) { +void setactorson() { bActorsOn = true; } @@ -1567,7 +1567,7 @@ bool InHotSpot(int ano, int curX, int curY) { /** * Front Tagged Actor */ -int FrontTaggedActor(void) { +int FrontTaggedActor() { int i; for (i = 0; i < numTaggedActors; i++) { diff --git a/engines/tinsel/actors.h b/engines/tinsel/actors.h index 0cf77e8be1..fbad5d9955 100644 --- a/engines/tinsel/actors.h +++ b/engines/tinsel/actors.h @@ -48,12 +48,12 @@ struct OBJECT; /*----------------------------------------------------------------------*/ void RegisterActors(int num); -void FreeActors(void); +void FreeActors(); void SetLeadId(int rid); -int GetLeadId(void); +int GetLeadId(); bool ActorIsGhost(int actor); void StartTaggedActors(SCNHANDLE ah, int numActors, bool bRunScript); -void DropActors(void); // No actor reels running +void DropActors(); // No actor reels running void DisableActor(int actor); void EnableActor(int actor); void Tag_Actor(int ano, SCNHANDLE tagtext, int tp); @@ -100,8 +100,8 @@ int GetActorZpos(int ano, int column); void IncLoopCount(int ano); int GetLoopCount(int ano); SCNHANDLE GetActorTag(int ano); -void FirstTaggedActor(void); -int NextTaggedActor(void); +void FirstTaggedActor(); +int NextTaggedActor(); int NextTaggedActor(int previous); int AsetZPos(OBJECT *pObj, int y, int32 zFactor); void SetMoverZ(MOVER *pMover, int y, int32 zFactor); @@ -113,7 +113,7 @@ void SetActorRGB(int ano, COLORREF colour); void SetActorZfactor(int ano, uint32 zFactor); uint32 GetActorZfactor(int ano); -void setactorson(void); +void setactorson(); void ActorsLife(int id, bool bAlive); @@ -128,7 +128,7 @@ bool ActorIsPointedTo(int actor); void SetActorTagWanted(int actor, bool bTagWanted, bool bCursor, SCNHANDLE hOverrideTag); bool ActorTagIsWanted(int actor); bool InHotSpot(int ano, int curX, int curY); -int FrontTaggedActor(void); +int FrontTaggedActor(); void GetActorTagPos(int actor, int *pTagX, int *pTagY, bool bAbsolute); bool IsTaggedActor(int actor); void StoreActorPresFilm(int ano, SCNHANDLE hFilm, int x, int y); diff --git a/engines/tinsel/background.cpp b/engines/tinsel/background.cpp index 740b6204ea..abfb9692a9 100644 --- a/engines/tinsel/background.cpp +++ b/engines/tinsel/background.cpp @@ -175,7 +175,7 @@ OBJECT *GetPlayfieldList(int which) { * to scroll each playfield before it is drawn. */ -void DrawBackgnd(void) { +void DrawBackgnd() { int i; // playfield counter PLAYFIELD *pPlay; // playfield pointer int prevX, prevY; // save interger part of position @@ -255,7 +255,7 @@ void DrawBackgnd(void) { ResetClipRect(); } -void ForceEntireRedraw(void) { +void ForceEntireRedraw() { bEntireRedraw = true; } diff --git a/engines/tinsel/background.h b/engines/tinsel/background.h index e6074f7bb4..747e51a8f1 100644 --- a/engines/tinsel/background.h +++ b/engines/tinsel/background.h @@ -81,7 +81,7 @@ void InitBackground( // called to initialise a background void StartupBackground(CORO_PARAM, SCNHANDLE hFilm); -void StopBgndScrolling(void); // Stops all background playfields from scrolling +void StopBgndScrolling(); // Stops all background playfields from scrolling void PlayfieldSetPos( // Sets the xy position of the specified playfield in the current background int which, // which playfield @@ -102,19 +102,19 @@ OBJECT *GetPlayfieldList( // Returns the display list for the specified playfiel void KillPlayfieldList( // Kills all the objects on the display list for the specified playfield int which); // which playfield -void DrawBackgnd(void); // Draws all playfields for the current background +void DrawBackgnd(); // Draws all playfields for the current background -void RedrawBackgnd(void); // Completely redraws all the playfield object lists for the current background +void RedrawBackgnd(); // Completely redraws all the playfield object lists for the current background OBJECT *GetBgObject(); -SCNHANDLE BgPal(void); +SCNHANDLE BgPal(); -void ForceEntireRedraw(void); +void ForceEntireRedraw(); -int BgWidth(void); +int BgWidth(); -int BgHeight(void); +int BgHeight(); } // End of namespace Tinsel diff --git a/engines/tinsel/bg.cpp b/engines/tinsel/bg.cpp index 0125a681fd..efd4b644cf 100644 --- a/engines/tinsel/bg.cpp +++ b/engines/tinsel/bg.cpp @@ -66,7 +66,7 @@ OBJECT *GetBgObject() { /** * BackPal */ -SCNHANDLE BgPal(void) { +SCNHANDLE BgPal() { return hBgPal; } @@ -80,7 +80,7 @@ void SetDoFadeIn(bool tf) { /** * Called before scene change. */ -void DropBackground(void) { +void DropBackground() { pBG[0] = NULL; // No background if (!TinselV2) @@ -90,7 +90,7 @@ void DropBackground(void) { /** * Return the width of the current background. */ -int BgWidth(void) { +int BgWidth() { assert(pBG[0]); return MultiRightmost(pBG[0]) + 1; } @@ -98,7 +98,7 @@ int BgWidth(void) { /** * Return the height of the current background. */ -int BgHeight(void) { +int BgHeight() { assert(pBG[0]); return MultiLowest(pBG[0]) + 1; } @@ -275,7 +275,7 @@ void StartupBackground(CORO_PARAM, SCNHANDLE hFilm) { /** * Return the current scene handle. */ -SCNHANDLE GetBgroundHandle(void) { +SCNHANDLE GetBgroundHandle() { return hBackground; } diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index 6f5358760a..e89f1f091f 100644 --- a/engines/tinsel/bmv.cpp +++ b/engines/tinsel/bmv.cpp @@ -470,7 +470,7 @@ void BMVPlayer::MovieAudio(int audioOffset, int blobs) { |-------------------------------------------------------| \*-----------------------------------------------------*/ -void BMVPlayer::FettleMovieText(void) { +void BMVPlayer::FettleMovieText() { int i; bIsText = false; @@ -702,7 +702,7 @@ void BMVPlayer::LoadSlots(int number) { /** * Called from the foreground when starting playback of a movie. */ -void BMVPlayer::InitialiseBMV(void) { +void BMVPlayer::InitialiseBMV() { if (!stream.open(szMovieFile)) error(CANNOT_FIND_FILE, szMovieFile); @@ -751,7 +751,7 @@ void BMVPlayer::InitialiseBMV(void) { /** * Called from the foreground when ending playback of a movie. */ -void BMVPlayer::FinishBMV(void) { +void BMVPlayer::FinishBMV() { int i; // Notify the sound channel @@ -791,7 +791,7 @@ void BMVPlayer::FinishBMV(void) { /** * MaintainBuffer() */ -bool BMVPlayer::MaintainBuffer(void) { +bool BMVPlayer::MaintainBuffer() { int nextOffset; // No action if the file is all read @@ -880,7 +880,7 @@ bool BMVPlayer::MaintainBuffer(void) { /** * DoBMVFrame */ -bool BMVPlayer::DoBMVFrame(void) { +bool BMVPlayer::DoBMVFrame() { unsigned char *data; int graphOffset, length; signed short xscr; @@ -990,7 +990,7 @@ bool BMVPlayer::DoBMVFrame(void) { /** * DoSoundFrame */ -bool BMVPlayer::DoSoundFrame(void) { +bool BMVPlayer::DoSoundFrame() { unsigned char *data; int graphOffset; @@ -1064,7 +1064,7 @@ bool BMVPlayer::DoSoundFrame(void) { /** * CopyMovieToScreen */ -void BMVPlayer::CopyMovieToScreen(void) { +void BMVPlayer::CopyMovieToScreen() { // Not if not up and running yet! if (!screenBuffer || (currentFrame == 0)) { ForceEntireRedraw(); @@ -1090,7 +1090,7 @@ void BMVPlayer::CopyMovieToScreen(void) { /** * LookAtBuffers */ -void BMVPlayer::LookAtBuffers(void) { +void BMVPlayer::LookAtBuffers() { // FIXME: What's the point of this function??? static int junk; int i; @@ -1104,7 +1104,7 @@ void BMVPlayer::LookAtBuffers(void) { /** * Handles playback of any active movie. Called from the foreground 24 times a second. */ -void BMVPlayer::FettleBMV(void) { +void BMVPlayer::FettleBMV() { int refFrame; // Tick counter needs to be incrementing at a 24Hz rate @@ -1196,14 +1196,14 @@ void BMVPlayer::FettleBMV(void) { /** * Returns true if a movie is playing. */ -bool BMVPlayer::MoviePlaying(void) { +bool BMVPlayer::MoviePlaying() { return bMovieOn; } /** * Returns the audio lag in ms */ -int32 BMVPlayer::MovieAudioLag(void) { +int32 BMVPlayer::MovieAudioLag() { if (!bMovieOn || !audioStream) return 0; @@ -1212,11 +1212,11 @@ int32 BMVPlayer::MovieAudioLag(void) { return (playLength - (((int32) _vm->_mixer->getSoundElapsedTime(audioHandle)) << 10)) >> 10; } -uint32 BMVPlayer::NextMovieTime(void) { +uint32 BMVPlayer::NextMovieTime() { return nextMovieTime; } -void BMVPlayer::AbortMovie(void) { +void BMVPlayer::AbortMovie() { bAbort = true; } diff --git a/engines/tinsel/bmv.h b/engines/tinsel/bmv.h index 7891075315..a4e70a9efc 100644 --- a/engines/tinsel/bmv.h +++ b/engines/tinsel/bmv.h @@ -122,16 +122,16 @@ public: void PlayBMV(CORO_PARAM, SCNHANDLE hFileStem, int myEscape); void FinishBMV(); - void CopyMovieToScreen(void); - void FettleBMV(void); + void CopyMovieToScreen(); + void FettleBMV(); - bool MoviePlaying(void); + bool MoviePlaying(); - int32 MovieAudioLag(void); + int32 MovieAudioLag(); - uint32 NextMovieTime(void); + uint32 NextMovieTime(); - void AbortMovie(void); + void AbortMovie(); private: void InitBMV(byte *memoryBuffer); @@ -141,17 +141,17 @@ private: void StartMovieSound(); void FinishMovieSound(); void MovieAudio(int audioOffset, int blobs); - void FettleMovieText(void); + void FettleMovieText(); void BmvDrawText(bool bDraw); void MovieText(CORO_PARAM, int stringId, int x, int y, int fontId, COLORREF *pTalkColour, int duration); int MovieCommand(char cmd, int commandOffset); int FollowingPacket(int thisPacket, bool bReallyImportant); void LoadSlots(int number); - void InitialiseBMV(void); - bool MaintainBuffer(void); - bool DoBMVFrame(void); - bool DoSoundFrame(void); - void LookAtBuffers(void); + void InitialiseBMV(); + bool MaintainBuffer(); + bool DoBMVFrame(); + bool DoSoundFrame(); + void LookAtBuffers(); }; diff --git a/engines/tinsel/cliprect.cpp b/engines/tinsel/cliprect.cpp index 2ec9907149..69a71b874f 100644 --- a/engines/tinsel/cliprect.cpp +++ b/engines/tinsel/cliprect.cpp @@ -37,7 +37,7 @@ static RectList s_rectList; /** * Resets the clipping rectangle allocator. */ -void ResetClipRect(void) { +void ResetClipRect() { s_rectList.clear(); } diff --git a/engines/tinsel/config.cpp b/engines/tinsel/config.cpp index 29c6823436..86ba213398 100644 --- a/engines/tinsel/config.cpp +++ b/engines/tinsel/config.cpp @@ -55,7 +55,7 @@ int bAmerica = 0; /** * Write settings to config manager and flush the config file to disk. */ -void WriteConfig(void) { +void WriteConfig() { ConfMan.setInt("dclick_speed", dclickSpeed); ConfMan.setInt("music_volume", volMusic); ConfMan.setInt("sfx_volume", volSound); @@ -94,7 +94,7 @@ void WriteConfig(void) { /** * Read configuration settings from the config file into memory */ -void ReadConfig(void) { +void ReadConfig() { if (ConfMan.hasKey("dclick_speed")) dclickSpeed = ConfMan.getInt("dclick_speed"); diff --git a/engines/tinsel/config.h b/engines/tinsel/config.h index 85d5ca60e0..67655c58fc 100644 --- a/engines/tinsel/config.h +++ b/engines/tinsel/config.h @@ -46,8 +46,8 @@ extern int bSwapButtons; extern LANGUAGE g_language; extern int bAmerica; -void WriteConfig(void); -void ReadConfig(void); +void WriteConfig(); +void ReadConfig(); extern bool isJapanMode(); diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp index 15f8f05e07..dd5f024815 100644 --- a/engines/tinsel/cursor.cpp +++ b/engines/tinsel/cursor.cpp @@ -104,7 +104,7 @@ static int lastCursorX = 0, lastCursorY = 0; //----------------- FORWARD REFERENCES -------------------- -static void DoCursorMove(void); +static void DoCursorMove(); /** * Initialise and insert a cursor trail object, set its Z-pos, and hide @@ -232,7 +232,7 @@ void GetCursorXY(int *x, int *y, bool absolute) { * Called from TINLIB.C to restore cursor after hiding it. * Called from INVENTRY.C to restore cursor after customising it. */ -void RestoreMainCursor(void) { +void RestoreMainCursor() { const FILM *pfilm; if (McurObj != NULL) { @@ -256,7 +256,7 @@ void SetTempCursor(SCNHANDLE pScript) { /** * Hide the cursor. */ -void DwHideCursor(void) { +void DwHideCursor() { int i; bHiddenCursor = true; @@ -277,14 +277,14 @@ void DwHideCursor(void) { /** * Unhide the cursor. */ -void UnHideCursor(void) { +void UnHideCursor() { bHiddenCursor = false; } /** * Freeze the cursor. */ -void FreezeCursor(void) { +void FreezeCursor() { bFrozenCursor = true; } @@ -298,7 +298,7 @@ void DoFreezeCursor(bool bFreeze) { /** * HideCursorTrails */ -void HideCursorTrails(void) { +void HideCursorTrails() { int i; bTempNoTrailers = true; @@ -314,7 +314,7 @@ void HideCursorTrails(void) { /** * UnHideCursorTrails */ -void UnHideCursorTrails(void) { +void UnHideCursorTrails() { bTempNoTrailers = false; } @@ -356,7 +356,7 @@ IMAGE *GetImageFromFilm(SCNHANDLE hFilm, int reel, const FREEL **ppfr, const MUL /** * Delete auxillary cursor. Restore animation offsets in the image. */ -void DelAuxCursor(void) { +void DelAuxCursor() { if (AcurObj != NULL) { MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), AcurObj); AcurObj = NULL; @@ -402,7 +402,7 @@ void SetAuxCursor(SCNHANDLE hFilm) { /** * MoveCursor */ -static void DoCursorMove(void) { +static void DoCursorMove() { int startX, startY; Common::Point ptMouse; frac_t newX, newY; @@ -473,7 +473,7 @@ static void DoCursorMove(void) { /** * Initialise cursor object. */ -static void InitCurObj(void) { +static void InitCurObj() { const FILM *pFilm; const FREEL *pfr; const MULTI_INIT *pmi; @@ -503,7 +503,7 @@ static void InitCurObj(void) { /** * Initialise the cursor position. */ -static void InitCurPos(void) { +static void InitCurPos() { Common::Point ptMouse = _vm->getMousePosition(); lastCursorX = ptMouse.x; lastCursorY = ptMouse.y; @@ -629,7 +629,7 @@ void DwInitCursor(SCNHANDLE bfilm) { /** * DropCursor is called when a scene is closing down. */ -void DropCursor(void) { +void DropCursor() { if (TinselV2) { if (AcurObj) MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), AcurObj); @@ -656,7 +656,7 @@ void DropCursor(void) { /** * RestartCursor is called when a new scene is starting up. */ -void RestartCursor(void) { +void RestartCursor() { restart = 0x8000; // Get the main cursor to re-initialise } @@ -664,7 +664,7 @@ void RestartCursor(void) { * Called when restarting the game, ensures correct re-start with NULL * pointers etc. */ -void RebootCursor(void) { +void RebootCursor() { McurObj = AcurObj = NULL; for (int i = 0; i < MAX_TRAILERS; i++) ntrailData[i].trailObj = NULL; @@ -677,14 +677,14 @@ void RebootCursor(void) { restart = 0; } -void StartCursorFollowed(void) { +void StartCursorFollowed() { DelAuxCursor(); if (!SysVar(SV_ENABLEPRINTCURSOR)) bTempHide = true; } -void EndCursorFollowed(void) { +void EndCursorFollowed() { InventoryIconCursor(false); // May be holding something bTempHide = false; } diff --git a/engines/tinsel/cursor.h b/engines/tinsel/cursor.h index b3f7203f2b..71e846297c 100644 --- a/engines/tinsel/cursor.h +++ b/engines/tinsel/cursor.h @@ -38,22 +38,22 @@ void GetCursorXY(int *x, int *y, bool absolute); bool GetCursorXYNoWait(int *x, int *y, bool absolute); bool isCursorShown(); -void RestoreMainCursor(void); +void RestoreMainCursor(); void SetTempCursor(SCNHANDLE pScript); -void DwHideCursor(void); -void UnHideCursor(void); -void FreezeCursor(void); +void DwHideCursor(); +void UnHideCursor(); +void FreezeCursor(); void DoFreezeCursor(bool bFreeze); -void HideCursorTrails(void); -void UnHideCursorTrails(void); -void DelAuxCursor(void); +void HideCursorTrails(); +void UnHideCursorTrails(); +void DelAuxCursor(); void SetAuxCursor(SCNHANDLE hFilm); void DwInitCursor(SCNHANDLE bfilm); -void DropCursor(void); -void RestartCursor(void); -void RebootCursor(void); -void StartCursorFollowed(void); -void EndCursorFollowed(void); +void DropCursor(); +void RestartCursor(); +void RebootCursor(); +void StartCursorFollowed(); +void EndCursorFollowed(); } // End of namespace Tinsel diff --git a/engines/tinsel/debugger.cpp b/engines/tinsel/debugger.cpp index b3cb2d1b92..f422c88e94 100644 --- a/engines/tinsel/debugger.cpp +++ b/engines/tinsel/debugger.cpp @@ -38,11 +38,11 @@ namespace Tinsel { //----------------- EXTERNAL FUNCTIONS --------------------- // In PDISPLAY.CPP -extern void TogglePathDisplay(void); +extern void TogglePathDisplay(); // In tinsel.cpp extern void SetNewScene(SCNHANDLE scene, int entrance, int transition); // In scene.cpp -extern SCNHANDLE GetSceneHandle(void); +extern SCNHANDLE GetSceneHandle(); //----------------- SUPPORT FUNCTIONS --------------------- diff --git a/engines/tinsel/debugger.h b/engines/tinsel/debugger.h index 219bc71224..e3e7e7cd48 100644 --- a/engines/tinsel/debugger.h +++ b/engines/tinsel/debugger.h @@ -41,7 +41,7 @@ protected: bool cmd_string(int argc, const char **argv); public: Console(); - virtual ~Console(void); + virtual ~Console(); }; } // End of namespace Tinsel diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp index 1b318e69c2..ca760db0f5 100644 --- a/engines/tinsel/dialogs.cpp +++ b/engines/tinsel/dialogs.cpp @@ -77,10 +77,10 @@ extern int volMaster; //----------------- EXTERNAL FUNCTIONS --------------------- // Tag functions in PDISPLAY.C -extern void EnableTags(void); -extern void DisableTags(void); +extern void EnableTags(); +extern void DisableTags(); extern void DisablePointing(CORO_PARAM); -extern void EnablePointing(void); +extern void EnablePointing(); //----------------- LOCAL DEFINES -------------------- @@ -1054,7 +1054,7 @@ static void ConfActionSpecial(int i); /*-------------------------------------------------------------------------*/ -bool LanguageChange(void) { +bool LanguageChange() { LANGUAGE nLang = g_language; if (_vm->getFeatures() & GF_USE_3FLAGS) { @@ -1088,7 +1088,7 @@ bool LanguageChange(void) { * Read in the scene hopper data file and set the * pointers to the data and scene count. */ -static void PrimeSceneHopper(void) { +static void PrimeSceneHopper() { Common::File f; char *pBuffer; uint32 vSize; @@ -1166,11 +1166,11 @@ static void FirstScene(int first) { cd.extraBase = first; } -static void RememberChosenScene(void) { +static void RememberChosenScene() { bRemember = true; } -static void SetChosenScene(void) { +static void SetChosenScene() { lastChosenScene = cd.selBox + cd.extraBase; pChosenScene = &pHopper[cd.selBox + cd.extraBase]; } @@ -1202,7 +1202,7 @@ static void FirstEntry(int first) { cd.extraBase = first; } -void HopAction(void) { +void HopAction() { PHOPENTRY pEntry = pEntries + FROM_LE_32(pChosenScene->entryIndex) + cd.selBox + cd.extraBase; uint32 hScene = FROM_LE_32(pChosenScene->hScene); @@ -1226,7 +1226,7 @@ void HopAction(void) { /** * Delete all the objects in iconArray[] */ -static void DumpIconArray(void) { +static void DumpIconArray() { for (int i = 0; i < MAX_ICONS; i++) { if (iconArray[i] != NULL) { MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[i]); @@ -1238,7 +1238,7 @@ static void DumpIconArray(void) { /** * Delete all the objects in DobjArray[] */ -static void DumpDobjArray(void) { +static void DumpDobjArray() { for (int i = 0; i < MAX_WCOMP; i++) { if (DobjArray[i] != NULL) { MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), DobjArray[i]); @@ -1250,7 +1250,7 @@ static void DumpDobjArray(void) { /** * Delete all the objects in objArray[] */ -static void DumpObjArray(void) { +static void DumpObjArray() { for (int i = 0; i < MAX_WCOMP; i++) { if (objArray[i] != NULL) { MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), objArray[i]); @@ -1322,7 +1322,7 @@ bool IsInInventory(int object, int invnum) { /** * Returns which item is held (INV_NOICON (-1) if none) */ -int WhichItemHeld(void) { +int WhichItemHeld() { return HeldItem; } @@ -1349,11 +1349,11 @@ void InventoryIconCursor(bool bNewItem) { /** * Returns true if the inventory is active. */ -bool InventoryActive(void) { +bool InventoryActive() { return (InventoryState == ACTIVE_INV); } -int WhichInventoryOpen(void) { +int WhichInventoryOpen() { if (InventoryState != ACTIVE_INV) return 0; else @@ -1496,7 +1496,7 @@ void FirstFile(int first) { * Save the game using filename from selected slot & current description. */ -void InvSaveGame(void) { +void InvSaveGame() { if (cd.selBox != NOBOX) { #ifndef JAPAN sedit[strlen(sedit)-1] = 0; // Don't include the cursor! @@ -1508,7 +1508,7 @@ void InvSaveGame(void) { /** * Load the selected saved game. */ -void InvLoadGame(void) { +void InvLoadGame() { int rGame; if (cd.selBox != NOBOX && (cd.selBox+cd.extraBase < cd.numSaved)) { @@ -2494,7 +2494,7 @@ void InvLabels(bool InBody, int aniX, int aniY) { * It seems to set up slideStuff[], an array of possible first-displayed * icons set against the matching y-positions of the slider. */ -void AdjustTop(void) { +void AdjustTop() { int tMissing, bMissing, nMissing; int nsliderYpos; int rowsWanted; @@ -2580,7 +2580,7 @@ OBJECT *AddInvObject(int num, const FREEL **pfreel, const FILM **pfilm) { /** * Create display objects for the displayed icons in an inventory window. */ -void FillInInventory(void) { +void FillInInventory() { int Index; // Index into contents[] int n = 0; // index into iconArray[] int xpos, ypos; @@ -3115,7 +3115,7 @@ void ConstructInventory(InventoryType filling) { OBJECT **retObj; const FILM *pfilm; - extern bool RePosition(void); // Forward reference + extern bool RePosition(); // Forward reference // Select the object array to use if (filling == FULL || filling == CONF) { retObj = objArray; // Standard window @@ -3357,7 +3357,7 @@ void ConstructInventory(InventoryType filling) { * position of the Translucent object is within limits. If it isn't, * adjusts the x/y position of the current inventory and returns true. */ -bool RePosition(void) { +bool RePosition() { int p; bool bMoveitMoveit = false; @@ -3641,11 +3641,11 @@ void ConvPoly(HPOLYGON hPoly) { thisConvPoly = hPoly; } -int GetIcon(void) { +int GetIcon() { return thisIcon; } -void CloseDownConv(void) { +void CloseDownConv() { if (InventoryState == ACTIVE_INV && ino == INV_CONV) { KillInventory(); } @@ -3805,7 +3805,7 @@ void HideConversation(bool bHide) { } } -bool ConvIsHidden(void) { +bool ConvIsHidden() { return InventoryHidden; } @@ -4028,7 +4028,7 @@ void OpenMenu(CONFTYPE menuType) { * Close down an inventory window. */ -void KillInventory(void) { +void KillInventory() { if (objArray[0] != NULL) { DumpObjArray(); DumpDobjArray(); @@ -4066,7 +4066,7 @@ void KillInventory(void) { g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false); // Hide VK after save dialog closes } -void CloseInventory(void) { +void CloseInventory() { // If not active, ignore this if (InventoryState != ACTIVE_INV) return; @@ -4464,7 +4464,7 @@ static void SlideMSlider(int x, SSFN fn) { /** * Called from ChangeingSize() during re-sizing. */ -void GettingTaller(void) { +void GettingTaller() { if (SuppV) { Ychange += SuppV; if (Ycompensate == 'T') @@ -4488,7 +4488,7 @@ void GettingTaller(void) { /** * Called from ChangeingSize() during re-sizing. */ -void GettingShorter(void) { +void GettingShorter() { int StartNvi = InvD[ino].NoofVicons; int StartUv = SuppV; @@ -4513,7 +4513,7 @@ void GettingShorter(void) { /** * Called from ChangeingSize() during re-sizing. */ -void GettingWider(void) { +void GettingWider() { int StartNhi = InvD[ino].NoofHicons; int StartUh = SuppH; @@ -4536,7 +4536,7 @@ void GettingWider(void) { /** * Called from ChangeingSize() during re-sizing. */ -void GettingNarrower(void) { +void GettingNarrower() { int StartNhi = InvD[ino].NoofHicons; int StartUh = SuppH; @@ -4562,7 +4562,7 @@ void GettingNarrower(void) { /** * Called from Xmovement()/Ymovement() during re-sizing. */ -void ChangeingSize(void) { +void ChangeingSize() { /* Make it taller or shorter if necessary. */ if (Ychange > 0) GettingTaller(); @@ -4681,7 +4681,7 @@ void Ymovement(int y) { /** * Called when a drag is commencing. */ -void InvDragStart(void) { +void InvDragStart() { int curX, curY; // cursor's animation position GetCursorXY(&curX, &curY, false); @@ -4797,7 +4797,7 @@ void InvDragStart(void) { /** * Called when a drag is over. */ -void InvDragEnd(void) { +void InvDragEnd() { int curX, curY; // cursor's animation position GetCursorXY(&curX, &curY, false); @@ -4835,7 +4835,7 @@ void InvDragEnd(void) { Xchange = Ychange = 0; // Probably no need, but does no harm! } -static void MenuPageDown(void) { +static void MenuPageDown() { if (cd.box == loadBox || cd.box == saveBox) { if (cd.extraBase < MAX_SAVED_FILES-NUM_RGROUP_BOXES) { FirstFile(cd.extraBase+(NUM_RGROUP_BOXES - 1)); @@ -4864,7 +4864,7 @@ static void MenuPageDown(void) { } } -static void MenuPageUp(void) { +static void MenuPageUp() { if (cd.extraBase > 0) { if (cd.box == loadBox || cd.box == saveBox) FirstFile(cd.extraBase-(NUM_RGROUP_BOXES - 1)); @@ -5214,7 +5214,7 @@ static void InvWalkTo(const Common::Point &coOrds) { } } -void InvAction(void) { +void InvAction() { int index; INV_OBJECT *invObj; int aniX, aniY; @@ -5735,15 +5735,15 @@ void InvSetSize(int invno, int MinWidth, int MinHeight, /**************************************************************************/ -bool IsTopWindow(void) { +bool IsTopWindow() { return (InventoryState == BOGUS_INV); } -bool MenuActive(void) { +bool MenuActive() { return (InventoryState == ACTIVE_INV && ino == INV_CONF); } -bool IsConvWindow(void) { +bool IsConvWindow() { return (InventoryState == ACTIVE_INV && ino == INV_CONV); } diff --git a/engines/tinsel/dialogs.h b/engines/tinsel/dialogs.h index 9834d6ce57..a256ed73e8 100644 --- a/engines/tinsel/dialogs.h +++ b/engines/tinsel/dialogs.h @@ -86,7 +86,7 @@ void ButtonToInventory(PLR_EVENT be); void KeyToInventory(PLR_EVENT ke); -int WhichItemHeld(void); +int WhichItemHeld(); void HoldItem(int item, bool bKeepFilm = false); void DropItem(int item); @@ -104,16 +104,16 @@ void idec_inv1(SCNHANDLE text, int MaxContents, int MinWidth, int MinHeight, void idec_inv2(SCNHANDLE text, int MaxContents, int MinWidth, int MinHeight, int StartWidth, int StartHeight, int MaxWidth, int MaxHeight); -bool InventoryActive(void); +bool InventoryActive(); void PermaConvIcon(int icon, bool bEnd = false); void convPos(int bpos); void ConvPoly(HPOLYGON hp); -int GetIcon(void); -void CloseDownConv(void); +int GetIcon(); +void CloseDownConv(); void HideConversation(bool hide); -bool ConvIsHidden(void); +bool ConvIsHidden(); enum { NOOBJECT = -1, @@ -146,7 +146,7 @@ int InventoryPos(int num); bool IsInInventory(int object, int invnum); -void KillInventory(void); +void KillInventory(); void syncInvInfo(Common::Serializer &s); @@ -155,11 +155,11 @@ void InvSetLimit(int invno, int n); void InvSetSize(int invno, int MinWidth, int MinHeight, int StartWidth, int StartHeight, int MaxWidth, int MaxHeight); -int WhichInventoryOpen(void); +int WhichInventoryOpen(); -bool IsTopWindow(void); -bool MenuActive(void); -bool IsConvWindow(void); +bool IsTopWindow(); +bool MenuActive(); +bool IsConvWindow(); void SetObjectFilm(int object, SCNHANDLE hFilm); diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp index b611e386b1..efc7a2046d 100644 --- a/engines/tinsel/drives.cpp +++ b/engines/tinsel/drives.cpp @@ -63,7 +63,7 @@ void CdCD(CORO_PARAM) { CORO_END_CODE; } -int GetCurrentCD(void) { +int GetCurrentCD() { // count from 1 return (currentCD - '1' + 1); } @@ -97,7 +97,7 @@ int GetCD(int flags) { static uint32 lastTime = 0; extern LANGUAGE sampleLanguage; -void DoCdChange(void) { +void DoCdChange() { if (bChangingCD && (g_system->getMillis() > (lastTime + 1000))) { lastTime = g_system->getMillis(); _vm->_sound->closeSampleStream(); @@ -129,7 +129,7 @@ void SetNextCD(int cdNumber) { nextCD = (char)(cdNumber + '1' - 1); } -bool GotoCD(void) { +bool GotoCD() { // WORKAROUND: Somehow, CdDoChange() is called twice... Hopefully, this guard helps if (currentCD == nextCD) return false; diff --git a/engines/tinsel/drives.h b/engines/tinsel/drives.h index 51f9b0ca92..d2c161fa75 100644 --- a/engines/tinsel/drives.h +++ b/engines/tinsel/drives.h @@ -47,11 +47,11 @@ namespace Tinsel { extern char currentCD; -void DoCdChange(void); +void DoCdChange(); void CdCD(CORO_PARAM); -int GetCurrentCD(void); +int GetCurrentCD(); void SetCD(int flags); @@ -59,7 +59,7 @@ int GetCD(int flags); void SetNextCD(int cdNumber); -bool GotoCD(void); +bool GotoCD(); class TinselFile: public Common::File { private: diff --git a/engines/tinsel/events.cpp b/engines/tinsel/events.cpp index 55841e369d..8a9c4833a8 100644 --- a/engines/tinsel/events.cpp +++ b/engines/tinsel/events.cpp @@ -52,8 +52,8 @@ namespace Tinsel { //----------------- EXTERNAL FUNCTIONS --------------------- // in PDISPLAY.C -extern int GetTaggedActor(void); -extern HPOLYGON GetTaggedPoly(void); +extern int GetTaggedActor(); +extern HPOLYGON GetTaggedPoly(); //----------------- EXTERNAL GLOBAL DATA --------------------- @@ -78,12 +78,12 @@ static bool bProvNotProcessed = false; * Gets called before each schedule, only 1 user action per schedule * is allowed. */ -void ResetEcount(void) { +void ResetEcount() { eCount = 0; } -void IncUserEvents(void) { +void IncUserEvents() { userEvents++; lastUserEvent = DwGetCurrentTime(); } @@ -120,7 +120,7 @@ void AllowDclick(CORO_PARAM, PLR_EVENT be) { /** * Re-enables user control */ -void ControlOn(void) { +void ControlOn() { if (!TinselV2) { Control(CONTROL_ON); return; @@ -150,7 +150,7 @@ void ControlOn(void) { /** * Takes control from the user */ -void ControlOff(void) { +void ControlOff() { if (!TinselV2) { Control(CONTROL_ON); return; @@ -176,7 +176,7 @@ void ControlOff(void) { /** * Prevent tags and cursor re-appearing */ -void ControlStartOff(void) { +void ControlStartOff() { if (!TinselV2) { Control(CONTROL_STARTOFF); return; @@ -211,7 +211,7 @@ bool GetControl(int param) { return false; } -bool GetControl(void) { +bool GetControl() { if (controlState == CONTROL_ON) { ControlOff(); return true; @@ -219,7 +219,7 @@ bool GetControl(void) { return false; } -bool ControlIsOn(void) { +bool ControlIsOn() { if (TinselV2) return (controlState == CONTROL_ON); @@ -484,14 +484,14 @@ void PlayerEvent(PLR_EVENT pEvent, const Common::Point &coOrds) { /** * For ESCapable Glitter sequences */ -int GetEscEvents(void) { +int GetEscEvents() { return escEvents; } /** * For cutting short talk()s etc. */ -int GetLeftEvents(void) { +int GetLeftEvents() { return leftEvents; } @@ -506,15 +506,15 @@ bool LeftEventChange(int myleftEvent) { /** * For waitkey() Glitter function */ -int getUserEvents(void) { +int getUserEvents() { return userEvents; } -uint32 getUserEventTime(void) { +uint32 getUserEventTime() { return DwGetCurrentTime() - lastUserEvent; } -void resetUserEventTime(void) { +void resetUserEventTime() { lastUserEvent = DwGetCurrentTime(); } @@ -653,14 +653,14 @@ void effRunPolyTinselCode(HPOLYGON hPoly, TINSEL_EVENT event, int actor) { * If provisional event was processed, calling this prevents the * subsequent 'real' event. */ -void ProcessedProvisional(void) { +void ProcessedProvisional() { bProvNotProcessed = false; } /** * Resets the bProvNotProcessed flag */ -void ProvNotProcessed(void) { +void ProvNotProcessed() { bProvNotProcessed = true; } diff --git a/engines/tinsel/events.h b/engines/tinsel/events.h index 38fbb69715..c585365d4f 100644 --- a/engines/tinsel/events.h +++ b/engines/tinsel/events.h @@ -105,11 +105,11 @@ const TINSEL1_EVENT TINSEL1_EVENT_MAP[] = { void AllowDclick(CORO_PARAM, PLR_EVENT be); bool GetControl(int param); -bool GetControl(void); -bool ControlIsOn(void); -void ControlOn(void); -void ControlOff(void); -void ControlStartOff(void); +bool GetControl(); +bool ControlIsOn(); +void ControlOn(); +void ControlOff(); +void ControlStartOff(); void RunPolyTinselCode(HPOLYGON hPoly, TINSEL_EVENT event, PLR_EVENT be, bool tc); void effRunPolyTinselCode(HPOLYGON hPoly, TINSEL_EVENT event, int actor); @@ -118,16 +118,16 @@ void ProcessButEvent(PLR_EVENT be); void ProcessKeyEvent(PLR_EVENT ke); -int GetEscEvents(void); -int GetLeftEvents(void); +int GetEscEvents(); +int GetLeftEvents(); bool LeftEventChange(int myleftEvent); -int getUserEvents(void); +int getUserEvents(); -uint32 getUserEventTime(void); -void resetUserEventTime(void); +uint32 getUserEventTime(); +void resetUserEventTime(); -void ResetEcount(void); +void ResetEcount(); void PolygonEvent(CORO_PARAM, HPOLYGON hPoly, TINSEL_EVENT tEvent, int actor, bool bWait, int myEscape, bool *result = NULL); @@ -135,8 +135,8 @@ void PolygonEvent(CORO_PARAM, HPOLYGON hPoly, TINSEL_EVENT tEvent, int actor, bo void PlayerEvent(PLR_EVENT pEvent, const Common::Point &coOrds); -void ProcessedProvisional(void); -void ProvNotProcessed(void); +void ProcessedProvisional(); +void ProvNotProcessed(); bool GetProvNotProcessed(); } // End of namespace Tinsel diff --git a/engines/tinsel/faders.cpp b/engines/tinsel/faders.cpp index 1500a56c6d..de04e4a33e 100644 --- a/engines/tinsel/faders.cpp +++ b/engines/tinsel/faders.cpp @@ -234,7 +234,7 @@ void FadeInFast(SCNHANDLE noFadeTable[]) { Fader(fadein, noFadeTable); } -void PokeInTagColour(void) { +void PokeInTagColour() { if (SysVar(SV_TAGCOLOUR)) { static COLORREF c = GetActorRGB(-1); UpdateDACqueue(SysVar(SV_TAGCOLOUR), 1, &c); diff --git a/engines/tinsel/faders.h b/engines/tinsel/faders.h index b6993039c4..e77bff2661 100644 --- a/engines/tinsel/faders.h +++ b/engines/tinsel/faders.h @@ -50,7 +50,7 @@ void FadeOutMedium(SCNHANDLE noFadeTable[]); void FadeOutFast(SCNHANDLE noFadeTable[]); void FadeInMedium(SCNHANDLE noFadeTable[]); void FadeInFast(SCNHANDLE noFadeTable[]); -void PokeInTagColour(void); +void PokeInTagColour(); } // End of namespace Tinsel diff --git a/engines/tinsel/font.cpp b/engines/tinsel/font.cpp index 10427b6e3b..ae7da65473 100644 --- a/engines/tinsel/font.cpp +++ b/engines/tinsel/font.cpp @@ -85,7 +85,7 @@ void SetTempTalkFontHandle(SCNHANDLE hFont) { hTalkFont = hFont; } -void ResetFontHandles(void) { +void ResetFontHandles() { hTagFont = hRegularTagFont; hTalkFont = hRegularTalkFont; } diff --git a/engines/tinsel/font.h b/engines/tinsel/font.h index e6e202fe6f..e5f5ece201 100644 --- a/engines/tinsel/font.h +++ b/engines/tinsel/font.h @@ -35,11 +35,11 @@ namespace Tinsel { #define TBUFSZ 512 -char *TextBufferAddr(void); +char *TextBufferAddr(); -SCNHANDLE GetTagFontHandle(void); +SCNHANDLE GetTagFontHandle(); -SCNHANDLE GetTalkFontHandle(void); +SCNHANDLE GetTalkFontHandle(); void SetTagFontHandle(SCNHANDLE hFont); @@ -49,7 +49,7 @@ void SetTempTagFontHandle(SCNHANDLE hFont); void SetTempTalkFontHandle(SCNHANDLE hFont); -void ResetFontHandles(void); +void ResetFontHandles(); void FettleFontPal(SCNHANDLE fontPal); diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp index 8c88608fa9..82d77a2904 100644 --- a/engines/tinsel/handle.cpp +++ b/engines/tinsel/handle.cpp @@ -93,7 +93,7 @@ static void LoadFile(MEMHANDLE *pH); // load a memory block as a file * Loads the graphics handle table index file and preloads all the * permanent graphics etc. */ -void SetupHandleTable(void) { +void SetupHandleTable() { bool t2Flag = (TinselVersion == TINSEL_V2); int RECORD_SIZE = t2Flag ? 24 : 20; @@ -174,7 +174,7 @@ void SetupHandleTable(void) { } } -void FreeHandleTable(void) { +void FreeHandleTable() { if (handleTable) { free(handleTable); handleTable = NULL; @@ -186,7 +186,7 @@ void FreeHandleTable(void) { /** * Loads a memory block as a file. */ -void OpenCDGraphFile(void) { +void OpenCDGraphFile() { if (cdGraphStream.isOpen()) cdGraphStream.close(); diff --git a/engines/tinsel/handle.h b/engines/tinsel/handle.h index 4665124e5a..c3c303a1e9 100644 --- a/engines/tinsel/handle.h +++ b/engines/tinsel/handle.h @@ -38,8 +38,8 @@ namespace Tinsel { /** * Loads the graphics handle table index file and preloads all the permanent graphics etc. */ -void SetupHandleTable(void); -void FreeHandleTable(void); +void SetupHandleTable(); +void FreeHandleTable(); byte *LockMem(SCNHANDLE offset); diff --git a/engines/tinsel/heapmem.cpp b/engines/tinsel/heapmem.cpp index 66a30d9b0b..fa05c3717b 100644 --- a/engines/tinsel/heapmem.cpp +++ b/engines/tinsel/heapmem.cpp @@ -70,7 +70,7 @@ MEM_NODE s_fixedMnodesList[5]; static MEM_NODE heapSentinel; // -static MEM_NODE *AllocMemNode(void); +static MEM_NODE *AllocMemNode(); #ifdef DEBUG static void MemoryStats() { @@ -155,7 +155,7 @@ void MemoryDeinit() { /** * Allocate a mnode from the free list. */ -static MEM_NODE *AllocMemNode(void) { +static MEM_NODE *AllocMemNode() { // get the first free mnode MEM_NODE *pMemNode = pFreeMemNodes; diff --git a/engines/tinsel/mareels.cpp b/engines/tinsel/mareels.cpp index e0419cc1ec..33e96ece58 100644 --- a/engines/tinsel/mareels.cpp +++ b/engines/tinsel/mareels.cpp @@ -169,7 +169,7 @@ SCNHANDLE ScalingReel(int ano, int scale1, int scale2, DIRECTION reel) { /** * RebootScalingReels */ -void RebootScalingReels(void) { +void RebootScalingReels() { scrEntries = 0; memset(SCIdata, 0, sizeof(SCIdata)); } @@ -177,7 +177,7 @@ void RebootScalingReels(void) { /** * Discourage them from being ditched. */ -void TouchMoverReels(void) { +void TouchMoverReels() { PMOVER pMover; int scale; diff --git a/engines/tinsel/mareels.h b/engines/tinsel/mareels.h index 8421fa2ff4..c31ceafbf4 100644 --- a/engines/tinsel/mareels.h +++ b/engines/tinsel/mareels.h @@ -47,9 +47,9 @@ void SetScalingReels(int actor, int scale, int direction, SCNHANDLE ScalingReel(int ano, int scale1, int scale2, DIRECTION reel); -void RebootScalingReels(void); +void RebootScalingReels(); -void TouchMoverReels(void); +void TouchMoverReels(); } // End of namespace Tinsel diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp index 84caa5082d..f854dba2fd 100644 --- a/engines/tinsel/move.cpp +++ b/engines/tinsel/move.cpp @@ -1709,11 +1709,11 @@ void SetDefaultRefer(int32 defRefer) { DefaultRefer = defRefer; } -int GetLastLeadXdest(void) { +int GetLastLeadXdest() { return lastLeadXdest; } -int GetLastLeadYdest(void) { +int GetLastLeadYdest() { return lastLeadYdest; } diff --git a/engines/tinsel/move.h b/engines/tinsel/move.h index 86100fae8e..027a89f67e 100644 --- a/engines/tinsel/move.h +++ b/engines/tinsel/move.h @@ -40,8 +40,8 @@ void SSetActorDest(MOVER *pActor); void DoMoveActor(MOVER *pMover); void SetDefaultRefer(int32 defRefer); -int GetLastLeadXdest(void); -int GetLastLeadYdest(void); +int GetLastLeadXdest(); +int GetLastLeadYdest(); DIRECTION GetDirection(int fromx, int fromy, int tox, int toy, DIRECTION lastreel, HPOLYGON hPath, YBIAS yBias = YB_X2); diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 568bbbd637..7bce8a3bd6 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -289,7 +289,7 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { /** * Returns TRUE if a Midi tune is currently playing. */ -bool MidiPlaying(void) { +bool MidiPlaying() { if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) { if (AudioCD.isPlaying()) return true; @@ -300,7 +300,7 @@ bool MidiPlaying(void) { /** * Stops any currently playing midi. */ -bool StopMidi(void) { +bool StopMidi() { currentMidi = 0; currentLoop = false; @@ -352,7 +352,7 @@ void SetMidiVolume(int vol) { /** * Opens and inits all MIDI sequence files. */ -void OpenMidiFiles(void) { +void OpenMidiFiles() { Common::File midiStream; // Demo version has no midi file diff --git a/engines/tinsel/music.h b/engines/tinsel/music.h index 1909430c32..069c03c979 100644 --- a/engines/tinsel/music.h +++ b/engines/tinsel/music.h @@ -40,9 +40,9 @@ bool PlayMidiSequence( // Plays the specified MIDI sequence through the sound d uint32 dwFileOffset, // handle of MIDI sequence data bool bLoop); // Whether to loop the sequence -bool MidiPlaying(void); // Returns TRUE if a Midi tune is currently playing +bool MidiPlaying(); // Returns TRUE if a Midi tune is currently playing -bool StopMidi(void); // Stops any currently playing midi +bool StopMidi(); // Stops any currently playing midi void SetMidiVolume( // Sets the volume of the MIDI music. Returns the old volume int vol); // new volume - 0..MAXMIDIVOL @@ -90,7 +90,7 @@ public: // The original sets the "sequence timing" to 109 Hz, whatever that // means. The default is 120. - uint32 getBaseTempo(void) { return _driver ? (109 * _driver->getBaseTempo()) / 120 : 0; } + uint32 getBaseTempo() { return _driver ? (109 * _driver->getBaseTempo()) / 120 : 0; } //Channel allocation functions MidiChannel *allocateChannel() { return 0; } diff --git a/engines/tinsel/object.cpp b/engines/tinsel/object.cpp index a308745743..9de8202795 100644 --- a/engines/tinsel/object.cpp +++ b/engines/tinsel/object.cpp @@ -48,7 +48,7 @@ static int numObj = 0; static int maxObj = 0; #endif -void FreeObjectList(void) { +void FreeObjectList() { if (objectList) { free(objectList); objectList = NULL; @@ -59,7 +59,7 @@ void FreeObjectList(void) { * Kills all objects and places them on the free list. */ -void KillAllObjects(void) { +void KillAllObjects() { int i; #ifdef DEBUG @@ -95,7 +95,7 @@ void KillAllObjects(void) { * Shows the maximum number of objects used at once. */ -void ObjectStats(void) { +void ObjectStats() { printf("%i objects of %i used.\n", maxObj, NUM_OBJECTS); } #endif @@ -103,7 +103,7 @@ void ObjectStats(void) { /** * Allocate a object from the free list. */ -OBJECT *AllocObject(void) { +OBJECT *AllocObject() { OBJECT *pObj = pFreeObjects; // get a free object // check for no free objects diff --git a/engines/tinsel/object.h b/engines/tinsel/object.h index 88854502e7..5725445b62 100644 --- a/engines/tinsel/object.h +++ b/engines/tinsel/object.h @@ -117,15 +117,15 @@ struct OBJ_INIT { |* Object Function Prototypes *| \*----------------------------------------------------------------------*/ -void KillAllObjects(void); // kill all objects and place them on free list +void KillAllObjects(); // kill all objects and place them on free list -void FreeObjectList(void); // free the object list +void FreeObjectList(); // free the object list #ifdef DEBUG -void ObjectStats(void); // Shows the maximum number of objects used at once +void ObjectStats(); // Shows the maximum number of objects used at once #endif -OBJECT *AllocObject(void); // allocate a object from the free list +OBJECT *AllocObject(); // allocate a object from the free list void FreeObject( // place a object back on the free list OBJECT *pFreeObj); // object to free diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp index a6e0a81406..1e139ccb3f 100644 --- a/engines/tinsel/palette.cpp +++ b/engines/tinsel/palette.cpp @@ -130,7 +130,7 @@ void psxPaletteMapper(PALQ *originalPal, uint8 *psxClut, byte *mapperTable) { /** * Transfer palettes in the palette Q to Video DAC. */ -void PalettesToVideoDAC(void) { +void PalettesToVideoDAC() { PALQ *pPalQ; // palette Q iterator VIDEO_DAC_Q *pDACtail = vidDACdata; // set tail pointer @@ -180,7 +180,7 @@ void PalettesToVideoDAC(void) { /** * Commpletely reset the palette allocator. */ -void ResetPalAllocator(void) { +void ResetPalAllocator() { #ifdef DEBUG // clear number of palettes in use numPals = 0; @@ -197,7 +197,7 @@ void ResetPalAllocator(void) { /** * Shows the maximum number of palettes used at once. */ -void PaletteStats(void) { +void PaletteStats() { printf("%i palettes of %i used.\n", maxPals, NUM_PALETTES); printf("%i DAC queue entries of %i used.\n", maxDACQ, VDACQLENGTH); } @@ -494,7 +494,7 @@ void FadingPalette(PPALQ pPalQ, bool bFading) { * All fading processes have just been killed, so none of the * palettes are fading. */ -void NoFadingPalettes(void) { +void NoFadingPalettes() { PPALQ pPalQ; for (pPalQ = palAllocData; pPalQ <= palAllocData + NUM_PALETTES - 1; pPalQ++) { @@ -614,11 +614,11 @@ void DimPartPalette(SCNHANDLE hDimPal, int startColour, int length, int brightne } } -int TranslucentColour(void) { +int TranslucentColour() { return translucentIndex; } -int HighlightColour(void) { +int HighlightColour() { static COLORREF cRef; cRef = (COLORREF)SysVar(SYS_HighlightRGB); @@ -627,7 +627,7 @@ int HighlightColour(void) { return talkIndex; } -int TalkColour(void) { +int TalkColour() { return TinselV2 ? talkIndex : TALKFONT_COL; } @@ -635,7 +635,7 @@ void SetTalkColourRef(COLORREF colRef) { talkColRef = colRef; } -COLORREF GetTalkColourRef(void) { +COLORREF GetTalkColourRef() { return talkColRef; } @@ -643,7 +643,7 @@ void SetTagColorRef(COLORREF colRef) { tagColRef = colRef; } -COLORREF GetTagColorRef(void) { +COLORREF GetTagColorRef() { return tagColRef; } diff --git a/engines/tinsel/palette.h b/engines/tinsel/palette.h index 1fb34a0782..e4cee3e301 100644 --- a/engines/tinsel/palette.h +++ b/engines/tinsel/palette.h @@ -103,15 +103,15 @@ typedef PALQ *PPALQ; |* Palette Manager Function Prototypes *| \*----------------------------------------------------------------------*/ -void ResetPalAllocator(void); // wipe out all palettes +void ResetPalAllocator(); // wipe out all palettes #ifdef DEBUG -void PaletteStats(void); // Shows the maximum number of palettes used at once +void PaletteStats(); // Shows the maximum number of palettes used at once #endif void psxPaletteMapper(PALQ *originalPal, uint8 *psxClut, byte *mapperTable); // Maps PSX CLUTs to original palette in resource file -void PalettesToVideoDAC(void); // Update the video DAC with palettes currently the the DAC queue +void PalettesToVideoDAC(); // Update the video DAC with palettes currently the the DAC queue void UpdateDACqueueHandle( int posInDAC, // position in video DAC @@ -139,7 +139,7 @@ void SwapPalette( // swaps palettes at the specified palette queue position PALQ *GetNextPalette( // returns the next palette in the queue PALQ *pStrtPal); // queue position to start from - when NULL will start from beginning of queue -COLORREF GetBgndColour(void); // returns current background colour +COLORREF GetBgndColour(); // returns current background colour void SetBgndColour( // sets current background colour COLORREF colour); // colour to set the background to @@ -150,7 +150,7 @@ void CreateTranslucentPalette(SCNHANDLE BackPal); void CreateGhostPalette(SCNHANDLE hPalette); -void NoFadingPalettes(void); // All fading processes have just been killed +void NoFadingPalettes(); // All fading processes have just been killed void DimPartPalette( SCNHANDLE hPal, @@ -159,21 +159,21 @@ void DimPartPalette( int brightness); // 0 = black, 10 == 100% -int TranslucentColour(void); +int TranslucentColour(); #define BoxColour TranslucentColour -int HighlightColour(void); +int HighlightColour(); -int TalkColour(void); +int TalkColour(); void SetTalkColourRef(COLORREF colRef); -COLORREF GetTalkColourRef(void); +COLORREF GetTalkColourRef(); void SetTagColorRef(COLORREF colRef); -COLORREF GetTagColorRef(void); +COLORREF GetTagColorRef(); void SetTalkTextOffset(int offset); diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp index aa8d4c1442..29f1753249 100644 --- a/engines/tinsel/pcode.cpp +++ b/engines/tinsel/pcode.cpp @@ -279,7 +279,7 @@ void FreeInterpretContextPr(PROCESS *pProc) { /** * Free all interpret contexts except for the master script's */ -void FreeMostInterpretContexts(void) { +void FreeMostInterpretContexts() { INT_CONTEXT *pic; int i; @@ -294,7 +294,7 @@ void FreeMostInterpretContexts(void) { /** * Free the master script's interpret context. */ -void FreeMasterInterpretContext(void) { +void FreeMasterInterpretContext() { INT_CONTEXT *pic; int i; @@ -413,7 +413,7 @@ void RegisterGlobals(int num) { } } -void FreeGlobals(void) { +void FreeGlobals() { free(pGlobals); pGlobals = NULL; @@ -807,7 +807,7 @@ void AttachInterpret(INT_CONTEXT *pic, PROCESS *pProc) { /** * Generate a number that isn't being used. */ -static uint32 UniqueWaitNumber(void) { +static uint32 UniqueWaitNumber() { uint32 retval; int i; @@ -885,7 +885,7 @@ void WaitInterpret(CORO_PARAM, PPROCESS pWaitProc, bool *result) { /** * CheckOutWaiters */ -void CheckOutWaiters(void) { +void CheckOutWaiters() { int i, j; // Check all waited for have someone waiting diff --git a/engines/tinsel/pcode.h b/engines/tinsel/pcode.h index 81feb5c241..e01727ee35 100644 --- a/engines/tinsel/pcode.h +++ b/engines/tinsel/pcode.h @@ -118,13 +118,13 @@ INT_CONTEXT *InitInterpretContext( INT_CONTEXT *RestoreInterpretContext(INT_CONTEXT *ric); -void FreeMostInterpretContexts(void); -void FreeMasterInterpretContext(void); +void FreeMostInterpretContexts(); +void FreeMasterInterpretContext(); void SaveInterpretContexts(INT_CONTEXT *sICInfo); void RegisterGlobals(int num); -void FreeGlobals(void); +void FreeGlobals(); void AttachInterpret(INT_CONTEXT *pic, PROCESS *pProc); diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp index 25e3ec0a5e..7a092f25f7 100644 --- a/engines/tinsel/pdisplay.cpp +++ b/engines/tinsel/pdisplay.cpp @@ -288,7 +288,7 @@ void DisablePointing(CORO_PARAM) { /** * EnablePointing() */ -void EnablePointing(void) { +void EnablePointing() { bPointingActive = true; } @@ -304,7 +304,7 @@ static void SaveTaggedActor(int ano) { * Tag process keeps us updated as to which tagged actor is currently tagged * (if one is). Tag process asks us for this information, as does ProcessUserEvent(). */ -int GetTaggedActor(void) { +int GetTaggedActor() { return TaggedActor; } @@ -316,7 +316,7 @@ static void SaveTaggedPoly(HPOLYGON hp) { hTaggedPolygon = hp; } -HPOLYGON GetTaggedPoly(void) { +HPOLYGON GetTaggedPoly() { return hTaggedPolygon; } @@ -817,15 +817,15 @@ void PointProcess(CORO_PARAM, const void *) { CORO_END_CODE; } -void DisableTags(void) { +void DisableTags() { bTagsActive = false; } -void EnableTags(void) { +void EnableTags() { bTagsActive = true; } -bool DisableTagsIfEnabled(void) { +bool DisableTagsIfEnabled() { if (bTagsActive) { DisableTags(); return true; @@ -838,12 +838,12 @@ bool DisableTagsIfEnabled(void) { * Causes CursorPositionProcess() to display, or not, the path that the * cursor is in. */ -void TogglePathDisplay(void) { +void TogglePathDisplay() { DispPath ^= 1; // Toggle path display (XOR with true) } -void setshowstring(void) { +void setshowstring() { bShowString = true; } diff --git a/engines/tinsel/pdisplay.h b/engines/tinsel/pdisplay.h index d2efc23f96..f720da639d 100644 --- a/engines/tinsel/pdisplay.h +++ b/engines/tinsel/pdisplay.h @@ -29,8 +29,8 @@ namespace Tinsel { -void EnableTags(void); -void DisableTags(void); +void EnableTags(); +void DisableTags(); } // End of namespace Tinsel diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp index ae40c11ae9..54281c9d7a 100644 --- a/engines/tinsel/play.cpp +++ b/engines/tinsel/play.cpp @@ -164,7 +164,7 @@ static int RegisterSoundReel(SCNHANDLE hFilm, int column, int actorCol) { return i; } -void NoSoundReels(void) { +void NoSoundReels() { memset(soundReels, 0, sizeof(soundReels)); soundReelWait = 0; } @@ -393,7 +393,7 @@ static void ResSoundReel(CORO_PARAM, const void *) { CORO_END_CODE; } -static void SoundReelWaitCheck(void) { +static void SoundReelWaitCheck() { if (--soundReelWait == 0) { for (int i = 0; i < MAX_SOUNDREELS; i++) { if (soundReels[i].hFilm) { diff --git a/engines/tinsel/play.h b/engines/tinsel/play.h index aa622e835e..2e981b1e2e 100644 --- a/engines/tinsel/play.h +++ b/engines/tinsel/play.h @@ -55,7 +55,7 @@ void RestoreActorReels(SCNHANDLE hFilm, int actor, int x, int y); void PokeInPalette(const MULTI_INIT *pmi); -void NoSoundReels(void); +void NoSoundReels(); void SaveSoundReels(PSOUNDREELS psr); void RestoreSoundReels(PSOUNDREELS psr); diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp index 36723b3265..7fc7fcd218 100644 --- a/engines/tinsel/polygons.cpp +++ b/engines/tinsel/polygons.cpp @@ -1169,7 +1169,7 @@ static int currentEScene = 0; bool deadPolys[MAX_POLY]; // Currently just for dead blocks -void RebootDeadTags(void) { +void RebootDeadTags() { nextfreeT = numScenesT = 0; nextfreeE = numScenesE = 0; @@ -1258,7 +1258,7 @@ static HPOLYGON FindPolygon(PTYPE type, int id) { return NOPOLY; } -HPOLYGON FirstPathPoly(void) { +HPOLYGON FirstPathPoly() { for (int i = 0; i < noofPolys; i++) { if (Polys[i]->polyType == PATH) return i; @@ -1745,7 +1745,7 @@ static void InitTag(const Poly &ptp, int pno, bool bRestart) { /** * Called at the restart of a scene, nobbles polygons which are dead. */ -static void KillDeadPolygons(void) { +static void KillDeadPolygons() { int i; for (i = 0; i < MAX_POLY; i++) { @@ -2072,7 +2072,7 @@ void GetPolyMidBottom( HPOLYGON hp, int *pX, int *pY) { *pX = (Polys[hp]->pleft + Polys[hp]->pright)/2 + volatileStuff[hp].xoff; } -int PathCount(void) { +int PathCount() { int i, count; for (i = 0, count = 0; i < noofPolys; i++) { diff --git a/engines/tinsel/polygons.h b/engines/tinsel/polygons.h index 23beb76d6c..4be1dabf98 100644 --- a/engines/tinsel/polygons.h +++ b/engines/tinsel/polygons.h @@ -98,7 +98,7 @@ SCNHANDLE GetPolyScript(HPOLYGON p); REEL GetPolyReelType(HPOLYGON p); int32 GetPolyZfactor(HPOLYGON p); int numNodes(HPOLYGON pp); -void RebootDeadTags(void); +void RebootDeadTags(); void DisableBlock(int block); void EnableBlock(int block); void DisableEffect(int effect); @@ -112,10 +112,10 @@ void DisableTag(CORO_PARAM, int tag); void EnableTag(CORO_PARAM, int tag); void DisableExit(int exitno); void EnableExit(int exitno); -HPOLYGON FirstPathPoly(void); +HPOLYGON FirstPathPoly(); HPOLYGON GetPolyHandle(int i); void InitPolygons(SCNHANDLE ph, int numPoly, bool bRestart); -void DropPolygons(void); +void DropPolygons(); void SaveDeadPolys(bool *sdp); @@ -150,7 +150,7 @@ bool PolyTagFollowsCursor(HPOLYGON hp); SCNHANDLE GetPolyTagHandle(HPOLYGON hp); bool IsTagPolygon(int tagno); void GetPolyMidBottom(HPOLYGON hp, int *pX, int *pY); -int PathCount(void); +int PathCount(); void MovePolygon(PTYPE ptype, int id, int x, int y); void MovePolygonTo(PTYPE ptype, int id, int x, int y); diff --git a/engines/tinsel/rince.cpp b/engines/tinsel/rince.cpp index 21cbb76127..cfffe88587 100644 --- a/engines/tinsel/rince.cpp +++ b/engines/tinsel/rince.cpp @@ -116,7 +116,7 @@ void MoverBrightness(PMOVER pMover, int brightness) { /** * RebootMovers */ -void RebootMovers(void) { +void RebootMovers() { memset(Movers, 0, sizeof(Movers)); } @@ -392,7 +392,7 @@ static void InitMover(PMOVER pMover) { * Get it into our heads that there's nothing doing. * Called at the end of a scene. */ -void DropMovers(void) { +void DropMovers() { for (int i = 0; i < MAX_MOVERS; i++) InitMover(&Movers[i]); } diff --git a/engines/tinsel/rince.h b/engines/tinsel/rince.h index aa6f16d795..57eac00fa4 100644 --- a/engines/tinsel/rince.h +++ b/engines/tinsel/rince.h @@ -161,7 +161,7 @@ bool MoverIsSWalking(PMOVER pMover); bool MoverMoving(PMOVER pMover); int GetWalkNumber(PMOVER pMover); void UnHideMover(PMOVER pMover); -void DropMovers(void); +void DropMovers(); void PositionMover(PMOVER pMover, int x, int y); void GetMoverPosition(PMOVER pMover, int *aniX, int *aniY); @@ -181,7 +181,7 @@ void SetMoverWalkReel(PMOVER pMover, DIRECTION reel, int scale, bool force); PMOVER InMoverBlock(PMOVER pMover, int x, int y); -void RebootMovers(void); +void RebootMovers(); bool IsMAinEffectPoly(int index); void SetMoverInEffect(int index, bool tf); diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp index e265c434ef..0e529cb3cc 100644 --- a/engines/tinsel/saveload.cpp +++ b/engines/tinsel/saveload.cpp @@ -78,7 +78,7 @@ SRSTATE SRstate = SR_IDLE; extern void syncSCdata(Common::Serializer &s); // in DOS_MAIN.C -//char HardDriveLetter(void); +//char HardDriveLetter(); // in PCODE.C extern void syncGlobInfo(Common::Serializer &s); @@ -273,7 +273,7 @@ static void syncSavedData(Common::Serializer &s, SAVED_DATA &sd) { * Called when saving a game to a new file. * Generates a new, unique, filename. */ -static char *NewName(void) { +static char *NewName() { static char result[FNAMELEN]; int i; int ano = 1; // Allocated number @@ -379,7 +379,7 @@ int getList(Common::SaveFileManager *saveFileMan, const Common::String &target) return numSfiles; } -int getList(void) { +int getList() { // No change since last call? // TODO/FIXME: Just always reload this data? Be careful about slow downs!!! if (!NeedLoad) @@ -482,7 +482,7 @@ static bool DoRestore() { /** * DoSave */ -static void DoSave(void) { +static void DoSave() { Common::OutSaveFile *f; const char *fname; @@ -537,7 +537,7 @@ save_failure: /** * ProcessSRQueue */ -void ProcessSRQueue(void) { +void ProcessSRQueue() { switch (SRstate) { case SR_DORESTORE: // If a load has been done directly from title screens, set a larger value for scene ctr so the @@ -594,7 +594,7 @@ void RequestRestoreGame(int num, SAVED_DATA *sd, int *pSsCount, SAVED_DATA *pSsD * Returns the index of the most recently saved savegame. This will always be * the file at the first index, since the list is sorted by date/time */ -int NewestSavedGame(void) { +int NewestSavedGame() { int numFiles = getList(); return (numFiles == 0) ? -1 : 0; diff --git a/engines/tinsel/savescn.cpp b/engines/tinsel/savescn.cpp index ed845c59f7..cbbfe8572a 100644 --- a/engines/tinsel/savescn.cpp +++ b/engines/tinsel/savescn.cpp @@ -53,7 +53,7 @@ namespace Tinsel { //----------------- EXTERN FUNCTIONS -------------------- // in BG.C -extern SCNHANDLE GetBgroundHandle(void); +extern SCNHANDLE GetBgroundHandle(); extern void SetDoFadeIn(bool tf); // In DOS_DW.C @@ -63,7 +63,7 @@ void RestoreMasterProcess(INT_CONTEXT *pic); void RestoreProcess(INT_CONTEXT *pic); // in SCENE.C -extern SCNHANDLE GetSceneHandle(void); +extern SCNHANDLE GetSceneHandle(); //----------------- LOCAL DEFINES -------------------- @@ -149,7 +149,7 @@ void DoRestoreScene(SAVED_DATA *sd, bool bFadeOut) { RestoreSceneCount = RS_COUNT; // Set restore scene count } -void InitialiseSaveScenes(void) { +void InitialiseSaveScenes() { if (ssData == NULL) { ssData = (SAVED_DATA *)calloc(MAX_NEST, sizeof(SAVED_DATA)); if (ssData == NULL) { @@ -161,7 +161,7 @@ void InitialiseSaveScenes(void) { } } -void FreeSaveScenes(void) { +void FreeSaveScenes() { if (ssData) { free(ssData); ssData = NULL; @@ -243,7 +243,7 @@ static void SortMAProcess(CORO_PARAM, const void *) { //--------------------------------------------------------------------------- -void ResumeInterprets(void) { +void ResumeInterprets() { // Master script only affected on restore game, not restore scene if (!TinselV2 && (rsd == &sgData)) { g_scheduler->killMatchingProcess(PID_MASTER_SCR, -1); diff --git a/engines/tinsel/savescn.h b/engines/tinsel/savescn.h index 21e7dd032b..f0927baae3 100644 --- a/engines/tinsel/savescn.h +++ b/engines/tinsel/savescn.h @@ -98,19 +98,19 @@ enum letype{ }; char *ListEntry(int i, letype which); -int getList(void); -void setNeedLoad(void); +int getList(); +void setNeedLoad(); void RestoreGame(int num); void SaveGame(char *name, char *desc); -void ProcessSRQueue(void); +void ProcessSRQueue(); void RequestSaveGame(char *name, char *desc, SAVED_DATA *sd, int *ssCount, SAVED_DATA *ssData); void RequestRestoreGame(int num, SAVED_DATA *sd, int *ssCount, SAVED_DATA *ssData); -void InitialiseSaveScenes(void); -void FreeSaveScenes(void); +void InitialiseSaveScenes(); +void FreeSaveScenes(); } // End of namespace Tinsel diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp index 2e35ec10c5..33d4e67d70 100644 --- a/engines/tinsel/scene.cpp +++ b/engines/tinsel/scene.cpp @@ -57,7 +57,7 @@ namespace Tinsel { //----------------- EXTERNAL FUNCTIONS --------------------- // in BG.C -extern void DropBackground(void); +extern void DropBackground(); // in EFFECT.C extern void EffectPolyProcess(CORO_PARAM, const void *); @@ -68,7 +68,7 @@ extern void CursorPositionProcess(CORO_PARAM, const void *); #endif extern void TagProcess(CORO_PARAM, const void *); extern void PointProcess(CORO_PARAM, const void *); -extern void EnableTags(void); +extern void EnableTags(); //----------------- LOCAL DEFINES -------------------- @@ -322,7 +322,7 @@ static void LoadScene(SCNHANDLE scene, int entry) { /** * Wrap up the last scene. */ -void EndScene(void) { +void EndScene() { if (SceneHandle != 0) { UnlockScene(SceneHandle); SceneHandle = 0; @@ -366,7 +366,7 @@ void EndScene(void) { /** * */ -void PrimeBackground(void) { +void PrimeBackground() { // structure for playfields static PLAYFIELD playfield[] = { { // FIELD WORLD @@ -409,7 +409,7 @@ void PrimeBackground(void) { * Start up the standard stuff for the next scene. */ -void PrimeScene(void) { +void PrimeScene() { SetNoBlocking(false); SetSysVar(SYS_SceneFxDimFactor, SysVar(SYS_DefaultFxDimFactor)); @@ -456,7 +456,7 @@ void StartNewScene(SCNHANDLE scene, int entry) { * created in each scene. */ -void setshowpos(void) { +void setshowpos() { ShowPosition = true; } #endif @@ -465,7 +465,7 @@ void setshowpos(void) { * Return the current scene handle. */ -SCNHANDLE GetSceneHandle(void) { +SCNHANDLE GetSceneHandle() { return SceneHandle; } @@ -490,7 +490,7 @@ void DoHailScene(SCNHANDLE scene) { /** * WrapScene */ -void WrapScene(void) { +void WrapScene() { SendSceneTinselProcess(CLOSEDOWN); } diff --git a/engines/tinsel/scene.h b/engines/tinsel/scene.h index 4b0029fb5f..e17a6ab7a0 100644 --- a/engines/tinsel/scene.h +++ b/engines/tinsel/scene.h @@ -84,11 +84,11 @@ typedef enum { TRANS_DEF, TRANS_CUT, TRANS_FADE } TRANSITS; void DoHailScene(SCNHANDLE scene); -void WrapScene(void); +void WrapScene(); void StartNewScene(SCNHANDLE scene, int entry); -void EndScene(void); +void EndScene(); void SendSceneTinselProcess(TINSEL_EVENT event); diff --git a/engines/tinsel/sched.cpp b/engines/tinsel/sched.cpp index d39d01117b..c081ff68f0 100644 --- a/engines/tinsel/sched.cpp +++ b/engines/tinsel/sched.cpp @@ -125,7 +125,7 @@ void Scheduler::reset() { /** * Shows the maximum number of process used at once. */ -void Scheduler::printStats(void) { +void Scheduler::printStats() { printf("%i process of %i used.\n", maxProcs, NUM_PROCESS); } #endif @@ -172,7 +172,7 @@ void Scheduler::CheckStack() { /** * Give all active processes a chance to run */ -void Scheduler::schedule(void) { +void Scheduler::schedule() { // start dispatching active process list PROCESS *pNext; PROCESS *pProc = active->pNext; @@ -413,7 +413,7 @@ void Scheduler::killProcess(PROCESS *pKillProc) { /** * Returns a pointer to the currently running process. */ -PROCESS *Scheduler::getCurrentProcess(void) { +PROCESS *Scheduler::getCurrentProcess() { return pCurrent; } @@ -669,7 +669,7 @@ void RestoreGlobalProcess(INT_CONTEXT *pic) { /** * Kill them all (restore game). */ -void KillGlobalProcesses(void) { +void KillGlobalProcesses() { for (uint32 i = 0; i < numGlobalProcess; ++i) { g_scheduler->killMatchingProcess(PID_GPROCESS + i, -1); diff --git a/engines/tinsel/sched.h b/engines/tinsel/sched.h index 8c71127cc9..bfeaa8750a 100644 --- a/engines/tinsel/sched.h +++ b/engines/tinsel/sched.h @@ -140,7 +140,7 @@ void xCallGlobalProcess(uint32 procID); void xKillGlobalProcess(uint32 procID); bool GlobalProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWait, int myEscape); void RestoreGlobalProcess(INT_CONTEXT *pic); -void KillGlobalProcesses(void); +void KillGlobalProcesses(); void FreeGlobalProcesses(); } // End of namespace Tinsel diff --git a/engines/tinsel/scroll.cpp b/engines/tinsel/scroll.cpp index 65980c061b..47c61a897e 100644 --- a/engines/tinsel/scroll.cpp +++ b/engines/tinsel/scroll.cpp @@ -90,14 +90,14 @@ static int scrollPixelsY = SCROLLPIXELS; /** * Reset the ScrollCursor flag */ -void DontScrollCursor(void) { +void DontScrollCursor() { ScrollCursor = false; } /** * Set the ScrollCursor flag */ -void DoScrollCursor(void) { +void DoScrollCursor() { ScrollCursor = true; } @@ -238,7 +238,7 @@ static void NeedScroll(int direction) { /** * Called from scroll process - Scrolls the image as appropriate. */ -static void ScrollImage(void) { +static void ScrollImage() { int OldLoffset = 0, OldToffset = 0; // Used when keeping cursor on a tag int Loffset, Toffset; int curX, curY; @@ -338,7 +338,7 @@ static void ScrollImage(void) { * See if the actor on whom the camera is is approaching an edge. * Request a scroll if he is. */ -static void MonitorScroll(void) { +static void MonitorScroll() { int newx, newy; int Loffset, Toffset; @@ -381,7 +381,7 @@ static void MonitorScroll(void) { oldy = newy; } -static void RestoreScrollDefaults(void) { +static void RestoreScrollDefaults() { sd.xTrigger = SysVar(SV_SCROLL_XTRIGGER); sd.xDistance = SysVar(SV_SCROLL_XDISTANCE); sd.xSpeed = SysVar(SV_SCROLL_XSPEED); @@ -394,7 +394,7 @@ static void RestoreScrollDefaults(void) { /** * Does the obvious - called at the end of a scene. */ -void DropScroll(void) { +void DropScroll() { sd.NumNoH = sd.NumNoV = 0; if (TinselV2) { LeftScroll = DownScroll = 0; // No iterations outstanding @@ -465,7 +465,7 @@ void ScrollFocus(int ano) { /** * Returns the actor which the camera is following */ -int GetScrollFocus(void) { +int GetScrollFocus() { return scrollActor; } @@ -488,7 +488,7 @@ void ScrollTo(int x, int y, int xIter, int yIter) { /** * Kill of any current scroll. */ -void KillScroll(void) { +void KillScroll() { LeftScroll = DownScroll = 0; } @@ -528,7 +528,7 @@ void SetScrollParameters(int xTrigger, int xDistance, int xSpeed, int yTriggerTo } } -bool IsScrolling(void) { +bool IsScrolling() { return (LeftScroll || DownScroll); } diff --git a/engines/tinsel/scroll.h b/engines/tinsel/scroll.h index 2c5f52d9ec..438b049069 100644 --- a/engines/tinsel/scroll.h +++ b/engines/tinsel/scroll.h @@ -65,19 +65,19 @@ struct SCROLLDATA{ }; -void DontScrollCursor(void); -void DoScrollCursor(void); +void DontScrollCursor(); +void DoScrollCursor(); void SetNoScroll(int x1, int y1, int x2, int y2); -void DropScroll(void); +void DropScroll(); void ScrollProcess(CORO_PARAM, const void *); void ScrollFocus(int actor); -int GetScrollFocus(void); +int GetScrollFocus(); void ScrollTo(int x, int y, int xIter, int yIter); -void KillScroll(void); +void KillScroll(); void GetNoScrollData(SCROLLDATA *ssd); void RestoreNoScrollData(SCROLLDATA *ssd); @@ -85,7 +85,7 @@ void RestoreNoScrollData(SCROLLDATA *ssd); void SetScrollParameters(int xTrigger, int xDistance, int xSpeed, int yTriggerTop, int yTriggerBottom, int yDistance, int ySpeed); -bool IsScrolling(void); +bool IsScrolling(); } // End of namespace Tinsel diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 264a9e403e..457b9b54b0 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -422,7 +422,7 @@ bool SoundManager::sampleIsPlaying(int id) { /** * Stops any currently playing sample. */ -void SoundManager::stopAllSamples(void) { +void SoundManager::stopAllSamples() { // stop currently playing sample if (!TinselV2) { @@ -460,7 +460,7 @@ void SoundManager::setSFXVolumes(uint8 volume) { /** * Opens and inits all sound sample files. */ -void SoundManager::openSampleFiles(void) { +void SoundManager::openSampleFiles() { // Floppy and demo versions have no sample files if (_vm->getFeatures() & GF_FLOPPY || _vm->getFeatures() & GF_DEMO) return; @@ -558,7 +558,7 @@ void SoundManager::openSampleFiles(void) { */ } -void SoundManager::closeSampleStream(void) { +void SoundManager::closeSampleStream() { _sampleStream.close(); free(_sampleIndex); _sampleIndex = 0; diff --git a/engines/tinsel/sound.h b/engines/tinsel/sound.h index 4f37108949..36c5af1891 100644 --- a/engines/tinsel/sound.h +++ b/engines/tinsel/sound.h @@ -112,7 +112,7 @@ public: bool playSample(int id, int sub, bool bLooped, int x, int y, int priority, Audio::Mixer::SoundType type, Audio::SoundHandle *handle = 0); - void stopAllSamples(void); // Stops any currently playing sample + void stopAllSamples(); // Stops any currently playing sample void stopSpecSample(int id, int sub = 0); // Stops a specific sample void setSFXVolumes(uint8 volume); @@ -121,8 +121,8 @@ public: bool sampleIsPlaying(int id = -1); // TODO: Internal method, make this protected? - void openSampleFiles(void); - void closeSampleStream(void); + void openSampleFiles(); + void closeSampleStream(); }; } // End of namespace Tinsel diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp index 50eeda4d00..570c30d84c 100644 --- a/engines/tinsel/strres.cpp +++ b/engines/tinsel/strres.cpp @@ -375,18 +375,18 @@ void LanguageFacts(int language, SCNHANDLE hDescription, SCNHANDLE hFlagFilm) { /** * Gets the current subtitles language */ -LANGUAGE TextLanguage(void) { +LANGUAGE TextLanguage() { return textLanguage; } /** * Gets the current voice language */ -LANGUAGE SampleLanguage(void) { +LANGUAGE SampleLanguage() { return sampleLanguage; } -int NumberOfLanguages(void) { +int NumberOfLanguages() { int i, count; for (i = 0, count = 0; i < NUM_LANGUAGES; i++) { diff --git a/engines/tinsel/strres.h b/engines/tinsel/strres.h index baaa498a82..497259584c 100644 --- a/engines/tinsel/strres.h +++ b/engines/tinsel/strres.h @@ -83,14 +83,14 @@ void LanguageFacts(int language, SCNHANDLE hDescription, SCNHANDLE hFlagFilm); /** * Gets the current subtitles language */ -LANGUAGE TextLanguage(void); +LANGUAGE TextLanguage(); /** * Gets the current voice language */ -LANGUAGE SampleLanguage(void); +LANGUAGE SampleLanguage(); -int NumberOfLanguages(void); +int NumberOfLanguages(); LANGUAGE NextLanguage(LANGUAGE thisOne); LANGUAGE PrevLanguage(LANGUAGE thisOne); SCNHANDLE LanguageDesc(LANGUAGE thisOne); diff --git a/engines/tinsel/sysvar.cpp b/engines/tinsel/sysvar.cpp index 41437c069b..a83116433e 100644 --- a/engines/tinsel/sysvar.cpp +++ b/engines/tinsel/sysvar.cpp @@ -38,7 +38,7 @@ typedef enum { DOS_PC, WIN_PC, APPLE_MAC, SONY_PSX, SEGA_SATURN } platform; //----------------- GLOBAL GLOBAL DATA -------------------- -extern int NewestSavedGame(void); +extern int NewestSavedGame(); //----------------- LOCAL GLOBAL DATA -------------------- @@ -194,7 +194,7 @@ SCNHANDLE SysString(int number) { * Gets the no blocking flag. Note that for convenience, the systemVars array * entry is used even for Tinsel 1, which originally used a separate variable. */ -bool GetNoBlocking(void) { +bool GetNoBlocking() { return SysVar(ISV_NO_BLOCKING); } diff --git a/engines/tinsel/sysvar.h b/engines/tinsel/sysvar.h index 0cb830ec91..e407e6ffa3 100644 --- a/engines/tinsel/sysvar.h +++ b/engines/tinsel/sysvar.h @@ -140,7 +140,7 @@ void SetSysString(int number, SCNHANDLE hString); SCNHANDLE SysString(int number); -bool GetNoBlocking(void); +bool GetNoBlocking(); void SetNoBlocking(bool flag); diff --git a/engines/tinsel/timers.cpp b/engines/tinsel/timers.cpp index 8ac715a52b..9c7f709608 100644 --- a/engines/tinsel/timers.cpp +++ b/engines/tinsel/timers.cpp @@ -74,7 +74,7 @@ uint32 DwGetCurrentTime() { * Resets all of the timer slots */ -void RebootTimers(void) { +void RebootTimers() { memset(timers, 0, sizeof(timers)); } @@ -124,7 +124,7 @@ static TIMER *allocateTimer(int num) { /** * Update all timers, as appropriate. */ -void FettleTimers(void) { +void FettleTimers() { for (int i = 0; i < MAX_TIMERS; i++) { if (!timers[i].tno) continue; diff --git a/engines/tinsel/timers.h b/engines/tinsel/timers.h index 5437890790..022604b662 100644 --- a/engines/tinsel/timers.h +++ b/engines/tinsel/timers.h @@ -38,13 +38,13 @@ namespace Tinsel { #define ONE_SECOND 24 -uint32 DwGetCurrentTime(void); +uint32 DwGetCurrentTime(); -void RebootTimers(void); +void RebootTimers(); void syncTimerInfo(Common::Serializer &s); -void FettleTimers(void); +void FettleTimers(); void StartTimer(int num, int sval, bool up, bool frame); diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index ff9a65c2a3..e4711c97e8 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -92,32 +92,32 @@ int clRunMode = 0; extern void ChangePalette(SCNHANDLE hPal); // in PDISPLAY.CPP -extern void EnableTags(void); -extern void DisableTags(void); -bool DisableTagsIfEnabled(void); -extern void setshowstring(void); +extern void EnableTags(); +extern void DisableTags(); +bool DisableTagsIfEnabled(); +extern void setshowstring(); // in SAVELOAD.CPP -extern int NewestSavedGame(void); +extern int NewestSavedGame(); // in SCENE.CPP -extern void setshowpos(void); +extern void setshowpos(); extern int sceneCtr; // in TINSEL.CPP extern void SetCdChangeScene(SCNHANDLE hScene); extern void SetHookScene(SCNHANDLE scene, int entrance, int transition); extern void SetNewScene(SCNHANDLE scene, int entrance, int transition); -extern void UnHookScene(void); -extern void SuspendHook(void); -extern void UnSuspendHook(void); +extern void UnHookScene(); +extern void SuspendHook(); +extern void UnSuspendHook(); #ifdef BODGE // In HANDLE.CPP bool ValidHandle(SCNHANDLE offset); // In SCENE.CPP -SCNHANDLE GetSceneHandle(void); +SCNHANDLE GetSceneHandle(); #endif //----------------- GLOBAL GLOBAL DATA -------------------- @@ -271,12 +271,12 @@ static COLORREF s_talkfontColor = 0; //----------------- FORWARD REFERENCES -------------------- -static int HeldObject(void); +static int HeldObject(); static void PostTag(CORO_PARAM, int tagno, TINSEL_EVENT event, HPOLYGON hp, int myEscape); -void ResetIdleTime(void); +void ResetIdleTime(); static void SendTag(CORO_PARAM, int tagno, TINSEL_EVENT event, HPOLYGON hp, int myEscape, bool *result); static void StandTag(int actor, HPOLYGON hp); -void StopMidiFn(void); +void StopMidiFn(); void StopSample(int sample = -1); static void StopWalk(int actor); static void WaitScroll(CORO_PARAM, int myescEvent); @@ -559,7 +559,7 @@ static int ActorPos(int xory, int actor) { /** * Make all actors alive at the start of each scene. */ -static void ActorsOn(void) { +static void ActorsOn() { setactorson(); } @@ -688,7 +688,7 @@ static void ClearHookScene() { /** * Guess what. */ -static void CloseInventory(void) { +static void CloseInventory() { KillInventory(); } @@ -1025,7 +1025,7 @@ static void DelTopic(int icon) { /** * DimMusic */ -static void DimMusic(void) { +static void DimMusic() { _vm->_pcmMusic->dim(true); } @@ -1045,7 +1045,7 @@ static void Drop(int object) { /** * Delete all objects from inventory 1 and 2. */ -static void DropEverything(void) { +static void DropEverything() { HoldItem(NOOBJECT, false); ClearInventory(INV_1); @@ -1055,7 +1055,7 @@ static void DropEverything(void) { /** * EnableMenu */ -static void EnableMenu(void) { +static void EnableMenu() { bEnableMenu = true; } @@ -1114,14 +1114,14 @@ static void FaceTag(int actor, HPOLYGON hp) { /** * FadeIn */ -static void FadeIn(void) { +static void FadeIn() { FadeInMedium(NULL); } /** * FadeOut */ -static void FadeOut(void) { +static void FadeOut() { FadeOutMedium(NULL); } @@ -1175,7 +1175,7 @@ static void HailScene(SCNHANDLE scene) { /** * Returns TRUE if the game has been restarted, FALSE if not. */ -static bool HasRestarted(void) { +static bool HasRestarted() { return bHasRestarted; } @@ -1189,7 +1189,7 @@ int Have(int object) { /** * Returns which object is currently held. */ -static int HeldObject(void) { +static int HeldObject() { return WhichItemHeld(); } @@ -1253,7 +1253,7 @@ void HookScene(SCNHANDLE scene, int entrance, int transition) { /** * IdleTime */ -static int IdleTime(void) { +static int IdleTime() { // If control is off, system is not idle if (!ControlIsOn()) { // Player doesn't currently have control @@ -1440,7 +1440,7 @@ void NewScene(CORO_PARAM, SCNHANDLE scene, int entrance, int transition) { /** * Disable dynamic blocking for current scene. */ -static void NoBlocking(void) { +static void NoBlocking() { SetNoBlocking(true); } @@ -2371,7 +2371,7 @@ static void PrintTag(HPOLYGON hp, SCNHANDLE text, int actor = 0, bool bCursor = /** * Quits the game */ -static void QuitGame(void) { +static void QuitGame() { StopMidi(); StopSample(); _vm->quitGame(); @@ -2398,14 +2398,14 @@ static int RandomFn(int n1, int n2, int norpt) { /** * ResetIdleTime */ -void ResetIdleTime(void) { +void ResetIdleTime() { resetUserEventTime(); } /** * FnRestartGame */ -void FnRestartGame(void) { +void FnRestartGame() { // TODO: Tinsel 2 comments out the 2 calls, but I'm not sure that this should be done StopMidi(); StopSample(); @@ -2444,14 +2444,14 @@ static void RestoreScene(CORO_PARAM, TRANSITS transition) { /** * Resumes the last game */ -void ResumeLastGame(void) { +void ResumeLastGame() { RestoreGame(NewestSavedGame()); } /** * Returns the current run mode */ -static int RunMode(void) { +static int RunMode() { return clRunMode; } @@ -2503,7 +2503,7 @@ static void ScalingReels(int actor, int scale, int direction, /** * Return the icon that caused the CONVERSE event. */ -static int ScanIcon(void) { +static int ScanIcon() { return GetIcon(); } @@ -2752,14 +2752,14 @@ void ShowEffect(int effect) { /** * Enable display of diagnostic co-ordinates. */ -static void showpos(void) { +static void showpos() { setshowpos(); } /** * Enable display of diagnostic co-ordinates. */ -static void showstring(void) { +static void showstring() { setshowstring(); } #endif @@ -2767,7 +2767,7 @@ static void showstring(void) { /** * Shows the main menu */ -static void ShowMenu(void) { +static void ShowMenu() { OpenMenu(MAIN_MENU); } @@ -2969,7 +2969,7 @@ static void StartTimerFn(int timerno, int start, bool up, int fs) { StartTimer(timerno, start, up, fs); } -void StopMidiFn(void) { +void StopMidiFn() { StopMidi(); // Stop any currently playing midi } @@ -3624,7 +3624,7 @@ static int TimerFn(int timerno) { /** * Return the icon that caused the CONVERSE event. */ -int Topic(void) { +int Topic() { return GetIcon(); } @@ -3681,14 +3681,14 @@ static void TryPlaySample(CORO_PARAM, int sample, bool bComplete, bool escOn, in /** * UnDimMusic */ -static void UnDimMusic(void) { +static void UnDimMusic() { _vm->_pcmMusic->unDim(true); } /** * unhookscene */ -static void UnHookSceneFn(void) { +static void UnHookSceneFn() { UnHookScene(); } @@ -3702,7 +3702,7 @@ static void UnTagActorFn(int actor) { /** * vibrate */ -static void Vibrate(void) { +static void Vibrate() { } /** @@ -4168,28 +4168,28 @@ static void WalkTag(CORO_PARAM, int actor, SCNHANDLE film, HPOLYGON hp, bool esc /** * Returns the X co-ordinateof lead actor's last walk. */ -int WalkXPos(void) { +int WalkXPos() { return GetLastLeadXdest(); } /** * Returns the Y co-ordinateof lead actor's last walk. */ -int WalkYPos(void) { +int WalkYPos() { return GetLastLeadYdest(); } /** * Return which is the current CD, counting from 1. */ -int WhichCd(void) { +int WhichCd() { return GetCurrentCD(); } /** * whichinventory */ -int WhichInventory(void) { +int WhichInventory() { return WhichInventoryOpen(); } diff --git a/engines/tinsel/tinlib.h b/engines/tinsel/tinlib.h index 27d38a9a22..11e59f380d 100644 --- a/engines/tinsel/tinlib.h +++ b/engines/tinsel/tinlib.h @@ -53,9 +53,9 @@ void Control(int param); void HookScene(SCNHANDLE scene, int entrance, int transition); void NewScene(CORO_PARAM, SCNHANDLE scene, int entrance, int transition); void Offset(EXTREME extreme, int x, int y); -void FnRestartGame(void); -void RestoreScene(void); -void ResumeLastGame(void); +void FnRestartGame(); +void RestoreScene(); +void ResumeLastGame(); void SaveScene(CORO_PARAM); void Stand(CORO_PARAM, int actor, int x, int y, SCNHANDLE film); void SetTextPal(COLORREF col); diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 6b71b0c245..8b9a30d517 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -75,7 +75,7 @@ namespace Tinsel { // In BG.CPP extern void SetDoFadeIn(bool tf); -extern void DropBackground(void); +extern void DropBackground(); // In CURSOR.CPP extern void CursorProcess(CORO_PARAM, const void *); @@ -85,7 +85,7 @@ extern void InventoryProcess(CORO_PARAM, const void *); // In SCENE.CPP extern void PrimeBackground(); -extern SCNHANDLE GetSceneHandle(void); +extern SCNHANDLE GetSceneHandle(); //----------------- FORWARD DECLARATIONS --------------------- void SetNewScene(SCNHANDLE scene, int entrance, int transition); @@ -534,7 +534,7 @@ void SetHookScene(SCNHANDLE scene, int entrance, int transition) { /** * Hooked scene is over, trigger a change to the delayed scene */ -void UnHookScene(void) { +void UnHookScene() { assert(DelayedScene.scene != 0); // no scene delayed // The delayed scene can go now @@ -545,11 +545,11 @@ void UnHookScene(void) { DelayedScene.scene = 0; } -void SuspendHook(void) { +void SuspendHook() { bCuttingScene = true; } -void CdHasChanged(void) { +void CdHasChanged() { if (bChangingForRestore) { bChangingForRestore = false; RestoreGame(-2); @@ -578,7 +578,7 @@ void CDChangeForRestore(int cdNumber) { bChangingForRestore = true; } -void UnSuspendHook(void) { +void UnSuspendHook() { bCuttingScene = false; } @@ -703,7 +703,7 @@ void CuttingScene(bool bCutting) { /** * LoadBasicChunks */ -void LoadBasicChunks(void) { +void LoadBasicChunks() { byte *cptr; int numObjects; @@ -1036,7 +1036,7 @@ Common::Error TinselEngine::run() { } -void TinselEngine::NextGameCycle(void) { +void TinselEngine::NextGameCycle() { // Dim Music _pcmMusic->dimIteration(); @@ -1101,7 +1101,7 @@ bool TinselEngine::pollEvent() { /** * Start the processes that continue between scenes. */ -void TinselEngine::CreateConstProcesses(void) { +void TinselEngine::CreateConstProcesses() { // Process to run the master script _scheduler->createProcess(PID_MASTER_SCR, MasterScriptProcess, NULL, 0); @@ -1113,7 +1113,7 @@ void TinselEngine::CreateConstProcesses(void) { /** * Restart the game */ -void TinselEngine::RestartGame(void) { +void TinselEngine::RestartGame() { HoldItem(INV_NOICON); // Holding nothing DropBackground(); // No background @@ -1149,7 +1149,7 @@ void TinselEngine::RestartGame(void) { /** * Init palette and object managers, scheduler, keyboard and mouse. */ -void TinselEngine::RestartDrivers(void) { +void TinselEngine::RestartDrivers() { // init the palette manager ResetPalAllocator(); @@ -1178,7 +1178,7 @@ void TinselEngine::RestartDrivers(void) { /** * Remove keyboard, mouse and joystick drivers. */ -void TinselEngine::ChopDrivers(void) { +void TinselEngine::ChopDrivers() { // remove sound driver StopMidi(); _sound->stopAllSamples(); diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h index 8fff4985b8..e396f663c7 100644 --- a/engines/tinsel/tinsel.h +++ b/engines/tinsel/tinsel.h @@ -194,11 +194,11 @@ private: //MidiMusicPlayer *_midiMusic; int _musicVolume; - void NextGameCycle(void); - void CreateConstProcesses(void); - void RestartGame(void); - void RestartDrivers(void); - void ChopDrivers(void); + void NextGameCycle(); + void CreateConstProcesses(); + void RestartGame(); + void RestartDrivers(); + void ChopDrivers(); void ProcessKeyEvent(const Common::Event &event); bool pollEvent(); @@ -222,7 +222,7 @@ public: // Externally available methods void CuttingScene(bool bCutting); void CDChangeForRestore(int cdNumber); -void CdHasChanged(void); +void CdHasChanged(); } // End of namespace Tinsel diff --git a/engines/tinsel/token.cpp b/engines/tinsel/token.cpp index 1c78f462b1..2acf3c073f 100644 --- a/engines/tinsel/token.cpp +++ b/engines/tinsel/token.cpp @@ -120,7 +120,7 @@ bool TestToken(int which) { /** * Call at the start of each scene. */ -void FreeAllTokens(void) { +void FreeAllTokens() { for (int i = 0; i < NUMTOKENS; i++) { tokens[i].proc = NULL; } diff --git a/engines/tinsel/token.h b/engines/tinsel/token.h index 906ce4589d..b750b92ae4 100644 --- a/engines/tinsel/token.h +++ b/engines/tinsel/token.h @@ -48,7 +48,7 @@ void FreeControlToken(); void GetToken(int which); void FreeToken(int which); -void FreeAllTokens(void); +void FreeAllTokens(); bool TestToken(int which); -- cgit v1.2.3