[Scummvm-cvs-logs] SF.net SVN: scummvm: [25635] scummvm/trunk
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Fri Feb 16 18:13:31 CET 2007
Revision: 25635
http://scummvm.svn.sourceforge.net/scummvm/?rev=25635&view=rev
Author: eriktorbjorn
Date: 2007-02-16 09:13:29 -0800 (Fri, 16 Feb 2007)
Log Message:
-----------
Some very obvious cleanups.
Modified Paths:
--------------
scummvm/trunk/backends/fs/ds/ds-fs.cpp
scummvm/trunk/backends/platform/x11/x11.cpp
scummvm/trunk/engines/agos/debug.cpp
scummvm/trunk/engines/agos/res_snd.cpp
scummvm/trunk/engines/agos/subroutine.cpp
scummvm/trunk/engines/agos/vga_ff.cpp
scummvm/trunk/engines/gob/game_v2.cpp
scummvm/trunk/engines/gob/inter_v2.cpp
scummvm/trunk/engines/kyra/script_v1.cpp
scummvm/trunk/engines/scumm/he/logic_he.cpp
scummvm/trunk/engines/sky/rnc_deco.cpp
scummvm/trunk/engines/touche/resource.cpp
Modified: scummvm/trunk/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/backends/fs/ds/ds-fs.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -567,7 +567,7 @@
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;
Modified: scummvm/trunk/backends/platform/x11/x11.cpp
===================================================================
--- scummvm/trunk/backends/platform/x11/x11.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/backends/platform/x11/x11.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -244,7 +244,7 @@
param = AFMT_S16_LE;
if (ioctl(sound_fd, SNDCTL_DSP_SETFMT, ¶m) == -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");
Modified: scummvm/trunk/engines/agos/debug.cpp
===================================================================
--- scummvm/trunk/engines/agos/debug.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/engines/agos/debug.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -338,7 +338,7 @@
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 @@
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);
Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/engines/agos/res_snd.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -195,7 +195,7 @@
// 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);
Modified: scummvm/trunk/engines/agos/subroutine.cpp
===================================================================
--- scummvm/trunk/engines/agos/subroutine.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/engines/agos/subroutine.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -782,7 +782,8 @@
val = 0xFFF7;
break;
default:
- val = fileReadItemID(in);;
+ val = fileReadItemID(in);
+ break;
}
WRITE_BE_UINT16(ptr, val); ptr += 2;
break;
Modified: scummvm/trunk/engines/agos/vga_ff.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_ff.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/engines/agos/vga_ff.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -388,7 +388,7 @@
}
vsp->y = x / 20 * 32;
- vsp->x = x % 20 * 32;;
+ vsp->x = x % 20 * 32;
vsp->id = vcReadVar(a);
vsp->zoneNum = zoneNum;
Modified: scummvm/trunk/engines/gob/game_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v2.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/engines/gob/game_v2.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -530,7 +530,7 @@
_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);
}
Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/engines/gob/inter_v2.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -2305,7 +2305,7 @@
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);
*/
}
Modified: scummvm/trunk/engines/kyra/script_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v1.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/engines/kyra/script_v1.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -1491,7 +1491,7 @@
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) {
Modified: scummvm/trunk/engines/scumm/he/logic_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/logic_he.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/engines/scumm/he/logic_he.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -503,7 +503,7 @@
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;
Modified: scummvm/trunk/engines/sky/rnc_deco.cpp
===================================================================
--- scummvm/trunk/engines/sky/rnc_deco.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/engines/sky/rnc_deco.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -200,7 +200,7 @@
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;
Modified: scummvm/trunk/engines/touche/resource.cpp
===================================================================
--- scummvm/trunk/engines/touche/resource.cpp 2007-02-16 16:57:59 UTC (rev 25634)
+++ scummvm/trunk/engines/touche/resource.cpp 2007-02-16 17:13:29 UTC (rev 25635)
@@ -345,7 +345,7 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list