Some very obvious cleanups.

svn-id: r25635

12 files changed, 14 insertions, 13 deletions

diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp
index e0e7be3fea..883ad2d7ca 100644
--- a/backends/fs/ds/ds-fs.cpp
+++ b/backends/fs/ds/ds-fs.cpp
@@ -567,7 +567,7 @@ size_t std_fread(const void* ptr, size_t size, size_t numItems, FILE* handle) {
 					if (feof(handle)) eof = true;
 					*(((char *) (ptr)) + r * size + t) = getc(handle);
 				}*/
-				int left = size * numItems;;
+				int left = size * numItems;
 				int bytesRead = -1;
 				while ((left > 0) && (!FAT_feof((FAT_FILE *) handle))) {
 					int amount = left > 8192? 8192: left;
diff --git a/backends/platform/x11/x11.cpp b/backends/platform/x11/x11.cpp
index a16fbe8adc..7be5a976a9 100644
--- a/backends/platform/x11/x11.cpp
+++ b/backends/platform/x11/x11.cpp
@@ -244,7 +244,7 @@ static void *sound_and_music_thread(void *params) {
 	param = AFMT_S16_LE;
 	if (ioctl(sound_fd, SNDCTL_DSP_SETFMT, &param) == -1) {
 		warning("Error in the SNDCTL_DSP_SETFMT ioctl!\n");
-		return NULL;;
+		return NULL;
 	}
 	if (param != AFMT_S16_LE) {
 		warning("AFMT_S16_LE not supported!\n");
diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp
index 4fcb1c947d..c1fb8c8c4f 100644
--- a/engines/agos/debug.cpp
+++ b/engines/agos/debug.cpp
@@ -338,7 +338,7 @@ void AGOSEngine::dumpVgaFile(const byte *vga) {
 
 	pp = vga;
 	if (getGameType() == GType_FF || getGameType() == GType_PP) {
-		p = pp + READ_LE_UINT16(pp + 2);;
+		p = pp + READ_LE_UINT16(pp + 2);
 		count = READ_LE_UINT16(&((const VgaFileHeader2_Feeble *) p)->imageCount);
 		p = pp + READ_LE_UINT16(&((const VgaFileHeader2_Feeble *) p)->imageTable);
 
@@ -349,7 +349,7 @@ void AGOSEngine::dumpVgaFile(const byte *vga) {
 			p += sizeof(ImageHeader_Feeble);
 		}
 	} else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
-		p = pp + READ_BE_UINT16(pp + 4);;
+		p = pp + READ_BE_UINT16(pp + 4);
 		count = READ_BE_UINT16(&((const VgaFileHeader2_Common *) p)->imageCount);
 		p = pp + READ_BE_UINT16(&((const VgaFileHeader2_Common *) p)->imageTable);
 
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index c9459c4005..a66642657e 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -195,7 +195,7 @@ void AGOSEngine::loadMusic(uint music) {
 			// other music tracks. In simon1dos/talkie the GMF resource includes
 			// a loop override that acomplishes this, but there seems to be nothing
 			// for this in the SMF resources.
-			midi.setLoop(music != 35);; // Must do this BEFORE loading music. (GMF may have its own override.)
+			midi.setLoop(music != 35); // Must do this BEFORE loading music. (GMF may have its own override.)
 
 			_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music], SEEK_SET);
 			_gameFile->read(buf, 4);
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index d3ecb3fa28..a876c5402a 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -782,7 +782,8 @@ byte *AGOSEngine::readSingleOpcode(Common::SeekableReadStream *in, byte *ptr) {
 				val = 0xFFF7;
 				break;
 			default:
-				val = fileReadItemID(in);;
+				val = fileReadItemID(in);
+				break;
 			}
 			WRITE_BE_UINT16(ptr, val); ptr += 2;
 			break;
diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp
index 0e4ea37562..3097bc1eef 100644
--- a/engines/agos/vga_ff.cpp
+++ b/engines/agos/vga_ff.cpp
@@ -388,7 +388,7 @@ void AGOSEngine::startAnOverlayAnim() {
 	}
 
 	vsp->y = x / 20 * 32;
-	vsp->x = x % 20 * 32;;
+	vsp->x = x % 20 * 32;
 	vsp->id = vcReadVar(a);
 	vsp->zoneNum = zoneNum;
 
diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp
index ab9a446ab2..01974a0ce3 100644
--- a/engines/gob/game_v2.cpp
+++ b/engines/gob/game_v2.cpp
@@ -530,7 +530,7 @@ int16 Game_v2::checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId,
 							_vm->_util->setScrollOffset();
 						else
 							_vm->_util->setScrollOffset(_vm->_draw->_scrollOffsetX,
-									_vm->_draw->_scrollOffsetY + _vm->_draw->_off_2E51B->height);;
+									_vm->_draw->_scrollOffsetY + _vm->_draw->_off_2E51B->height);
 					}
 					_vm->_util->setMousePos(_vm->_global->_inter_mouseX, _vm->_global->_inter_mouseY);
 				}
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index bf6082bade..bd43ff5a23 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -2305,7 +2305,7 @@ void Inter_v2::o2_setScrollOffset(void) {
 	if (_vm->_draw->_off_2E51B != 0)
 		warning("_vid_setPixelShift(%d, %d)", _vm->_draw->_scrollOffsetX, _vm->_draw->_scrollOffsetY + 200 - _vm->_draw->_word_2E51F);
 	else
-		warning("_vid_setPixelShift(%d, %d)", _vm->_draw->_scrollOffsetX, _vm->_draw->_scrollOffsetY);;
+		warning("_vid_setPixelShift(%d, %d)", _vm->_draw->_scrollOffsetX, _vm->_draw->_scrollOffsetY);
 */
 }
 
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp
index a3b6997384..1670e705a6 100644
--- a/engines/kyra/script_v1.cpp
+++ b/engines/kyra/script_v1.cpp
@@ -1491,7 +1491,7 @@ int KyraEngine::o1_playWinterScrollSequence(ScriptState *script) {
 
 int KyraEngine::o1_getIdolGem(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "o1_getIdolGem(%p) (%d)", (const void *)script, stackPos(0));
-	return _idolGemsTable[stackPos(0)];;
+	return _idolGemsTable[stackPos(0)];
 }
 
 int KyraEngine::o1_setIdolGem(ScriptState *script) {
diff --git a/engines/scumm/he/logic_he.cpp b/engines/scumm/he/logic_he.cpp
index 2bae9abbc2..4ccc2ac5e8 100644
--- a/engines/scumm/he/logic_he.cpp
+++ b/engines/scumm/he/logic_he.cpp
@@ -503,7 +503,7 @@ int LogicHEfunshop::checkShape(int32 data0, int32 data1, int32 data4, int32 data
 	diff7_3 = data7 - data3;
 	diff2 = data3 * data6 - data2 * data7;
 	sum1 = diff2_6 * data1 + diff2 + diff7_3 * data0;
-	sum2 = diff2_6 * data5 + diff2 + diff7_3 * data4;;
+	sum2 = diff2_6 * data5 + diff2 + diff7_3 * data4;
 
 	if (sum1 != 0 && sum2 != 0) {
 		sum2 ^= sum1;
diff --git a/engines/sky/rnc_deco.cpp b/engines/sky/rnc_deco.cpp
index 6218c296c3..a49ddb0735 100644
--- a/engines/sky/rnc_deco.cpp
+++ b/engines/sky/rnc_deco.cpp
@@ -200,7 +200,7 @@ int32 RncDecoder::unpackM1(const void *input, void *output, uint16 key) {
 	inputptr = (((const uint8 *)input) + HEADER_LEN);
 	_srcPtr = inputptr;
 
-	inputHigh = ((const uint8 *)input) + packLen + HEADER_LEN;;
+	inputHigh = ((const uint8 *)input) + packLen + HEADER_LEN;
 	outputLow = (uint8 *)output;
 	outputHigh = *(((const uint8 *)input) + 16) + unpackLen + outputLow;
 
diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp
index 12c268c80f..23b5e8afb5 100644
--- a/engines/touche/resource.cpp
+++ b/engines/touche/resource.cpp
@@ -345,7 +345,7 @@ void ToucheEngine::res_decodeProgramData() {
 		phbd.str = READ_LE_UINT16(p); p += 2;
 		phbd.defaultStr = READ_LE_UINT16(p); p += 2;
 		for (int i = 0; i < 8; ++i) {
-			phbd.actions[i] = READ_LE_UINT16(p); p += 2;;
+			phbd.actions[i] = READ_LE_UINT16(p); p += 2;
 		}
 		for (int i = 0; i < 2; ++i) {
 			int16 x = READ_LE_UINT16(p); p += 2;