diff options
author | Max Horn | 2009-11-02 21:54:57 +0000 |
---|---|---|
committer | Max Horn | 2009-11-02 21:54:57 +0000 |
commit | 51933629d1f1a17839ddbb75b2b619effe117abb (patch) | |
tree | 7292b23e5ce3fb11e6b2bb360a3befbbf35b64d9 /engines/cine | |
parent | 400ee8c461e8060393b62be639c27dd3820dccd4 (diff) | |
download | scummvm-rg350-51933629d1f1a17839ddbb75b2b619effe117abb.tar.gz scummvm-rg350-51933629d1f1a17839ddbb75b2b619effe117abb.tar.bz2 scummvm-rg350-51933629d1f1a17839ddbb75b2b619effe117abb.zip |
Changed foo(void) to foo() in almost all non-backend source files
svn-id: r45616
Diffstat (limited to 'engines/cine')
-rw-r--r-- | engines/cine/anim.h | 2 | ||||
-rw-r--r-- | engines/cine/bg_list.cpp | 2 | ||||
-rw-r--r-- | engines/cine/bg_list.h | 2 | ||||
-rw-r--r-- | engines/cine/cine.h | 6 | ||||
-rw-r--r-- | engines/cine/gfx.h | 12 | ||||
-rw-r--r-- | engines/cine/part.cpp | 2 | ||||
-rw-r--r-- | engines/cine/part.h | 2 | ||||
-rw-r--r-- | engines/cine/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/cine/script.h | 20 | ||||
-rw-r--r-- | engines/cine/script_fw.cpp | 18 | ||||
-rw-r--r-- | engines/cine/texte.h | 2 | ||||
-rw-r--r-- | engines/cine/various.cpp | 20 | ||||
-rw-r--r-- | engines/cine/various.h | 24 | ||||
-rw-r--r-- | engines/cine/xref.txt | 2 |
14 files changed, 58 insertions, 58 deletions
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<AnimData> 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> 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<SeqListElement>::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) |