TONY: Remove useless void in function declaration

29 files changed, 283 insertions, 351 deletions

diff --git a/engines/tony/adv.h b/engines/tony/adv.h
index b2d61a5da5..fe1dd32eae 100644
--- a/engines/tony/adv.h
+++ b/engines/tony/adv.h
@@ -67,19 +67,19 @@ enum RMTonyAction {
 uint32 mainLoadLocation(int nLoc, RMPoint pt, RMPoint start);
 void mainUnloadLocation(CORO_PARAM, bool bDoOnExit, uint32 *result);
 void mainLinkGraphicTask(RMGfxTask *task);
-void mainFreeze(void);
-void mainUnfreeze(void);
+void mainFreeze();
+void mainUnfreeze();
 void mainWaitFrame(CORO_PARAM);
-void mainShowMouse(void);
-void mainHideMouse(void);
-void mainEnableInput(void);
-void mainDisableInput(void);
+void mainShowMouse();
+void mainHideMouse();
+void mainEnableInput();
+void mainDisableInput();
 void mainPlayMusic(int nChannel, const char *filename, int nFX, bool bLoop, int nSync);
 void mainInitWipe(int type);
-void mainCloseWipe(void);
+void mainCloseWipe();
 void mainWaitWipeEnd(CORO_PARAM);
-void mainEnableGUI(void);
-void mainDisableGUI(void);
+void mainEnableGUI();
+void mainDisableGUI();
 void mainSetPerorate(bool bPerorate);
 
 } // End of namespace Tony
diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp
index e91d6873a4..016c84ab39 100644
--- a/engines/tony/custom.cpp
+++ b/engines/tony/custom.cpp
@@ -106,7 +106,7 @@ const char *jingleFileNames[] = {
 };
 
 
