[Scummvm-git-logs] scummvm master -> 6cda47ca3d87b4f54ce92a16c97387396314e2af

eriktorbjorn eriktorbjorn at telia.com
Tue Apr 18 06:50:39 CEST 2017


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:
6cda47ca3d JANITORIAL: Remove superfluous semicolons


Commit: 6cda47ca3d87b4f54ce92a16c97387396314e2af
    https://github.com/scummvm/scummvm/commit/6cda47ca3d87b4f54ce92a16c97387396314e2af
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2017-04-18T06:49:14+02:00

Commit Message:
JANITORIAL: Remove superfluous semicolons

Changed paths:
    backends/platform/3ds/osystem-graphics.cpp
    devtools/create_project/cmake.cpp
    engines/bladerunner/script/init.cpp
    engines/bladerunner/script/scene/ct09.cpp
    engines/bladerunner/script/scene/nr07.cpp
    engines/cryo/resource.cpp
    engines/dm/champion.cpp
    engines/dm/gfx.cpp
    engines/dm/group.cpp
    engines/xeen/character.cpp
    engines/xeen/combat.cpp


diff --git a/backends/platform/3ds/osystem-graphics.cpp b/backends/platform/3ds/osystem-graphics.cpp
index ec60956..78b7907 100644
--- a/backends/platform/3ds/osystem-graphics.cpp
+++ b/backends/platform/3ds/osystem-graphics.cpp
@@ -150,7 +150,7 @@ void OSystem_3DS::initSize(uint width, uint height,
 	_overlay.create(getOverlayWidth(), getOverlayHeight(), _pfGameTexture);
 
 	if (format) {
-		debug("pixelformat: %d %d %d %d %d", format->bytesPerPixel, format->rBits(), format->gBits(), format->bBits(), format->aBits());;
+		debug("pixelformat: %d %d %d %d %d", format->bytesPerPixel, format->rBits(), format->gBits(), format->bBits(), format->aBits());
 		_pfGame = *format;
 	}
 
diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index b6dca11..dfa5487 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -305,7 +305,7 @@ void CMakeProvider::writeEngineDefinitions(std::ofstream &workspace) const {
 	workspace << "    if (ENABLE_${ENGINE})\n";
 	workspace << "        add_definitions(-DENABLE_${ENGINE})\n";
 	workspace << "        foreach(SUB_ENGINE IN LISTS SUB_ENGINES_${ENGINE})\n";
-	workspace << "            add_definitions(-DENABLE_${SUB_ENGINE})\n";;
+	workspace << "            add_definitions(-DENABLE_${SUB_ENGINE})\n";
 	workspace << "        endforeach(SUB_ENGINE)\n";
 	workspace << "    endif()\n";
 	workspace << "endforeach()\n\n";
diff --git a/engines/bladerunner/script/init.cpp b/engines/bladerunner/script/init.cpp
index e1b8ee8..76f68ed 100644
--- a/engines/bladerunner/script/init.cpp
+++ b/engines/bladerunner/script/init.cpp
@@ -1785,7 +1785,7 @@ void ScriptInit::Init_World_Waypoints() {
 	World_Waypoint_Set(132, 24, 619.45f, -9.0f, 234.0f);
 	World_Waypoint_Set(133, 24, 619.45f, -9.0f, 270.0f);
 	World_Waypoint_Set(134, 22, -80.59f, -60.31f, 256.35f);
-	World_Waypoint_Set(135, 22, -48.0f, -60.31f, 183.0f);;
+	World_Waypoint_Set(135, 22, -48.0f, -60.31f, 183.0f);
 	World_Waypoint_Set(136, 22, -24.59f, -60.31f, 64.35f);
 	World_Waypoint_Set(137, 22, 99.41f, -60.31f, 4.35f);
 	World_Waypoint_Set(138, 22, 99.41f, -60.34f, -115.65f);
diff --git a/engines/bladerunner/script/scene/ct09.cpp b/engines/bladerunner/script/scene/ct09.cpp
index 5320afc..3c883f4 100644
--- a/engines/bladerunner/script/scene/ct09.cpp
+++ b/engines/bladerunner/script/scene/ct09.cpp
@@ -134,7 +134,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) {
 		}
 		return true;
 	}
-	return false;;
+	return false;
 }
 
 bool SceneScriptCT09::ClickedOn2DRegion(int region) {
diff --git a/engines/bladerunner/script/scene/nr07.cpp b/engines/bladerunner/script/scene/nr07.cpp
index 92c1d6d..8e9c784 100644
--- a/engines/bladerunner/script/scene/nr07.cpp
+++ b/engines/bladerunner/script/scene/nr07.cpp
@@ -103,7 +103,7 @@ bool SceneScriptNR07::ClickedOnActor(int actorId) {
 				break;
 			}
 			Actor_Set_Goal_Number(kActorHanoi, 200);
-			return false;;
+			return false;
 		}
 		return true;
 	}
