[Scummvm-cvs-logs] scummvm master -> 85e55d0c6ee6c1cdfabf121cc10d359c6c473cd6
eriktorbjorn
eriktorbjorn at telia.com
Wed May 25 05:37:41 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
85e55d0c6e JANITORIAL: Remove unnecessary semicolons
Commit: 85e55d0c6ee6c1cdfabf121cc10d359c6c473cd6
https://github.com/scummvm/scummvm/commit/85e55d0c6ee6c1cdfabf121cc10d359c6c473cd6
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-05-25T05:37:07+02:00
Commit Message:
JANITORIAL: Remove unnecessary semicolons
Changed paths:
backends/platform/3ds/sprite.cpp
engines/agi/graphics.cpp
engines/agi/saveload.cpp
engines/agi/systemui.cpp
image/codecs/msrle4.cpp
diff --git a/backends/platform/3ds/sprite.cpp b/backends/platform/3ds/sprite.cpp
index a0aee38..f97c611 100644
--- a/backends/platform/3ds/sprite.cpp
+++ b/backends/platform/3ds/sprite.cpp
@@ -62,7 +62,7 @@ void Sprite::create(uint16 width, uint16 height, const Graphics::PixelFormat &f)
actualHeight = height;
format = f;
w = MAX(nextHigher2(width), 64u);
- h = MAX(nextHigher2(height), 64u);;
+ h = MAX(nextHigher2(height), 64u);
pitch = w * format.bytesPerPixel;
dirtyPixels = true;
diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index c7d643d..24cd4f4 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -605,7 +605,7 @@ void GfxMgr::render_BlockEGA(int16 x, int16 y, int16 width, int16 height, bool c
switch (_upscaledHires) {
case DISPLAY_UPSCALED_640x400:
- offsetDisplay += _displayScreenWidth;;
+ offsetDisplay += _displayScreenWidth;
break;
default:
break;
@@ -660,7 +660,7 @@ void GfxMgr::render_BlockCGA(int16 x, int16 y, int16 width, int16 height, bool c
switch (_upscaledHires) {
case DISPLAY_UPSCALED_640x400:
- offsetDisplay += _displayScreenWidth;;
+ offsetDisplay += _displayScreenWidth;
break;
default:
break;
@@ -743,7 +743,7 @@ void GfxMgr::render_BlockHercules(int16 x, int16 y, int16 width, int16 height, b
offsetVisual += SCRIPT_WIDTH - width;
offsetDisplay += _displayScreenWidth - displayWidth;
- offsetDisplay += _displayScreenWidth;;
+ offsetDisplay += _displayScreenWidth;
remainingHeight--;
}
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index aa46cf4..fc4aea3 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -829,7 +829,7 @@ SavedGameSlotIdArray AgiEngine::getSavegameSlotIds() {
filenames = _saveFileMan->listSavefiles(_targetName + ".###");
Common::StringArray::iterator it;
- Common::StringArray::iterator end = filenames.end();;
+ Common::StringArray::iterator end = filenames.end();
// convert to lower-case, just to be sure
for (it = filenames.begin(); it != end; it++) {
diff --git a/engines/agi/systemui.cpp b/engines/agi/systemui.cpp
index aeb1ded..1f26267 100644
--- a/engines/agi/systemui.cpp
+++ b/engines/agi/systemui.cpp
@@ -585,7 +585,7 @@ void SystemUI::readSavedGameSlots(bool filterNonexistant, bool withAutoSaveSlot)
slotIdArray.push_back(SYSTEMUI_SAVEDGAME_MAXIMUM_SLOTS); // so that the loop will process all slots
SavedGameSlotIdArray::iterator it;
- SavedGameSlotIdArray::iterator end = slotIdArray.end();;
+ SavedGameSlotIdArray::iterator end = slotIdArray.end();
for (it = slotIdArray.begin(); it != end; it++) {
curSlotId = *it;
diff --git a/image/codecs/msrle4.cpp b/image/codecs/msrle4.cpp
index cd9a871..fc18af8 100644
--- a/image/codecs/msrle4.cpp
+++ b/image/codecs/msrle4.cpp
@@ -85,7 +85,7 @@ void MSRLE4Decoder::decode4(Common::SeekableReadStream &stream) {
return;
}
- output = (byte *)_surface->getBasePtr(x, y);;
+ output = (byte *)_surface->getBasePtr(x, y);
} else {
// Copy data
More information about the Scummvm-git-logs
mailing list