-void ReapplyChangedHotspot(void) {
+void ReapplyChangedHotspot() {
 	int i;
 	for (i = 0; i < GLOBALS._curChangedHotspot; i++)
 		GLOBALS._loc->getItemFromCode(GLOBALS._changedHotspot[i]._dwCode)->changeHotspot(RMPoint(GLOBALS._changedHotspot[i]._nX, GLOBALS._changedHotspot[i]._nY));
@@ -140,7 +140,7 @@ void LoadChangedHotspot(Common::InSaveFile *f) {
  * AddInventory -> theEngine.AddInventory()
 */
 
-void MCharResetCodes(void) {
+void MCharResetCodes() {
 	for (int i = 0; i < 10; i++)
 		GLOBALS._mCharacter[i]._item = GLOBALS._loc->getItemFromCode(GLOBALS._mCharacter[i]._code);
 	for (int i = 0; i < 10; i++)
diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp
index a16179d507..c4a95d0493 100644
--- a/engines/tony/font.cpp
+++ b/engines/tony/font.cpp
@@ -89,7 +89,7 @@ void RMFont::load(uint32 resID, int nChars, int dimx, int dimy, uint32 palResID)
 	load(res, nChars, dimx, dimy, palResID);
 }
 
-void RMFont::unload(void) {
+void RMFont::unload() {
 	if (_letter != NULL) {
 		delete[] _letter;
 		_letter = NULL;
@@ -130,7 +130,7 @@ void RMFont::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim2)
 	CORO_END_CODE;
 }
 
-void RMFont::close(void) {
+void RMFont::close() {
 	unload();
 }
 
@@ -200,12 +200,11 @@ void RMFontColor::setBaseColor(byte r1, byte g1, byte b1) {
 		_letter[i].loadPaletteWA(pal);
 }
 
-
 /***************************************************************************\
 *       RMFontParla Methods
 \****************************************************************************/
 
-void RMFontParla::init(void) {
+void RMFontParla::init() {
 	int i;
 
 	// bernie: Number of characters in the font
@@ -612,7 +611,7 @@ void RMFontParla::init(void) {
 *       RMFontMacc Methods
 \****************************************************************************/
 
-void RMFontMacc::init(void) {
+void RMFontMacc::init() {
 	int i;
 
 	// bernie: Number of characters in the font
@@ -976,7 +975,7 @@ void RMFontMacc::init(void) {
 *       RMFontCredits Methods
 \****************************************************************************/
 
-void RMFontCredits::init(void) {
+void RMFontCredits::init() {
 	int i;
 
 	// bernie: Number of characters in the font
@@ -1441,7 +1440,7 @@ void RMFontObj::setBothCase(int nChar, int nNext, signed char spiazz) {
 }
 
 
-void RMFontObj::init(void) {
+void RMFontObj::init() {
 	int i;
 
 	//bernie: Number of characters in the font (solo maiuscolo)
@@ -2015,7 +2014,7 @@ RMTextDialog::~RMTextDialog() {
 	CoroScheduler.closeEvent(_hEndDisplay);
 }
 
-void RMTextDialog::show(void) {
+void RMTextDialog::show() {
 	_bShowed = true;
 }
 
@@ -2042,15 +2041,15 @@ void RMTextDialog::setSkipStatus(bool bEnabled) {
 	_bSkipStatus = bEnabled;
 }
 
-void RMTextDialog::forceTime(void) {
+void RMTextDialog::forceTime() {
 	_bForceTime = true;
 }
 
-void RMTextDialog::forceNoTime(void) {
+void RMTextDialog::forceNoTime() {
 	_bForceNoTime = true;
 }
 
-void RMTextDialog::setNoTab(void) {
+void RMTextDialog::setNoTab() {
 	_bNoTab = true;
 }
 
@@ -2058,7 +2057,7 @@ void RMTextDialog::setForcedTime(uint32 dwTime) {
 	_time = dwTime;
 }
 
-void RMTextDialog::setAlwaysDisplay(void) {
+void RMTextDialog::setAlwaysDisplay() {
 	_bAlwaysDisplay = true;
 }
 
@@ -2128,7 +2127,7 @@ void RMTextDialog::removeThis(CORO_PARAM, bool &result) {
 	CORO_END_CODE;
 }
 
-void RMTextDialog::Unregister(void) {
+void RMTextDialog::Unregister() {
 	RMGfxTask::Unregister();
 	assert(_nInList == 0);
 	CoroScheduler.setEvent(_hEndDisplay);
@@ -2337,7 +2336,7 @@ RMDialogChoice::~RMDialogChoice() {
 	CoroScheduler.closeEvent(_hUnreg);
 }
 
-void RMDialogChoice::Unregister(void) {
+void RMDialogChoice::Unregister() {
 	RMGfxWoodyBuffer::Unregister();
 	assert(!_nInList);
 	CoroScheduler.pulseEvent(_hUnreg);
@@ -2345,7 +2344,7 @@ void RMDialogChoice::Unregister(void) {
 	_bRemoveFromOT = false;
 }
 
-void RMDialogChoice::init(void) {
+void RMDialogChoice::init() {
 	_numChoices = 0;
 	_drawedStrings = NULL;
 	_ptDrawStrings = NULL;
@@ -2356,7 +2355,7 @@ void RMDialogChoice::init(void) {
 }
 
 
-void RMDialogChoice::close(void) {
+void RMDialogChoice::close() {
 	if (_drawedStrings != NULL) {
 		delete[] _drawedStrings;
 		_drawedStrings = NULL;
@@ -2581,7 +2580,7 @@ void RMDialogChoice::doFrame(CORO_PARAM, RMPoint ptMousePos) {
 	CORO_END_CODE;
 }
 
-int RMDialogChoice::getSelection(void) {
+int RMDialogChoice::getSelection() {
 	return _curSelection;
 }
 
diff --git a/engines/tony/font.h b/engines/tony/font.h
index 1b10304b5a..595cb726a6 100644
--- a/engines/tony/font.h
+++ b/engines/tony/font.h
@@ -73,7 +73,7 @@ protected:
 	void load(const byte *buf, int nChars, int dimx, int dimy, uint32 palResID = RES_F_PAL);
 
 	// Remove the font
-	void unload(void);
+	void unload();
 
 protected:
 	// Conversion form character to font index
@@ -83,15 +83,15 @@ protected:
 	virtual int letterLength(int nChar, int nNext = 0) = 0;
 
 public:
-	virtual int letterHeight(void) = 0;
+	virtual int letterHeight() = 0;
 
 public:
 	RMFont();
 	virtual ~RMFont();
 
 	// Initialization and closing
-	virtual void init(void) = 0;
-	virtual void close(void);
+	virtual void init() = 0;
+	virtual void close();
 
 	// Drawing
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBug, RMGfxPrimitive *prim);
@@ -143,7 +143,7 @@ public:
 
 class RMFontParla : public RMFontColor, public RMFontWithTables {
 public:
-	void init(void);
+	void init();
 	virtual ~RMFontParla() {}
 };
 
@@ -152,19 +152,19 @@ private:
 	void setBothCase(int nChar, int nNext, signed char spiazz);
 
 public:
-	void init(void);
+	void init();
 	virtual ~RMFontObj() {}
 };
 
 class RMFontMacc : public RMFontColor, public RMFontWithTables {
 public:
-	void init(void);
+	void init();
 	virtual ~RMFontMacc() {}
 };
 
 class RMFontCredits : public RMFontColor, public RMFontWithTables {
 public:
-	void init(void);
+	void init();
 	virtual ~RMFontCredits() {}
 	virtual void setBaseColor(byte r, byte g, byte b) {}
 };
@@ -263,7 +263,7 @@ public:
 	virtual void removeThis(CORO_PARAM, bool &result);
 
 	// Overloaded de-registration
-	virtual void Unregister(void);
+	virtual void Unregister();
 
 	// Overloading of the Draw to center the text, if necessary
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
@@ -279,15 +279,15 @@ public:
 	void setCustomSkipHandle2(uint32 hCustomSkip);
 	void setSkipStatus(bool bEnabled);
 	void setForcedTime(uint32 dwTime);
-	void setNoTab(void);
-	void forceTime(void);
-	void forceNoTime(void);
-	void setAlwaysDisplay(void);
+	void setNoTab();
+	void forceTime();
+	void forceNoTime();
+	void setAlwaysDisplay();
 
 	// Set the input device, to allow skip from mouse
 	void setInput(RMInput *input);
 
-	void show(void);
+	void show();
 	void hide(CORO_PARAM);
 };
 
@@ -363,7 +363,7 @@ protected:
 public:
 	virtual void removeThis(CORO_PARAM, bool &result);
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
-	void Unregister(void);
+	void Unregister();
 
 public:
 	// Initialization
@@ -371,8 +371,8 @@ public:
 	virtual ~RMDialogChoice();
 
 	// Initialization and closure
-	void init(void);
-	void close(void);
+	void init();
+	void close();
 
 	// Sets the number of possible sentences, which then be added with AddChoice()
 	void setNumChoices(int num);
@@ -390,7 +390,7 @@ public:
 	void doFrame(CORO_PARAM, RMPoint ptMousePos);
 
 	// Returns the currently selected item, or -1 if none is selected
-	int getSelection(void);
+	int getSelection();
 };
 
 } // End of namespace Tony
diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
index 493887cfa9..4e9e2abc38 100644
--- a/engines/tony/game.cpp
+++ b/engines/tony/game.cpp
@@ -59,11 +59,11 @@ void mainLinkGraphicTask(RMGfxTask *task) {
 	_vm->getEngine()->linkGraphicTask(task);
 }
 
-void mainFreeze(void) {
+void mainFreeze() {
 	_vm->getEngine()->freeze();
 }
 
-void mainUnfreeze(void) {
+void mainUnfreeze() {
 	_vm->getEngine()->unfreeze();
 }
 
@@ -71,11 +71,11 @@ void mainWaitFrame(CORO_PARAM) {
 	CoroScheduler.waitForSingleObject(coroParam, _vm->_hEndOfFrame, CORO_INFINITE);
 }
 
-void mainShowMouse(void) {
+void mainShowMouse() {
 	_vm->getEngine()->enableMouse();
 }
 
-void mainHideMouse(void) {
+void mainHideMouse() {
 	_vm->getEngine()->disableMouse();
 }
 
@@ -83,11 +83,11 @@ void mainPlayMusic(int nChannel, const char *filename, int nFX, bool bLoop, int
 	_vm->playMusic(nChannel, filename, nFX, bLoop, nSync);
 }
 
-void mainDisableInput(void) {
+void mainDisableInput() {
 	_vm->getEngine()->disableInput();
 }
 
-void mainEnableInput(void) {
+void mainEnableInput() {
 	_vm->getEngine()->enableInput();
 }
 
@@ -95,7 +95,7 @@ void mainInitWipe(int type) {
 	_vm->getEngine()->initWipe(type);
 }
 
-void mainCloseWipe(void) {
+void mainCloseWipe() {
 	_vm->getEngine()->closeWipe();
 }
 
@@ -103,13 +103,13 @@ void mainWaitWipeEnd(CORO_PARAM) {
 	_vm->getEngine()->waitWipeEnd(coroParam);
 }
 
-void mainEnableGUI(void) {
+void mainEnableGUI() {
 	_vm->getEngine()->_bGUIInterface = true;
 	_vm->getEngine()->_bGUIInventory = true;
 	_vm->getEngine()->_bGUIOption = true;
 }
 
-void mainDisableGUI(void) {
+void mainDisableGUI() {
 	_vm->getEngine()->_bGUIInterface = false;
 	_vm->getEngine()->_bGUIInventory = false;
 	_vm->getEngine()->_bGUIOption = false;
@@ -320,7 +320,7 @@ void RMOptionSlide::addToList(RMGfxTargetBuffer &bigBuf) {
 *       RMOptionScreen Methods
 \****************************************************************************/
 
-RMOptionScreen::RMOptionScreen(void) {
+RMOptionScreen::RMOptionScreen() {
 	_nState = MENUNONE;
 	_menu = NULL;
 	_hideLoadSave = NULL;
@@ -377,7 +377,7 @@ RMOptionScreen::RMOptionScreen(void) {
 	_nLastState = MENUGAME;
 }
 
-RMOptionScreen::~RMOptionScreen(void) {
+RMOptionScreen::~RMOptionScreen() {
 	closeState();
 }
 
@@ -546,7 +546,7 @@ void RMOptionScreen::refreshAll(CORO_PARAM) {
 	CORO_END_CODE;
 }
 
-void RMOptionScreen::refreshThumbnails(void) {
+void RMOptionScreen::refreshThumbnails() {
 	int i;
 
 	for (i = 0; i < 6; i++) {
@@ -729,7 +729,7 @@ void RMOptionScreen::initState(CORO_PARAM) {
 	CORO_END_CODE;
 }
 
-void RMOptionScreen::closeState(void) {
+void RMOptionScreen::closeState() {
 	delete _menu;
 	_menu = NULL;
 
@@ -983,7 +983,7 @@ void RMOptionScreen::initNoLoadSave(CORO_PARAM, RMGfxTargetBuffer &bigBuf, bool
 	CORO_END_CODE;
 }
 
-bool RMOptionScreen::close(void) {
+bool RMOptionScreen::close() {
 	if (_fadeStep != 6)
 		return false;
 
@@ -993,7 +993,7 @@ bool RMOptionScreen::close(void) {
 	return true;
 }
 
-bool RMOptionScreen::isClosing(void) {
+bool RMOptionScreen::isClosing() {
 	return _bExit;
 }
 
@@ -1479,7 +1479,7 @@ RMPointer::~RMPointer() {
 	close();
 }
 
-void RMPointer::init(void) {
+void RMPointer::init() {
 	int i;
 
 	for (i = 0; i < 5; i++) {
@@ -1511,7 +1511,7 @@ void RMPointer::init(void) {
 	_nCurSpecialPointer = 0;
 }
 
-void RMPointer::close(void) {
+void RMPointer::close() {
 	int i;
 
 	for (i = 0; i < 5; i++) {
@@ -1560,7 +1560,7 @@ void RMPointer::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim
 	CORO_END_CODE;
 }
 
-int RMPointer::curAction(void) {
+int RMPointer::curAction() {
 	if (_nCurSpecialPointer != 0)
 		return 0;
 
diff --git a/engines/tony/game.h b/engines/tony/game.h
index 64f4fb8e30..e231287c0f 100644
--- a/engines/tony/game.h
+++ b/engines/tony/game.h
@@ -90,12 +90,12 @@ public:
 	/**
 	 * Initialization
 	 */
-	void init(void);
+	void init();
 
 	/**
 	 * Deinitialization
 	 */
-	void close(void);
+	void close();
 
 	/**
 	 * Process a frame
@@ -130,7 +130,7 @@ public:
 
 		updateCursor();
 	}
-	PointerType getSpecialPointer(void) {
+	PointerType getSpecialPointer() {
 		return (PointerType)_nCurSpecialPointer;
 	}
 
@@ -145,7 +145,7 @@ public:
 	/**
 	 * Return the current action to be applied according to the pointer
 	 */
-	int curAction(void);
+	int curAction();
 
 	/**
 	 * Show the cursor
@@ -318,12 +318,12 @@ protected:
 
 	// Initialization and state change
 	void initState(CORO_PARAM);
-	void closeState(void);
+	void closeState();
 	void changeState(CORO_PARAM, OptionScreenState newState);
 
 	// Repaint the options menu
 	void refreshAll(CORO_PARAM);
-	void refreshThumbnails(void);
+	void refreshThumbnails();
 };
 
 } // End of namespace Tony
diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp
index e973fe9f6b..a4d8b9332b 100644
--- a/engines/tony/gfxcore.cpp
+++ b/engines/tony/gfxcore.cpp
@@ -91,7 +91,7 @@ void RMGfxBuffer::create(int dimx, int dimy, int nBpp, bool bUseDDraw) {
 	}
 }
 
-void RMGfxBuffer::destroy(void) {
+void RMGfxBuffer::destroy() {
 	if (!_bUseDDraw) {
 		if (_origBuf != NULL && _origBuf == _buf) {
 			delete[] _origBuf;
@@ -100,13 +100,13 @@ void RMGfxBuffer::destroy(void) {
 	}
 }
 
-void RMGfxBuffer::lock(void) {
+void RMGfxBuffer::lock() {
 	if (_bUseDDraw) {
 		// Manages acceleration
 	}
 }
 
-void RMGfxBuffer::unlock(void) {
+void RMGfxBuffer::unlock() {
 	if (_bUseDDraw) {
 		// Manages acceleration
 	}
@@ -143,7 +143,6 @@ int RMGfxSourceBuffer::init(const byte *buf, int dimx, int dimy, bool bLoadPalet
 	return dimx * dimy * getBpp() / 8;
 }
 
-
 void RMGfxSourceBuffer::init(RMDataStream &ds, int dimx, int dimy, bool bLoadPalette) {
 	create(dimx, dimy, getBpp());
 	ds.read(_buf, dimx * dimy * getBpp() / 8);
@@ -155,7 +154,7 @@ void RMGfxSourceBuffer::init(RMDataStream &ds, int dimx, int dimy, bool bLoadPal
 RMGfxSourceBuffer::~RMGfxSourceBuffer() {
 }
 
-void RMGfxSourceBuffer::prepareImage(void) {
+void RMGfxSourceBuffer::prepareImage() {
 	// Do nothing. Can be overloaded if necessary
 }
 
@@ -243,10 +242,8 @@ RMGfxWoodyBuffer::RMGfxWoodyBuffer() {
 
 RMGfxWoodyBuffer::RMGfxWoodyBuffer(int dimx, int dimy, bool bUseDDraw)
 	: RMGfxBuffer(dimx, dimy, 16, bUseDDraw) {
-
 }
 
-
 /****************************************************************************\
 *       RMGfxTargetBuffer Methods
 \****************************************************************************/
@@ -262,7 +259,7 @@ RMGfxTargetBuffer::~RMGfxTargetBuffer() {
 //	g_system->deleteMutex(csModifyingOT);
 }
 
-void RMGfxTargetBuffer::clearOT(void) {
+void RMGfxTargetBuffer::clearOT() {
 	OTList *cur, *n;
 
 //	g_system->lockMutex(csModifyingOT);
@@ -409,8 +406,7 @@ int RMGfxSourceBufferPal::loadPalette(const byte *buf) {
 	return (1 << getBpp()) * 4;
 }
 
-
-void RMGfxSourceBufferPal::preparePalette(void) {
+void RMGfxSourceBufferPal::preparePalette() {
 	int i;
 
 	for (i = 0; i < 256; i++) {
@@ -704,7 +700,7 @@ void RMGfxSourceBuffer8RLE::init(RMDataStream &ds, int dimx, int dimy, bool bLoa
 	}
 }
 
-void RMGfxSourceBuffer8RLE::preparePalette(void) {
+void RMGfxSourceBuffer8RLE::preparePalette() {
 	// Invoke the parent method
 	RMGfxSourceBuffer8::preparePalette();
 
@@ -716,7 +712,7 @@ void RMGfxSourceBuffer8RLE::preparePalette(void) {
 	}
 }
 
-void RMGfxSourceBuffer8RLE::prepareImage(void) {
+void RMGfxSourceBuffer8RLE::prepareImage() {
 	// Invoke the parent method
 	RMGfxSourceBuffer::prepareImage();
 
@@ -724,12 +720,11 @@ void RMGfxSourceBuffer8RLE::prepareImage(void) {
 	compressRLE();
 }
 
-void RMGfxSourceBuffer8RLE::setAlreadyCompressed(void) {
+void RMGfxSourceBuffer8RLE::setAlreadyCompressed() {
 	_bNeedRLECompress = false;
 }
 
-
-void RMGfxSourceBuffer8RLE::compressRLE(void) {
+void RMGfxSourceBuffer8RLE::compressRLE() {
 	int x, y;
 	byte *startline;
 	byte *cur;
@@ -1515,11 +1510,9 @@ RLEWordDoCopy2:
 			return;
 
 		assert(nLength > 0);
-
 	}
 }
 
-
 /****************************************************************************\
 *               Methods for RMGfxSourceBuffer8AA
 \****************************************************************************/
@@ -1527,7 +1520,7 @@ RLEWordDoCopy2:
 byte RMGfxSourceBuffer8AA::_megaAABuf[256 * 1024];
 byte RMGfxSourceBuffer8AA::_megaAABuf2[64 * 1024];
 
-void RMGfxSourceBuffer8AA::prepareImage(void) {
+void RMGfxSourceBuffer8AA::prepareImage() {
 	// Invoke the parent method
 	RMGfxSourceBuffer::prepareImage();
 
@@ -1535,8 +1528,7 @@ void RMGfxSourceBuffer8AA::prepareImage(void) {
 	calculateAA();
 }
 
-
-void RMGfxSourceBuffer8AA::calculateAA(void) {
+void RMGfxSourceBuffer8AA::calculateAA() {
 	int x, y;
 	byte *src, *srcaa;
 
@@ -1721,16 +1713,14 @@ void RMGfxSourceBuffer8AA::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrim
 	CORO_END_CODE;
 }
 
-
 /****************************************************************************\
 *               RMGfxSourceBuffer8RLEAA Methods
 \****************************************************************************/
 
 RMGfxSourceBuffer8RLEByteAA::~RMGfxSourceBuffer8RLEByteAA() {
-
 }
 
-void RMGfxSourceBuffer8RLEByteAA::prepareImage(void) {
+void RMGfxSourceBuffer8RLEByteAA::prepareImage() {
 	RMGfxSourceBuffer::prepareImage();
 	calculateAA();
 	compressRLE();
@@ -1763,12 +1753,10 @@ void RMGfxSourceBuffer8RLEByteAA::init(RMDataStream &ds, int dimx, int dimy, boo
 	}
 }
 
-
 RMGfxSourceBuffer8RLEWordAA::~RMGfxSourceBuffer8RLEWordAA() {
-
 }
 
-void RMGfxSourceBuffer8RLEWordAA::prepareImage(void) {
+void RMGfxSourceBuffer8RLEWordAA::prepareImage() {
 	RMGfxSourceBuffer::prepareImage();
 	calculateAA();
 	compressRLE();
@@ -1869,7 +1857,7 @@ void RMGfxSourceBuffer16::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimi
 	}
 }
 
-void RMGfxSourceBuffer16::prepareImage(void) {
+void RMGfxSourceBuffer16::prepareImage() {
 	// Color space conversion if necessary!
 	int i;
 	uint16 *buf = (uint16 *)_buf;
@@ -1878,14 +1866,12 @@ void RMGfxSourceBuffer16::prepareImage(void) {
 		WRITE_LE_UINT16(&buf[i], FROM_LE_16(buf[i]) & 0x7FFF);
 }
 
-
 RMGfxSourceBuffer16::RMGfxSourceBuffer16(int dimx, int dimy, bool bUseDDraw)
 	: RMGfxBuffer(dimx, dimy, 16, bUseDDraw) {
 	setPriority(0);
 	_bTrasp0 = false;
 }
 
-
 /**
  * Returns the number of bits per pixel of the surface
  *
diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h
index 3b8384f614..be89c1713c 100644
--- a/engines/tony/gfxcore.h
+++ b/engines/tony/gfxcore.h
@@ -78,11 +78,11 @@ public:
 
 	// Creation
 	virtual void create(int dimx, int dimy, int nBpp, bool bUseDDraw = false);
-	virtual void destroy(void);
+	virtual void destroy();
 
 	// Buffer access
-	void lock(void);
-	void unlock(void);
+	void lock();
+	void unlock();
 
 	// These are valid only if the buffer is locked
 	operator byte *();
@@ -238,10 +238,10 @@ public:
 	virtual void removeThis(CORO_PARAM, bool &result);
 
 	// Registration
-	virtual void Register(void) {
+	virtual void Register() {
 		_nInList++;
 	}
-	virtual void Unregister(void) {
+	virtual void Unregister() {
 		_nInList--;
 		assert(_nInList >= 0);
 	}
@@ -300,7 +300,7 @@ public:
 	virtual ~RMGfxSourceBuffer();
 
 protected:
-	virtual void prepareImage(void);
+	virtual void prepareImage();
 	bool clip2D(int &x1, int &y1, int &u, int &v, int &width, int &height, bool bUseSrc, RMGfxTargetBuffer *buf);
 	void offsetY(int nLines) {
 		RMGfxBuffer::offsetY(nLines, getBpp());
@@ -316,7 +316,7 @@ public:
  */
 class RMGfxSourceBuffer16 : public RMGfxSourceBuffer {
 protected:
-	virtual void prepareImage(void);
+	virtual void prepareImage();
 	bool _bTrasp0;
 
 public:
@@ -342,7 +342,7 @@ protected:
 	uint16 _palFinal[256];
 
 	// Post process to prepare the palette for drawing
-	virtual void preparePalette(void);
+	virtual void preparePalette();
 
 public:
 	virtual ~RMGfxSourceBufferPal();
@@ -411,12 +411,12 @@ protected:
 	virtual void RLEDecompressLineFlipped(uint16 *dst, byte *src, int nStartSkip, int nLength) = 0;
 
 	// Perform image compression in RLE
-	void compressRLE(void);
+	void compressRLE();
 
 protected:
 	// Overriding initialization methods
-	virtual void prepareImage(void);
-	virtual void preparePalette(void);
+	virtual void prepareImage();
+	virtual void preparePalette();
 
 public:
 	RMGfxSourceBuffer8RLE();
@@ -433,7 +433,7 @@ public:
 	void setAlphaBlendColor(int color);
 
 	// Warn if the data is already compressed
-	void setAlreadyCompressed(void);
+	void setAlreadyCompressed();
 };
 
 class RMGfxSourceBuffer8RLEByte : public RMGfxSourceBuffer8RLE {
@@ -481,13 +481,13 @@ protected:
 	byte *_aabuf;
 
 	// Calculate the buffer for the anti-aliasing
-	void calculateAA(void);
+	void calculateAA();
 
 	// Draw the AA
 	void drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
 
 protected:
-	void prepareImage(void);
+	void prepareImage();
 
 public:
 	RMGfxSourceBuffer8AA();
@@ -500,7 +500,7 @@ public:
 
 class RMGfxSourceBuffer8RLEByteAA : public RMGfxSourceBuffer8RLEByte, public RMGfxSourceBuffer8AA {
 protected:
-	void prepareImage(void);
+	void prepareImage();
 
 public:
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
@@ -514,7 +514,7 @@ public:
 
 class RMGfxSourceBuffer8RLEWordAA : public RMGfxSourceBuffer8RLEWord, public RMGfxSourceBuffer8AA {
 protected:
-	void prepareImage(void);
+	void prepareImage();
 
 public:
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
@@ -570,7 +570,7 @@ public:
 	virtual ~RMGfxTargetBuffer();
 
 	// management of the OT list
-	void clearOT(void);
+	void clearOT();
 	void drawOT(CORO_PARAM);
 	void addPrim(RMGfxPrimitive *prim); // The pointer must be delted
 
diff --git a/engines/tony/gfxengine.cpp b/engines/tony/gfxengine.cpp
index 08eff0a991..0785ec534c 100644
--- a/engines/tony/gfxengine.cpp
+++ b/engines/tony/gfxengine.cpp
@@ -353,7 +353,7 @@ SKIPCLICKSINISTRO:
 	CORO_END_CODE;
 }
 
-void RMGfxEngine::initCustomDll(void) {
+void RMGfxEngine::initCustomDll() {
 	setupGlobalVars(&_tony, &_point, &_vm->_theBoxes, &_loc, &_inv, &_input);
 }
 
@@ -522,7 +522,7 @@ void RMGfxEngine::init() {
 	_tony.executeAction(20, 1, 0);
 }
 
-void RMGfxEngine::close(void) {
+void RMGfxEngine::close() {
 	_bigBuf.clearOT();
 
 	_inter.close();
@@ -538,37 +538,37 @@ void RMGfxEngine::switchFullscreen(bool bFull) {
 void RMGfxEngine::GDIControl(bool bCon) {
 }
 
-void RMGfxEngine::enableInput(void) {
+void RMGfxEngine::enableInput() {
 	_bInput = true;
 }
 
-void RMGfxEngine::disableInput(void) {
+void RMGfxEngine::disableInput() {
 	_bInput = false;
 	_inter.reset();
 }
 
-void RMGfxEngine::enableMouse(void) {
+void RMGfxEngine::enableMouse() {
 	_bAlwaysDrawMouse = true;
 }
 
-void RMGfxEngine::disableMouse(void) {
+void RMGfxEngine::disableMouse() {
 	_bAlwaysDrawMouse = false;
 }
 
-void RMGfxEngine::freeze(void) {
+void RMGfxEngine::freeze() {
 	g_system->lockMutex(_csMainLoop);
 }
 
-void RMGfxEngine::unfreeze(void) {
+void RMGfxEngine::unfreeze() {
 	g_system->unlockMutex(_csMainLoop);
 }
 
 void CharsSaveAll(Common::OutSaveFile *f);
 void CharsLoadAll(Common::InSaveFile *f);
-void MCharResetCodes(void);
+void MCharResetCodes();
 void SaveChangedHotspot(Common::OutSaveFile *f);
 void LoadChangedHotspot(Common::InSaveFile *f);
-void ReapplyChangedHotspot(void);
+void ReapplyChangedHotspot();
 
 void RestoreMusic(CORO_PARAM);
 void SaveMusic(Common::OutSaveFile *f);
@@ -856,7 +856,7 @@ void RMGfxEngine::initWipe(int type) {
 		_rcWipeEllipse = Common::Rect(320 - FSTEP, 240 - FSTEP, 320 + FSTEP, 240 + FSTEP);
 }
 
-void RMGfxEngine::closeWipe(void) {
+void RMGfxEngine::closeWipe() {
 	_bWiping = false;
 }
 
diff --git a/engines/tony/gfxengine.h b/engines/tony/gfxengine.h
index 9cc586d25d..74aafd15f6 100644
--- a/engines/tony/gfxengine.h
+++ b/engines/tony/gfxengine.h
@@ -90,7 +90,7 @@ public:
 	void init();
 
 	// Closes the graphics engine
-	void close(void);
+	void close();
 
 	// Warns when changing
 	void switchFullscreen(bool bFull);
@@ -102,12 +102,12 @@ public:
 	void openOptionScreen(CORO_PARAM, int type);
 
 	// Enables or disables mouse input
-	void enableInput(void);
-	void disableInput(void);
+	void enableInput();
+	void disableInput();
 
 	// Enables and disables mouse draw
-	void enableMouse(void);
-	void disableMouse(void);
+	void enableMouse();
+	void disableMouse();
 
 	operator byte *() {
 		return (byte *)_bigBuf;
@@ -117,7 +117,7 @@ public:
 	}
 
 	// Link to the custom function list
-	void initCustomDll(void);
+	void initCustomDll();
 
 	// Link to graphic task
 	void linkGraphicTask(RMGfxTask *task) {
@@ -129,8 +129,8 @@ public:
 	void unloadLocation(CORO_PARAM, bool bDoOnExit, uint32 *result);
 
 	// Freeze and unfreeze
-	void freeze(void);
-	void unfreeze(void);
+	void freeze();
+	void unfreeze();
 
 	// State management
 	void saveState(const Common::String &fn, byte *curThumb, const Common::String &name);
@@ -141,7 +141,7 @@ public:
 
 	// Wipe
 	void initWipe(int type);
-	void closeWipe(void);
+	void closeWipe();
 	void waitWipeEnd(CORO_PARAM);
 
 	void setPerorate(bool bpal) {
diff --git a/engines/tony/globals.h b/engines/tony/globals.h
index 96a61ffd9c..7b5d6db9cf 100644
--- a/engines/tony/globals.h
+++ b/engines/tony/globals.h
@@ -221,15 +221,15 @@ public:
 	uint32(*LoadLocation)(int, RMPoint, RMPoint start);
 	void (*UnloadLocation)(CORO_PARAM, bool bDoOnExit, uint32 *result);
 	void (*LinkGraphicTask)(RMGfxTask *task);
-	void (*Freeze)(void);
-	void (*Unfreeze)(void);
+	void (*Freeze)();
+	void (*Unfreeze)();
 	void (*WaitFrame)(CORO_PARAM);
 	void (*PlayMusic)(int nChannel, const char *fileName, int nFX, bool bLoop, int nSync);
 	void (*WaitWipeEnd)(CORO_PARAM);
-	void (*CloseWipe)(void);
+	void (*CloseWipe)();
 	void (*InitWipe)(int type);
-	void (*EnableGUI)(void);
-	void (*DisableGUI)(void);
+	void (*EnableGUI)();
+	void (*DisableGUI)();
 	void (*SetPerorate)(bool bpal);
 
 	uint32 _dwTonyNumTexts;
@@ -252,43 +252,43 @@ public:
 	/**
 	 * @defgroup MPAL variables
 	 */
-	uint32                  _mpalError;
-	LPITEMIRQFUNCTION       _lpiifCustom;
-	LPLPCUSTOMFUNCTION      _lplpFunctions;
-	Common::String         *_lplpFunctionStrings;
-	uint16                  _nObjs;
-	uint16                  _nVars;
-	HGLOBAL                 _hVars;
-	LPMPALVAR               _lpmvVars;
-	uint16                  _nMsgs;
-	HGLOBAL                 _hMsgs;
-	LPMPALMSG               _lpmmMsgs;
-	uint16                  _nDialogs;
-	HGLOBAL                 _hDialogs;
-	LPMPALDIALOG            _lpmdDialogs;
-	uint16                  _nItems;
-	HGLOBAL                 _hItems;
-	LPMPALITEM              _lpmiItems;
-	uint16                  _nLocations;
-	HGLOBAL                 _hLocations;
-	LPMPALLOCATION          _lpmlLocations;
-	uint16                  _nScripts;
-	HGLOBAL                 _hScripts;
-	LPMPALSCRIPT            _lpmsScripts;
-	Common::File            _hMpr;
-	uint16                  _nResources;
-	uint32                 *_lpResources;
-	bool                    _bExecutingAction;
-	bool                    _bExecutingDialog;
-	uint32                  _nPollingLocations[MAXPOLLINGLOCATIONS];
-	uint32                  _hEndPollingLocations[MAXPOLLINGLOCATIONS];
-	uint32                  _pollingThreads[MAXPOLLINGLOCATIONS];
-	uint32                  _hAskChoice;
-	uint32                  _hDoneChoice;
-	uint32                  _nExecutingAction;
-	uint32                  _nExecutingDialog;
-	uint32                  _nExecutingChoice;
-	uint32                  _nSelectedChoice;
+	uint32              _mpalError;
+	LPITEMIRQFUNCTION   _lpiifCustom;
+	LPLPCUSTOMFUNCTION  _lplpFunctions;
+	Common::String     *_lplpFunctionStrings;
+	uint16              _nObjs;
+	uint16              _nVars;
+	HGLOBAL             _hVars;
+	LPMPALVAR           _lpmvVars;
+	uint16              _nMsgs;
+	HGLOBAL             _hMsgs;
+	LPMPALMSG           _lpmmMsgs;
+	uint16              _nDialogs;
+	HGLOBAL             _hDialogs;
+	LPMPALDIALOG        _lpmdDialogs;
+	uint16              _nItems;
+	HGLOBAL             _hItems;
+	LPMPALITEM          _lpmiItems;
+	uint16              _nLocations;
+	HGLOBAL             _hLocations;
+	LPMPALLOCATION      _lpmlLocations;
+	uint16              _nScripts;
+	HGLOBAL             _hScripts;
+	LPMPALSCRIPT        _lpmsScripts;
+	Common::File        _hMpr;
+	uint16              _nResources;
+	uint32             *_lpResources;
+	bool                _bExecutingAction;
+	bool                _bExecutingDialog;
+	uint32              _nPollingLocations[MAXPOLLINGLOCATIONS];
+	uint32              _hEndPollingLocations[MAXPOLLINGLOCATIONS];
+	uint32              _pollingThreads[MAXPOLLINGLOCATIONS];
+	uint32              _hAskChoice;
+	uint32              _hDoneChoice;
+	uint32              _nExecutingAction;
+	uint32              _nExecutingDialog;
+	uint32              _nExecutingChoice;
+	uint32              _nSelectedChoice;
 };
 
 } // End of namespace Tony
diff --git a/engines/tony/input.cpp b/engines/tony/input.cpp
index 36cad4c6a1..2a8cdc10c3 100644
--- a/engines/tony/input.cpp
+++ b/engines/tony/input.cpp
@@ -46,10 +46,9 @@ RMInput::RMInput() {
 }
 
 RMInput::~RMInput() {
-
 }
 
-void RMInput::poll(void) {
+void RMInput::poll() {
 	_leftClickMouse = _leftReleaseMouse = _rightClickMouse = _rightReleaseMouse = false;
 
 	// Get pending events
@@ -105,7 +104,7 @@ void RMInput::poll(void) {
 void RMInput::init() {
 }
 
-void RMInput::close(void) {
+void RMInput::close() {
 }
 
 bool RMInput::mouseLeft() {
diff --git a/engines/tony/input.h b/engines/tony/input.h
index 81fa3433c4..d9b6dc7e89 100644
--- a/engines/tony/input.h
+++ b/engines/tony/input.h
@@ -50,7 +50,7 @@ private:
 	/**
 	 * Deinitialize DirectInput
 	 */
-	void DIClose(void);
+	void DIClose();
 
 public:
 	RMInput();
@@ -64,12 +64,12 @@ public:
 	/**
 	 * Closes the class
 	 */
-	void close(void);
+	void close();
 
 	/**
 	 * Polling (must be performed once per frame)
 	 */
-	void poll(void);
+	void poll();
 
 	/**
 	 * Reading of the mouse
diff --git a/engines/tony/inventory.cpp b/engines/tony/inventory.cpp
index 7b111f8f58..0438d7252b 100644
--- a/engines/tony/inventory.cpp
+++ b/engines/tony/inventory.cpp
@@ -72,7 +72,7 @@ bool RMInventory::checkPointInside(const RMPoint &pt) {
 }
 
 
-void RMInventory::init(void) {
+void RMInventory::init() {
 	int i, j;
 	int curres;
 
@@ -160,7 +160,7 @@ void RMInventory::init(void) {
 	clearOT();
 }
 
-void RMInventory::close(void) {
+void RMInventory::close() {
 	// Has memory
 	if (_items != NULL) {
 		// Delete the item pointers
@@ -175,7 +175,7 @@ void RMInventory::close(void) {
 	destroy();
 }
 
-void RMInventory::reset(void) {
+void RMInventory::reset() {
 	_state = CLOSED;
 	endCombine();
 }
@@ -288,7 +288,7 @@ void RMInventory::changeItemStatus(uint32 code, uint32 dwStatus) {
 }
 
 
-void RMInventory::prepare(void) {
+void RMInventory::prepare() {
 	int i;
 
 	for (i = 1; i < RM_SX / 64 - 1; i++) {
@@ -303,7 +303,7 @@ void RMInventory::prepare(void) {
 	addPrim(new RMGfxPrimitive(&_items[28]._icon, RMPoint(640 - 64, 0)));
 }
 
-bool RMInventory::miniActive(void) {
+bool RMInventory::miniActive() {
 	return _state == SELECTING;
 }
 
@@ -323,7 +323,7 @@ bool RMInventory::haveFocus(const RMPoint &mpos) {
 	return false;
 }
 
-void RMInventory::endCombine(void) {
+void RMInventory::endCombine() {
 	_bCombining = false;
 }
 
@@ -661,7 +661,6 @@ void RMInventory::doFrame(RMGfxTargetBuffer &bigBuf, RMPointer &ptr, RMPoint mpo
 	}
 }
 
-
 bool RMInventory::itemInFocus(const RMPoint &mpt) {
 	if ((_state == OPENED || _state == OPENING) && checkPointInside(mpt))
 		return true;
@@ -681,9 +680,7 @@ RMItem *RMInventory::whichItemIsIn(const RMPoint &mpt) {
 	return NULL;
 }
 
-
-
-int RMInventory::getSaveStateSize(void) {
+int RMInventory::getSaveStateSize() {
 	//     m_inv   pattern   m_nInv
 	return 256 * 4 + 256 * 4   +  4     ;
 }
@@ -742,7 +739,6 @@ int RMInventory::loadState(byte *state) {
 	return getSaveStateSize();
 }
 
-
 /****************************************************************************\
 *           RMInterface methods
 \****************************************************************************/
@@ -753,7 +749,6 @@ RMInterface::RMInterface() : RMGfxSourceBuffer8RLEByte() {
 }
 
 RMInterface::~RMInterface() {
-
 }
 
 bool RMInterface::active() {
@@ -810,7 +805,6 @@ void RMInterface::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pr
 	CORO_END_CODE;
 }
 
-
 void RMInterface::doFrame(RMGfxTargetBuffer &bigBuf, RMPoint mousepos) {
 	// If needed, add to the OT schedule list
 	if (!_nInList && _bActive)
@@ -875,7 +869,7 @@ bool RMInterface::released(const RMPoint &mousepos, RMTonyAction &action) {
 	return true;
 }
 
-void RMInterface::reset(void) {
+void RMInterface::reset() {
 	_bActive = false;
 }
 
@@ -883,11 +877,11 @@ void RMInterface::setPerorate(bool bOn) {
 	_bPerorate = bOn;
 }
 
-bool RMInterface::getPerorate(void) {
+bool RMInterface::getPerorate() {
 	return _bPerorate;
 }
 
-void RMInterface::init(void) {
+void RMInterface::init() {
 	int i;
 	RMResRaw inter(RES_I_INTERFACE);
 	RMRes pal(RES_I_INTERPPAL);
@@ -934,7 +928,7 @@ void RMInterface::init(void) {
 	_lastHotZone = 0;
 }
 
-void RMInterface::close(void) {
+void RMInterface::close() {
 	int i;
 
 	destroy();
diff --git a/engines/tony/inventory.h b/engines/tony/inventory.h
index dfbde5bad0..a5b37748c3 100644
--- a/engines/tony/inventory.h
+++ b/engines/tony/inventory.h
@@ -82,7 +82,7 @@ protected:
 	/**
 	 * Prepare the image inventory. It should be recalled whenever the inventory changes
 	 */
-	void prepare(void);
+	void prepare();
 
 	/**
 	 * Check if the mouse Y position is conrrect, even under the inventory portion of the screen
@@ -101,9 +101,9 @@ public:
 	/**
 	 * Initialization and closing
 	 */
-	void init(void);
-	void close(void);
-	void reset(void);
+	void init();
+	void close();
+	void reset();
 
 	/**
 	 * Overload test for removal from OT list
@@ -123,7 +123,7 @@ public:
 	/**
 	 * Method for determining if the mini interface is active
 	 */
-	bool miniActive(void);
+	bool miniActive();
 
 	/**
 	 * Handle the left mouse click (only when the inventory has the focus)
@@ -139,7 +139,7 @@ public:
 	/**
 	 * Warn that an item combine is over
 	 */
-	void endCombine(void);
+	void endCombine();
 
 public:
 	/**
@@ -178,7 +178,7 @@ public:
 	/**
 	 * Save methods
 	 */
-	int getSaveStateSize(void);
+	int getSaveStateSize();
 	void saveState(byte *state);
 	int loadState(byte *state);
 };
@@ -219,13 +219,13 @@ public:
 	/**
 	 * Initialization
 	 */
-	void init(void);
-	void close(void);
+	void init();
+	void close();
 
 	/**
 	 * Reset the interface
 	 */
-	void reset(void);
+	void reset();
 
 	/**
 	 * Warns of mouse clicks and releases
@@ -237,7 +237,7 @@ public:
 	 * Enables or disables the fifth verb
 	 */
 	void setPerorate(bool bOn);
-	bool getPerorate(void);
+	bool getPerorate();
 
 	/**
 	 * Overloaded Draw
diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp
index d92b28845b..e8dbb4fa69 100644
--- a/engines/tony/loc.cpp
+++ b/engines/tony/loc.cpp
@@ -138,7 +138,7 @@ void RMPattern::readFromStream(RMDataStream &ds, bool bLOX) {
 	}
 }
 
-void RMPattern::updateCoord(void) {
+void RMPattern::updateCoord() {
 	_curPos = _pos + _slots[_nCurSlot].pos();
 }
 
@@ -446,7 +446,7 @@ void RMSfx::pause(bool bPause) {
 	}
 }
 
-void RMSfx::stop(void) {
+void RMSfx::stop() {
 	if (_fx) {
 		_fx->stop();
 		_bPlayingLoop = false;
@@ -665,7 +665,7 @@ bool RMItem::doFrame(RMGfxTargetBuffer *bigBuf, bool bAddToList) {
 	return oldSprite != _nCurSprite;
 }
 
-RMPoint RMItem::calculatePos(void) {
+RMPoint RMItem::calculatePos() {
 	return _pos + _patterns[_nCurPattern].pos();
 }
 
@@ -736,7 +736,6 @@ void RMItem::setPattern(int nPattern, bool bPlayP0) {
 	}
 }
 
-
 bool RMItem::getName(RMString &name) {
 	char buf[256];
 
@@ -747,8 +746,7 @@ bool RMItem::getName(RMString &name) {
 	return true;
 }
 
-
-void RMItem::unload(void) {
+void RMItem::unload() {
 	if (_patterns != NULL) {
 		delete[] _patterns;
 		_patterns = NULL;
@@ -856,11 +854,11 @@ RMWipe::~RMWipe() {
 	CoroScheduler.closeEvent(_hEndOfFade);
 }
 
-int RMWipe::priority(void) {
+int RMWipe::priority() {
 	return 200;
 }
 
-void RMWipe::Unregister(void) {
+void RMWipe::Unregister() {
 	RMGfxTask::Unregister();
 	assert(_nInList == 0);
 	CoroScheduler.setEvent(_hUnregistered);
@@ -887,7 +885,7 @@ void RMWipe::waitForFadeEnd(CORO_PARAM) {
 	CORO_END_CODE;
 }
 
-void RMWipe::closeFade(void) {
+void RMWipe::closeFade() {
 	_wip0r.unload();
 }
 
@@ -1786,8 +1784,7 @@ void RMBoxLoc::readFromStream(RMDataStream &ds) {
 		ds >> _boxes[i];
 }
 
-
-void RMBoxLoc::recalcAllAdj(void) {
+void RMBoxLoc::recalcAllAdj() {
 	int i, j;
 
 	for (i = 0; i < _numbBox; i++) {
@@ -1819,7 +1816,7 @@ RMGameBoxes::~RMGameBoxes() {
 		delete _allBoxes[i];
 }
 
-void RMGameBoxes::init(void) {
+void RMGameBoxes::init() {
 	int i;
 	RMString fn;
 	RMDataStream ds;
@@ -1840,7 +1837,7 @@ void RMGameBoxes::init(void) {
 	}
 }
 
-void RMGameBoxes::close(void) {
+void RMGameBoxes::close() {
 }
 
 RMBoxLoc *RMGameBoxes::getBoxes(int nLoc) {
@@ -1878,8 +1875,7 @@ void RMGameBoxes::changeBoxStatus(int nLoc, int nBox, int status) {
 	_allBoxes[nLoc]->recalcAllAdj();
 }
 
-
-int RMGameBoxes::getSaveStateSize(void) {
+int RMGameBoxes::getSaveStateSize() {
 	int size;
 	int i;
 
@@ -2204,12 +2200,11 @@ RMItem *RMLocation::whichItemIsIn(const RMPoint &pt) {
 		return &_items[found];
 }
 
-
 RMLocation::~RMLocation() {
 	unload();
 }
 
-void RMLocation::unload(void) {
+void RMLocation::unload() {
 	// Clear memory
 	if (_items) {
 		delete[] _items;
@@ -2323,7 +2318,7 @@ void RMMessage::load(uint32 dwId) {
 		parseMessage();
 }
 
-void RMMessage::parseMessage(void) {
+void RMMessage::parseMessage() {
 	char *p;
 
 	assert(_lpMessage != NULL);
diff --git a/engines/tony/loc.h b/engines/tony/loc.h
index b863a3af1b..35674736dd 100644
--- a/engines/tony/loc.h
+++ b/engines/tony/loc.h
@@ -84,7 +84,7 @@ public:
 	void play(bool bLoop = false);
 	void setVolume(int vol);
 	void pause(bool bPause);
-	void stop(void);
+	void stop();
 
 	void readFromStream(RMDataStream &ds, bool bLOX = false);
 };
@@ -165,7 +165,7 @@ public:
 	void readFromStream(RMDataStream &ds, bool bLOX = false);
 
 private:
-	void updateCoord(void);
+	void updateCoord();
 };
 
 
@@ -235,7 +235,7 @@ private:
 	bool _bInitCurPattern;
 
 public:
-	RMPoint calculatePos(void);
+	RMPoint calculatePos();
 
 public:
 	RMItem();
@@ -282,7 +282,7 @@ public:
 	}
 
 	// Unload
-	void unload(void);
+	void unload();
 
 	// Wait for the end of the current pattern
 	void waitForEndPattern(CORO_PARAM, uint32 hCustomSkip = CORO_INVALID_PID_VALUE);
@@ -350,7 +350,7 @@ public:
 	virtual ~RMBoxLoc();
 
 	friend RMDataStream &operator >>(RMDataStream &ds, RMBoxLoc &bl);
-	void recalcAllAdj(void);
+	void recalcAllAdj();
 };
 
 #define GAME_BOXES_SIZE 200
@@ -364,8 +364,8 @@ public:
 	RMGameBoxes();
 	~RMGameBoxes();
 
-	void init(void);
-	void close(void);
+	void init();
+	void close();
 
 	// Get binding boxes for a given location
 	RMBoxLoc *getBoxes(int nLoc);
@@ -381,7 +381,7 @@ public:
 	void changeBoxStatus(int nLoc, int nBox, int status);
 
 	// Save state handling
-	int getSaveStateSize(void);
+	int getSaveStateSize();
 	void saveState(byte *buf);
 	void loadState(byte *buf);
 };
@@ -513,12 +513,12 @@ public:
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
 
 	void initFade(int type);
-	void closeFade(void);
+	void closeFade();
 	void waitForFadeEnd(CORO_PARAM);
 
-	virtual void Unregister(void);
+	virtual void Unregister();
 	virtual void removeThis(CORO_PARAM, bool &result);
-	virtual int priority(void);
+	virtual int priority();
 };
 
 
@@ -563,7 +563,7 @@ public:
 	bool loadLOX(RMDataStream &ds);
 
 	// Unload
-	void unload(void);
+	void unload();
 
 	// Overloaded draw
 	virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
@@ -606,7 +606,7 @@ private:
 	int _nPeriods;
 
 private:
-	void parseMessage(void);
+	void parseMessage();
 
 public:
 	RMMessage();
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index bb3df1662f..7385e60b66 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -59,101 +59,91 @@ const char *mpalCopyright =
 /**
  * Locks the variables for access
  */
-void lockVar(void) {
+void lockVar() {
 	GLOBALS._lpmvVars = (LPMPALVAR)globalLock(GLOBALS._hVars);
 }
 
 /**
  * Unlocks variables after use
  */
-void unlockVar(void) {
+void unlockVar() {
 	globalUnlock(GLOBALS._hVars);
 }
 
 /**
  * Locks the messages for access
  */
-static void LockMsg(void) {
+static void LockMsg() {
 #ifdef NEED_LOCK_MSGS
 	GLOBALS._lpmmMsgs = (LPMPALMSG)globalLock(GLOBALS._hMsgs);
 #endif
 }
 
-
 /**
  * Unlocks the messages after use
  */
-static void UnlockMsg(void) {
+static void UnlockMsg() {
 #ifdef NEED_LOCK_MSGS
 	globalUnlock(GLOBALS._hMsgs);
 #endif
 }
 
-
 /**
  * Locks the dialogs for access
  */
-static void lockDialogs(void) {
+static void lockDialogs() {
 	GLOBALS._lpmdDialogs = (LPMPALDIALOG)globalLock(GLOBALS._hDialogs);
 }
 
-
 /**
  * Unlocks the dialogs after use
  */
-static void unlockDialogs(void) {
+static void unlockDialogs() {
 	globalUnlock(GLOBALS._hDialogs);
 }
 
-
 /**
  * Locks the location data structures for access
  */
-static void lockLocations(void) {
+static void lockLocations() {
 	GLOBALS._lpmlLocations = (LPMPALLOCATION)globalLock(GLOBALS._hLocations);
 }
 
-
 /**
  * Unlocks the location structures after use
  */
-static void unlockLocations(void) {
+static void unlockLocations() {
 	globalUnlock(GLOBALS._hLocations);
 }
 
-
 /**
  * Locks the items structures for use
  */
-static void lockItems(void) {
+static void lockItems() {
 	GLOBALS._lpmiItems = (LPMPALITEM)globalLock(GLOBALS._hItems);
 }
 
-
 /**
  * Unlocks the items structures after use
  */
-static void unlockItems(void) {
+static void unlockItems() {
 	globalUnlock(GLOBALS._hItems);
 }
 
-
 /**
  * Locks the script data structures for use
  */
-static void LockScripts(void) {
+static void LockScripts() {
 	GLOBALS._lpmsScripts = (LPMPALSCRIPT)globalLock(GLOBALS._hScripts);
 }
 
-
 /**
  * Unlocks the script data structures after use
  */
-static void unlockScripts(void) {
+static void unlockScripts() {
 	globalUnlock(GLOBALS._hScripts);
 }
 
-
 /**
  * Returns the current value of a global variable
  *
@@ -175,7 +165,6 @@ int32 varGetValue(const char *lpszVarName) {
 	return 0;
 }
 
-
 /**
  * Sets the value of a MPAL global variable
  * @param lpszVarName       Name of the variable
@@ -204,7 +193,6 @@ void varSetValue(const char *lpszVarName, int32 val) {
 	return;
 }
 
-
 /**
  * Find the index of a location within the location array. Remember to call LockLoc() beforehand.
  *
@@ -1973,17 +1961,15 @@ void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...) {
 	va_end(v);
 }
 
-
 /**
  * Returns the current MPAL error code
  *
  * @returns		Error code
  */
-uint32 mpalGetError(void) {
+uint32 mpalGetError() {
 	return GLOBALS._mpalError;
 }
 
-
 /**
  * Execute a script. The script runs on multitasking by a thread.
  *
@@ -2091,17 +2077,15 @@ void mpalEndIdlePoll(CORO_PARAM, int nLoc, bool *result) {
 	CORO_END_CODE;
 }
 
-
 /**
  * Retrieve the length of a save state
  *
  * @returns		Length in bytes
  */
-int mpalGetSaveStateSize(void) {
+int mpalGetSaveStateSize() {
 	return GLOBALS._nVars * sizeof(MPALVAR) + 4;
 }
 
-
 /**
  * Store the save state into a buffer. The buffer must be
  * length at least the size specified with mpalGetSaveStateSize
@@ -2251,7 +2235,6 @@ int OutputStartOther(uint16 wNum, Common::OutSaveFile *f) {
 	return 0;
 }
 
-
 void outputEndOther(uint16 wNum, Common::OutSaveFile *f) {
 	int i;
 
@@ -2262,8 +2245,7 @@ void outputEndOther(uint16 wNum, Common::OutSaveFile *f) {
 		}
 }
 
-
-void mpalDumpMessages(void) {
+void mpalDumpMessages() {
 	int i, j;
 	char *lpMessage;
 	char *p;
@@ -2354,9 +2336,7 @@ void mpalDumpMessages(void) {
 	UnlockMsg();
 }
 
-
-
-void mpalDumpOthers(void) {
+void mpalDumpOthers() {
 	int i,j;
 	char *lpMessage;
 	char *p;
@@ -2914,7 +2894,7 @@ void mpalDumpDialog(LPMPALDIALOG dlg) {
 	delete v1;
 }
 
-void mpalDumpDialogs(void) {
+void mpalDumpDialogs() {
 	int i;
 
 	lockDialogs();
@@ -2925,8 +2905,6 @@ void mpalDumpDialogs(void) {
 	unlockDialogs();
 }
 
-//@}
-
 } // end of namespace MPAL
 
 } // end of namespace Tony
diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h
index 1ec96c97d0..251e78afdf 100644
--- a/engines/tony/mpal/mpal.h
+++ b/engines/tony/mpal/mpal.h
@@ -327,7 +327,6 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
 #define mpalQueryDialogWaitForChoice(dwRet)                  \
         CORO_INVOKE_2(mpalQueryCORO, MPQ_DIALOG_WAITFORCHOICE, dwRet)
 
-
 /**
  * Requires a list of various options for some choice within the current dialog.
  *
@@ -340,7 +339,6 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
 #define mpalQueryDialogSelectList(nChoice)              \
         (uint32 *)mpalQueryHANDLE(MPQ_DIALOG_SELECTLIST, (uint32)(nChoice))
 
-
 /**
  * Warns the library that the user has selected, in a certain choice of the current dialog, 
  * corresponding option at a certain given.
@@ -358,7 +356,6 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
 #define mpalQueryDialogSelectionDWORD(nChoice, dwData)        \
         mpalQueryDWORD(MPQ_DIALOG_SELECTION, (uint32)(nChoice), (uint32)(dwData))
 
-
 /**
  * Warns the library an action was performed on a Object. 
  * The library will call custom functions, if necessary.
@@ -375,7 +372,6 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
 #define mpalQueryDoAction(nAction, nItem, dwParam)      \
         mpalQueryDWORD(MPQ_DO_ACTION, (uint32)(nAction), (uint32)(nItem), (uint32)(dwParam))
 
-
 /**
  * Warns the library a dialogue was required.
  *
@@ -387,8 +383,6 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
 #define mpalQueryDoDialog(nDialog,nGroup)               \
         mpalQueryDWORD(MPQ_DO_DIALOG, (uint32)(nDialog),(uint32)(nGroup))
 
-//@}
-
 /**
  * @defgroup Functions exported to the main game
  */
@@ -442,7 +436,6 @@ HANDLE mpalQueryHANDLE(uint16 wQueryType, ...);
  */
 void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...);
 
-
 /**
  * Execute a script. The script runs on multitasking by a thread.
  *
@@ -451,14 +444,12 @@ void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...);
  */
 bool mpalExecuteScript(int nScript);
 
-
 /**
  * Returns the current MPAL error code
  *
  * @returns		Error code
  */
-uint32 mpalGetError(void);
-
+uint32 mpalGetError();
 
 /**
  * Install a custom routine That will be called by MPAL every time the pattern 
@@ -468,7 +459,6 @@ uint32 mpalGetError(void);
  */
 void mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCustom);
 
-
 /**
  * Process the idle actions of the items on one location.
  *
@@ -480,7 +470,6 @@ void mpalInstallItemIrq(LPITEMIRQFUNCTION lpiifCustom);
  */
 bool mpalStartIdlePoll(int nLoc);
 
-
 /**
  * Stop processing the idle actions of the items on one location.
  *
@@ -499,7 +488,6 @@ void mpalEndIdlePoll(CORO_PARAM, int nLoc, bool *result);
  */
 int mpalLoadState(byte *buf);
 
-
 /**
  * Store the save state into a buffer. The buffer must be
  * length at least the size specified with mpalGetSaveStateSize
@@ -508,27 +496,22 @@ int mpalLoadState(byte *buf);
  */
 void mpalSaveState(byte *buf);
 
-
 /**
  * Retrieve the length of a save state
  *
  * @returns		Length in bytes
  */
-int mpalGetSaveStateSize(void);
-
+int mpalGetSaveStateSize();
 
 /**
  * Locks the variables for access
  */
-void lockVar(void);
-
+void lockVar();
 
 /**
  * Unlocks variables after use
  */
-void unlockVar(void);
-
-//@}
+void unlockVar();
 
 } // end of namespace MPAL
 
diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index d8b3655d2e..7e786a2f11 100644
--- a/engines/tony/sound.cpp
+++ b/engines/tony/sound.cpp
@@ -635,7 +635,7 @@ bool FPStream::unloadFile() {
 	return true;
 }
 
-void FPStream::prefetch(void) {
+void FPStream::prefetch() {
 #ifdef REFACTOR_ME
 	uint32 dwId;
 	void *lpBuf;
@@ -702,7 +702,7 @@ void FPStream::prefetch(void) {
 #endif
 }
 
-void FPStream::playFast(void) {
+void FPStream::playFast() {
 #ifdef REFACTOR_ME
 	dspnHot[0].dwOffset = 32;
 	dspnHot[0].hEventNotify = hHot1;
diff --git a/engines/tony/sound.h b/engines/tony/sound.h
index e1f0e40851..4dd00a3028 100644
--- a/engines/tony/sound.h
+++ b/engines/tony/sound.h
@@ -348,8 +348,8 @@ public:
 	 */
 
 	bool play();
-	void playFast(void);
-	void prefetch(void);
+	void playFast();
+	void prefetch();
 
 	/**
 	 * Closes the stream.
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index 79694b2601..9e9e032e49 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -345,11 +345,11 @@ void TonyEngine::preloadUtilSFX(int nChannel, const char *fn) {
 	warning("TonyEngine::preloadUtilSFX");
 }
 
-void TonyEngine::unloadAllSFX(void) {
+void TonyEngine::unloadAllSFX() {
 	warning("TonyEngine::unloadAllSFX");
 }
 
-void TonyEngine::unloadAllUtilSFX(void) {
+void TonyEngine::unloadAllUtilSFX() {
 	warning("TonyEngine::unloadAllUtilSFX");
 }
 
@@ -480,11 +480,11 @@ void TonyEngine::closeVoiceDatabase() {
 		_voices.clear();
 }
 
-void TonyEngine::grabThumbnail(void) {
+void TonyEngine::grabThumbnail() {
 	_window.grabThumbnail(_curThumbnail);
 }
 
-void TonyEngine::optionScreen(void) {
+void TonyEngine::optionScreen() {
 }
 
 void TonyEngine::openInitLoadMenu(CORO_PARAM) {
@@ -495,7 +495,7 @@ void TonyEngine::openInitOptions(CORO_PARAM) {
 	_theEngine.openOptionScreen(coroParam, 2);
 }
 
-void TonyEngine::abortGame(void) {
+void TonyEngine::abortGame() {
 	_bQuitNow = true;
 }
 
@@ -555,7 +555,7 @@ void TonyEngine::playProcess(CORO_PARAM, const void *param) {
 /**
  * Play the game
  */
-void TonyEngine::play(void) {
+void TonyEngine::play() {
 	// Create the game player process
 	CoroScheduler.createProcess(playProcess, NULL);
 
@@ -569,7 +569,7 @@ void TonyEngine::play(void) {
 	}
 }
 
-void TonyEngine::close(void) {
+void TonyEngine::close() {
 	closeMusic();
 	CoroScheduler.closeEvent(_hEndOfFrame);
 	_theBoxes.close();
@@ -589,12 +589,12 @@ void TonyEngine::GDIControl(bool bCon) {
 	_theEngine.GDIControl(bCon);
 }
 
-void TonyEngine::freezeTime(void) {
+void TonyEngine::freezeTime() {
 	_bTimeFreezed = true;
 	_nTimeFreezed = getTime() - _startTime;
 }
 
-void TonyEngine::unfreezeTime(void) {
+void TonyEngine::unfreezeTime() {
 	_bTimeFreezed = false;
 }
 
diff --git a/engines/tony/tony.h b/engines/tony/tony.h
index 817147805a..5f6fd8cb44 100644
--- a/engines/tony/tony.h
+++ b/engines/tony/tony.h
@@ -165,21 +165,21 @@ public:
 	void getDataDirectory(DataDir dir, char *path);
 
 	void switchFullscreen(bool bFull);
-	void optionScreen(void);
+	void optionScreen();
 
-	void showLocation(void) {
+	void showLocation() {
 		_bDrawLocation = true;
 	}
-	void hideLocation(void) {
+	void hideLocation() {
 		_bDrawLocation = false;
 	}
 
 	/**
 	 * Reads the time
 	 */
-	uint32 getTime(void);
-	void freezeTime(void);
-	void unfreezeTime(void);
+	uint32 getTime();
+	void freezeTime();
+	void unfreezeTime();
 
 	// Music
 	// ******
@@ -195,10 +195,10 @@ public:
 	FPSfx *createSFX(Common::SeekableReadStream *stream);
 
 	void preloadSFX(int nSfx, const char *fn);
-	void unloadAllSFX(void);
+	void unloadAllSFX();
 
 	void preloadUtilSFX(int nSfx, const char *fn);
-	void unloadAllUtilSFX(void);
+	void unloadAllUtilSFX();
 
 	/**
 	 * Stop all the audio
@@ -219,12 +219,12 @@ public:
 	/**
 	 * Get a thumbnail
 	 */
-	void grabThumbnail(void);
-	uint16 *getThumbnail(void) {
+	void grabThumbnail();
+	uint16 *getThumbnail() {
 		return _curThumbnail;
 	}
 
-	void quitGame(void) {
+	void quitGame() {
 		_bQuitNow = true;
 	}
 
diff --git a/engines/tony/tonychar.cpp b/engines/tony/tonychar.cpp
index 700b69a643..cd5bbdad8b 100644
--- a/engines/tony/tonychar.cpp
+++ b/engines/tony/tonychar.cpp
@@ -84,7 +84,7 @@ RMGfxSourceBuffer *RMTony::newItemSpriteBuffer(int dimx, int dimy, bool bPreRLE)
 	return spr;
 }
 
-void RMTony::init(void) {
+void RMTony::init() {
 	RMRes tony(0);
 	RMRes body(9999);
 	RMDataStream ds;
@@ -119,7 +119,7 @@ void RMTony::init(void) {
 }
 
 
-void RMTony::close(void) {
+void RMTony::close() {
 	// Deallocation of missing item
 //	_shadow.destroy();
 }
@@ -156,7 +156,7 @@ void RMTony::doFrame(CORO_PARAM, RMGfxTargetBuffer *bigBuf, int curLoc) {
 	CORO_END_CODE;
 }
 
-void RMTony::show(void) {
+void RMTony::show() {
 	_bShow = true;
 	_bShowShadow = true;
 }
@@ -334,7 +334,7 @@ void RMTony::stop(CORO_PARAM) {
 }
 
 
-int RMTony::getCurPattern(void) {
+int RMTony::getCurPattern() {
 	int nPatt = RMCharacter::getCurPattern();
 
 	if (!_bShepherdess)
diff --git a/engines/tony/tonychar.h b/engines/tony/tonychar.h
index 70765abfd8..a50641bf25 100644
--- a/engines/tony/tonychar.h
+++ b/engines/tony/tonychar.h
@@ -369,12 +369,12 @@ public:
 	/**
 	 * Initialize Tony
 	 */
-	void init(void);
+	void init();
 
 	/**
 	 * Free all memory
 	 */
-	void close(void);
+	void close();
 
 	/**
 	 * Tony makes a frame, updating the movement, etc.
@@ -389,7 +389,7 @@ public:
 	/**
 	 * Show or hide
 	 */
-	void show(void);
+	void show();
 	void hide(bool bShowShadow = false);
 
 	/**
@@ -478,7 +478,7 @@ public:
 	void setShepherdess(bool bIsPast) {
 		_bShepherdess = bIsPast;
 	}
-	int getShepherdess(void) {
+	int getShepherdess() {
 		return _bShepherdess;
 	}
 
diff --git a/engines/tony/utils.cpp b/engines/tony/utils.cpp
index 6c36781f51..7661c600da 100644
--- a/engines/tony/utils.cpp
+++ b/engines/tony/utils.cpp
@@ -296,7 +296,7 @@ void RMString::resize(int size, bool bMantain) {
 /**
  * Compacts the string to occupy less memory if possible.
  */
-void RMString::compact(void) {
+void RMString::compact() {
 	if (_realLength + 1 > _length) {
 		char *app;
 
@@ -518,7 +518,7 @@ RMDataStream::~RMDataStream() {
 /**
  * Close a stream
  */
-void RMDataStream::close(void) {
+void RMDataStream::close() {
 	_length = 0;
 	_pos = 0;
 }
@@ -850,7 +850,7 @@ RMRect::RMRect() {
 	setEmpty();
 }
 
-void RMRect::setEmpty(void) {
+void RMRect::setEmpty() {
 	_x1 = _y1 = _x2 = _y2 = 0;
 }
 
@@ -981,7 +981,7 @@ bool RMRect::operator!=(const RMRect &rc) {
 	return ((_x1 != rc._x1) || (_y1 != rc._y1) || (_x2 != rc._x2) || (_y2 != rc._y2));
 }
 
-void RMRect::normalizeRect(void) {
+void RMRect::normalizeRect() {
 	setRect(MIN(_x1, _x2), MIN(_y1, _y2), MAX(_x1, _x2), MAX(_y1, _y2));
 }
 
diff --git a/engines/tony/utils.h b/engines/tony/utils.h
index 4b0074f94c..c4f7386739 100644
--- a/engines/tony/utils.h
+++ b/engines/tony/utils.h
@@ -69,7 +69,7 @@ public:
 
 	// Loading buffer
 	void openBuffer(const byte *buf, int size = SIZENOTKNOWN);
-	void close(void);
+	void close();
 
 	// Attributei
 	int length();
@@ -99,7 +99,6 @@ public:
 	bool isError();
 };
 
-
 /**
  * Data stream per lettura di dati aperto da file
  */
@@ -115,10 +114,9 @@ public:
 	bool openFile(const char *lpFN);
 	bool openFile(Common::File &file);
 
-	void close(void);
+	void close();
 };
 
-
 class RMFileStreamSlow : public RMDataStream {
 private:
 	Common::SeekableReadStream *_stream;
@@ -129,7 +127,7 @@ public:
 	bool openFile(const char *lpFN);
 	bool openFile(Common::File &file);
 
-	void close(void);
+	void close();
 
 	RMDataStream &operator+=(int nBytes);
 	int seek(int nBytes, RMDSPos where = CUR);
@@ -272,7 +270,7 @@ public:
 	// Set
 	void setRect(int x1, int y1, int x2, int y2);
 	void setRect(const RMPoint &p1, const RMPoint &p2);
-	void setEmpty(void);
+	void setEmpty();
 
 	// Copiers
 	void setRect(const RMRect &rc);
diff --git a/engines/tony/window.cpp b/engines/tony/window.cpp
index dd7c70fe19..ba030e6a36 100644
--- a/engines/tony/window.cpp
+++ b/engines/tony/window.cpp
@@ -66,7 +66,7 @@ void RMWindow::init() {
 /**
  * Close the window
  */
-void RMWindow::close(void) {
+void RMWindow::close() {
 }
 
 void RMWindow::grabThumbnail(uint16 *thumbmem) {
@@ -77,7 +77,7 @@ void RMWindow::grabThumbnail(uint16 *thumbmem) {
 /**
  * Repaint the screen
  */
-void RMWindow::repaint(void) {
+void RMWindow::repaint() {
 	g_system->updateScreen();
 }
 
diff --git a/engines/tony/window.h b/engines/tony/window.h
index 876bbf6973..0d4c20b0fe 100644
--- a/engines/tony/window.h
+++ b/engines/tony/window.h
@@ -72,7 +72,7 @@ protected:
 	bool _bGrabMovie;
 	uint16 *_wThumbBuf;
 
-	void createBWPrecalcTable(void);
+	void createBWPrecalcTable();
 	void wipeEffect(Common::Rect &rcBoundEllipse);
 	void getNewFrameWipe(byte *lpBuf, Common::Rect &rcBoundEllipse);
 
@@ -84,13 +84,13 @@ public:
 	 * Initialization
 	 */
 	void init(/*HINSTANCE hInst*/);
-	void initDirectDraw(void);
-	void close(void);
+	void initDirectDraw();
+	void close();
 
 	/**
 	 * Drawing
 	 */
-	void repaint(void);
+	void repaint();
 
 	/**
 	 * Switch between windowed and fullscreen