diff --git a/engines/cryo/resource.cpp b/engines/cryo/resource.cpp
index 7698de0..ccc1e73 100644
--- a/engines/cryo/resource.cpp
+++ b/engines/cryo/resource.cpp
@@ -141,18 +141,18 @@ void EdenGame::loadIconFile(uint16 num, Icon *buffer) {
 			buffer[i].sy = _bigfile.readSint16BE();
 			buffer[i].ex = _bigfile.readSint16BE();
 			buffer[i].ey = _bigfile.readSint16BE();
-			buffer[i]._cursorId = _bigfile.readUint16BE();;
-			buffer[i]._actionId = _bigfile.readUint32BE();;
-			buffer[i]._objectId = _bigfile.readUint32BE();;
+			buffer[i]._cursorId = _bigfile.readUint16BE();
+			buffer[i]._actionId = _bigfile.readUint32BE();
+			buffer[i]._objectId = _bigfile.readUint32BE();
 		}
 		else {
 			buffer[i].sx = _bigfile.readSint16LE();
 			buffer[i].sy = _bigfile.readSint16LE();
 			buffer[i].ex = _bigfile.readSint16LE();
 			buffer[i].ey = _bigfile.readSint16LE();
-			buffer[i]._cursorId = _bigfile.readUint16LE();;
-			buffer[i]._actionId = _bigfile.readUint32LE();;
-			buffer[i]._objectId = _bigfile.readUint32LE();;
+			buffer[i]._cursorId = _bigfile.readUint16LE();
+			buffer[i]._actionId = _bigfile.readUint32LE();
+			buffer[i]._objectId = _bigfile.readUint32LE();
 		}
 	}
 }
diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp
index 4536ff7..374f211 100644
--- a/engines/dm/champion.cpp
+++ b/engines/dm/champion.cpp
@@ -2085,7 +2085,7 @@ void ChampionMan::addCandidateChampionToParty(uint16 championPortraitIndex) {
 		curThing = dungeon.getNextThing(curThing);
 	}
 	_vm->_inventoryMan->toggleInventory((ChampionIndex)previousPartyChampionCount);
-	_vm->_menuMan->drawDisabledMenu();;
+	_vm->_menuMan->drawDisabledMenu();
 }
 
 void ChampionMan::drawChampionBarGraphs(ChampionIndex champIndex) {
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp
index caf6dc4..654cd04 100644
--- a/engines/dm/gfx.cpp
+++ b/engines/dm/gfx.cpp
@@ -1542,7 +1542,7 @@ void DisplayMan::drawSquareD3R(Direction dir, int16 posX, int16 posY) {
 		drawDoor(squareAspect[kDMSquareAspectDoorThingIndex],
 					  (DoorState)squareAspect[kDMSquareAspectDoorState], _doorNativeBitmapIndexFrontD3LCR,
 					  getBitmapByteCount(48, 41), kDMDoorOrnamentD3LCR, &doorFrameD3R);
-		break;;
+		break;
 	case kDMElementTypePit:
 		if (!squareAspect[kDMSquareAspectPitInvisible])
 			drawFloorPitOrStairsBitmapFlippedHorizontally(kDMGraphicIdxFloorPitD3L, frameFloorPitD3R);
diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp
index 8656d9f..43d5dc8 100644
--- a/engines/dm/group.cpp
+++ b/engines/dm/group.cpp
@@ -830,7 +830,7 @@ T0209061_MoveGroup:
 										if (_vm->_moveSens->getMoveResult(groupThing, eventMapX, eventMapY, AL0450_i_DestinationMapX, AL0451_i_DestinationMapY))
 											return;
 										nextEvent._Bu._location._mapX = _vm->_moveSens->_moveResultMapX;
-										nextEvent._Bu._location._mapY = _vm->_moveSens->_moveResultMapY;;
+										nextEvent._Bu._location._mapY = _vm->_moveSens->_moveResultMapY;
 										activeGroup->_priorMapX = eventMapX;
 										activeGroup->_priorMapY = eventMapY;
 										activeGroup->_lastMoveTime = _vm->_gameTime;
diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index dc2b658..e9c66e6 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -1780,7 +1780,7 @@ void Character::subtractHitPoints(int amount) {
 		int v = getMaxHP() + _currentHp;
 		if (v >= 1) {
 			_conditions[UNCONSCIOUS] = 1;
-			sound.playFX(38);;
+			sound.playFX(38);
 		} else {
 			_conditions[DEAD] = 1;
 			flag = true;
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index bc01e87..784dd18 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -349,7 +349,7 @@ void Combat::doCharDamage(Character &c, int charNum, int monsterDataIndex) {
 					c._weapons[idx]._bonusFlags |= ITEMFLAG_CURSED;
 				c._armor[idx]._bonusFlags |= ITEMFLAG_CURSED;
 				c._accessories[idx]._bonusFlags |= ITEMFLAG_CURSED;
-				c._misc[idx]._bonusFlags |= ITEMFLAG_CURSED;;
+				c._misc[idx]._bonusFlags |= ITEMFLAG_CURSED;
 			}
 			sound.playFX(37);
 			break;





More information about the Scummvm-git-logs mailing list