Changed foo(void) to foo() in almost all non-backend source files

svn-id: r45616

9 files changed, 98 insertions, 98 deletions

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;