refactor: Remove double semicolons.

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp

@@ -120,8 +120,8 @@ Bool W3DVideoBuffer::allocate( UnsignedInt width, UnsignedInt height )
 
 	m_width = width;
 	m_height = height;
-	m_textureWidth = width;;
-	m_textureHeight = height;;
+	m_textureWidth = width;
+	m_textureHeight = height;
 	unsigned int temp_depth=1;
 	TextureLoader::Validate_Texture_Size( m_textureWidth, m_textureHeight, temp_depth);
 

Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp

@@ -171,7 +171,7 @@ LogicalSoundClass::On_Frame_Update (unsigned int milliseconds)
 	// Update the sound's position if its linked to a render object
 	//
 	Apply_Auto_Position ();
-	return SoundSceneObjClass::On_Frame_Update (milliseconds);;
+	return SoundSceneObjClass::On_Frame_Update (milliseconds);
 }
 
 

Core/Libraries/Source/WWVegas/WWLib/thread.cpp

@@ -16,7 +16,7 @@
 **	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #define _WIN32_WINNT 0x0400
 
 #include "thread.h"
 #include "Except.h"
@@ -37,7 +37,7 @@
 		size_t nameLen = strlcpy(ThreadName, thread_name, ARRAY_SIZE(ThreadName));
 		(void)nameLen; assert(nameLen < ARRAY_SIZE(ThreadName));
 	} else {
-		strcpy(ThreadName, "No name");;
+		strcpy(ThreadName, "No name");
 	}
 
 	ExceptionHandler = exception_handler;

Core/Libraries/Source/WWVegas/WWMath/obbox.cpp

@@ -79,7 +79,7 @@ OBBoxClass::OBBoxClass(const Vector3 * /*points*/, int /*n*/)
 	int i;
 
 	// compute mean and covariances of points
-	float xsum = 0.0f, ysum = 0.0f, zsum = 0.0f;;
+	float xsum = 0.0f, ysum = 0.0f, zsum = 0.0f;
 	float xxsum = 0.0f, xysum = 0.0f, xzsum = 0.0f;
 	float yysum = 0.0f, yzsum = 0.0f, zzsum = 0.0f;
 

Core/Tools/Autorun/GameText.cpp

@@ -441,7 +441,7 @@
 
 	while ( (*ptr++ = *first++) != 0 );
 
-	ptr -= 2;;
+	ptr -= 2;
 
 	while ( (ptr > buffer) && (ch = *ptr) != 0 && iswspace ( ch ) )
 	{
@@ -814,7 +814,7 @@
 		file.close();
 	}
 
 	return ok;
 }
 
 //============================================================================
@@ -1038,7 +1038,7 @@
 
 	file.close();
 
 	return ok;
 }
 
 //============================================================================
@@ -1114,7 +1114,7 @@
 
 	*buffer = 0;
 
 	return ok;
 }
 
 //============================================================================

Core/Tools/Babylon/BabylonDlg.cpp

@@ -133,7 +133,7 @@ static void removeLeadingAndTrailing ( char *buffer )
 
 	while ( *ptr++ = *first++ );
 
-	ptr -= 2;;
+	ptr -= 2;
 
 	while ( (ptr > buffer) && (ch = *ptr) && iswspace ( ch ) )
 	{
@@ -330,7 +330,7 @@ BOOL CBabylonDlg::OnInitDialog()
 #endif
 
 
-	Ready();;
+	Ready();
 
 	PostMessage ( WM_COMMAND, MAKEWPARAM ( IDC_RELOAD, BN_CLICKED ));
 

Core/Tools/ImagePacker/Source/WindowProcedures/ImagePackerProc.cpp

@@ -289,7 +289,7 @@ BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message,
 					// get the directory listbox
 					folderList = GetDlgItem( hWndDialog, LIST_FOLDERS );
 					if( folderList == NULL )
-						break;;
+						break;
 
 					// get the selected item in the folder listbox
 					Int selCount;

Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h

@@ -211,7 +211,7 @@ class RailroadBehavior	: public PhysicsBehavior
 	};
 
 	typedef std::vector<AsciiString> TemplateNameVector;
-	typedef TemplateNameVector::const_iterator TemplateNameIterator;;
+	typedef TemplateNameVector::const_iterator TemplateNameIterator;
 
 
 

Generals/Code/GameEngine/Source/Common/RTS/Player.cpp

@@ -3724,7 +3724,7 @@ void Player::xfer( Xfer *xfer )
 	{
 
 		DEBUG_CRASH(( "Player::xfer - m_ai present/missing mismatch" ));
-		throw SC_INVALID_DATA;;
+		throw SC_INVALID_DATA;
 
 	}
 	if( m_ai )

Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp

@@ -875,7 +875,7 @@ const Image* ControlBar::calculateVeterancyOverlayForThing( const ThingTemplate
 		case LEVEL_HEROIC:
 			return m_rankHeroicIcon;
 	}
-	return NULL;;
+	return NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -897,7 +897,7 @@ const Image* ControlBar::calculateVeterancyOverlayForObject( const Object *obj )
 		case LEVEL_HEROIC:
 			return m_rankHeroicIcon;
 	}
-	return NULL;;
+	return NULL;
 }
 
 //-------------------------------------------------------------------------------------------------

Generals/Code/GameEngine/Source/GameClient/GameText.cpp

@@ -485,7 +485,7 @@ void GameTextManager::removeLeadingAndTrailing ( Char *buffer )
 
 	while ( (*ptr++ = *first++) != 0 );
 
-	ptr -= 2;;
+	ptr -= 2;
 
 	while ( (ptr > buffer) && (ch = *ptr) != 0 && iswspace ( ch ) )
 	{

Generals/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp

@@ -214,7 +214,7 @@ void	DebugDisplay::printf( const Char *format, ...)
 	DEBUG_ASSERTCRASH( result < sizeof(text), ("text overflow in DebugDisplay::printf() - string too long"));
 
 	// find every line and print it
-	Char *ptr = text;;
+	Char *ptr = text;
 	Char *lineStart = ptr;
 	Int lineLen = 0;
 	Char ch;

Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp

@@ -94,7 +94,7 @@ Bool TerrainVisual::load( AsciiString filename )
 
 	m_filenameString = filename;
 
-	return TRUE;;  // success
+	return TRUE;  // success
 
 }
 

Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp

@@ -379,7 +379,7 @@ void AIPlayer::queueSupplyTruck( void )
 			m_player->setCanBuildUnits(true);
 			const ThingTemplate *tTemplate = TheThingFactory->firstTemplate();
 			while (tTemplate) {
-				Bool isSupplyTruck = tTemplate->isKindOf(KINDOF_HARVESTER);;
+				Bool isSupplyTruck = tTemplate->isKindOf(KINDOF_HARVESTER);
 				if (isSupplyTruck) {
 					Object *factory = findFactory(tTemplate, false);
 					if (factory) {
@@ -3284,7 +3284,7 @@ void TeamInQueue::xfer( Xfer *xfer )
 
 	// version
 	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;;
+	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
 	// xfer work order count

Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp

@@ -365,7 +365,7 @@ void BridgeBehavior::resolveFX( void )
 				DEBUG_CRASH(( "OCL list '%s' not found", name.str() ));
 
 			name = bridgeTemplate->getRepairedToFXString( (BodyDamageType)bodyState, i );
-			m_repairToFX[ bodyState ][ i ] = TheFXListStore->findFXList( name.str() );;
+			m_repairToFX[ bodyState ][ i ] = TheFXListStore->findFXList( name.str() );
 			if( name.isEmpty() == FALSE && m_repairToFX[ bodyState ][ i ] == NULL )
 				DEBUG_CRASH(( "FX list '%s' not found", name.str() ));
 

Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp

@@ -540,7 +540,7 @@ Object *SpawnBehavior::reclaimOrphanSpawn( void )
 	{
 		if (prevName.compare(*tempName)) // the list may have redundancy, this will skip some of it
 			continue;
-		orphanData.m_matchTemplate = TheThingFactory->findTemplate( *tempName );;
+		orphanData.m_matchTemplate = TheThingFactory->findTemplate( *tempName );
 		orphanData.m_source = getObject();
 		orphanData.m_closest = NULL;
 		orphanData.m_closestDistSq = BIG_DISTANCE;
@@ -854,7 +854,7 @@ void SpawnBehavior::computeAggregateStates(void)
 				SlavedUpdateInterface* sdu = (*update)->getSlavedUpdateInterface();
 				if (sdu != NULL)
 				{
-					m_selfTaskingSpawnCount += ( sdu->isSelfTasking());;
+					m_selfTaskingSpawnCount += ( sdu->isSelfTasking());
 					break;
 				}
 			}

Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp

@@ -2923,7 +2923,7 @@ Bool Object::isAbleToAttack() const
 			{
 				//The turret is enable, meaning we have an enabled weapon. Quit.
 				anyEnabled = TRUE;
-				break;;
+				break;
 			}
 		}
 		if( anyWeapon && !anyEnabled )

Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp

@@ -789,7 +789,7 @@ void ParticleUplinkCannonUpdate::createConnectorLasers( IntensityTypes intensity
 		case IT_LIGHT:
 			break;
 		case IT_MEDIUM:
-			str = data->m_connectorMediumLaserNameName;;
+			str = data->m_connectorMediumLaserNameName;
 			break;
 		case IT_INTENSE:
 			str = data->m_connectorIntenseLaserNameName;

Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp

@@ -395,7 +395,7 @@ void W3DRadar::drawSingleBeaconEvent( Int pixelX, Int pixelY, Int width, Int hei
 	frameDiff = currentFrame - event->createFrame;
 
 	// compute the size of the event marker, it is largest when it starts and smallest at the end
-	eventSize = REAL_TO_INT( maxEventSize * ( 1.0f - frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE) );;
+	eventSize = REAL_TO_INT( maxEventSize * ( 1.0f - frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE) );
 
 	// we never let the event size get too small
 	if( eventSize < minEventSize )
@@ -494,7 +494,7 @@ void W3DRadar::drawSingleGenericEvent( Int pixelX, Int pixelY, Int width, Int he
 	frameDiff = currentFrame - event->createFrame;
 
 	// compute the size of the event marker, it is largest when it starts and smallest at the end
-	eventSize = REAL_TO_INT( maxEventSize * ( 1.0f - frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE) );;
+	eventSize = REAL_TO_INT( maxEventSize * ( 1.0f - frameDiff / TIME_FROM_FULL_SIZE_TO_SMALL_SIZE) );
 
 	// we never let the event size get too small
 	if( eventSize < minEventSize )

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp

@@ -1491,7 +1491,7 @@ void W3DVolumetricShadow::RenderMeshVolumeBounds(Int meshIndex, Int lightIndex,
 	if (nShadowIndicesInBuf > (SHADOW_INDEX_SIZE-numIndex))	//check if room for model verts
 	{	//flush the buffer by drawing the contents and re-locking again
 		if (shadowIndexBufferD3D->Lock(0,numIndex*sizeof(short),(unsigned char**)&pvIndices,D3DLOCK_DISCARD) != D3D_OK)
-			return;;
+			return;
 		nShadowIndicesInBuf=0;
 		nShadowStartBatchIndex=0;
 	}

Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h

@@ -1235,7 +1235,7 @@ WWINLINE void DX8Wrapper::Get_Transform(D3DTRANSFORMSTATETYPE transform, Matrix4
 
 WWINLINE const D3DLIGHT8& DX8Wrapper::Peek_Light(unsigned index)
 {
-	return render_state.Lights[index];;
+	return render_state.Lights[index];
 }
 
 WWINLINE bool DX8Wrapper::Is_Light_Enabled(unsigned index)

Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp

@@ -160,7 +160,7 @@
 **
 ***********************************************************************************/
 
 float														WW3D::LogicFrameTimeMs = 1000.0f / WWSyncPerSecond; // initialized to something to avoid division by zero on first use
 float															WW3D::FractionalSyncMs = 0.0f;
 unsigned int											WW3D::SyncTime = 0;
 unsigned int											WW3D::PreviousSyncTime = 0;
@@ -851,7 +851,7 @@
 		vp.Y = 0;
 		vp.Width = width;
 		vp.Height = height;
-		vp.MinZ = 0.0f;;
+		vp.MinZ = 0.0f;
 		vp.MaxZ = 1.0f;
 		DX8Wrapper::Set_Viewport(&vp);
 		DX8Wrapper::Clear(clear, clearz, color, dest_alpha);

Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp

@@ -1012,7 +1012,7 @@ Int WorldHeightMapEdit::getTileNdxForClass(Int xIndex, Int yIndex, Int textureCl
 		/* there are actually 4 subcells in a tile.  So be funky. :) */
 		tileNdx = tileNdx << 2;
 		Int ySubIndex = yIndex&0x01;
-		Int xSubIndex = xIndex&0x01;;
+		Int xSubIndex = xIndex&0x01;
 		tileNdx += 2*ySubIndex;
 		tileNdx += xSubIndex;
 	}

Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp

@@ -2343,8 +2343,8 @@ void WbView3d::drawLabels(HDC hdc)
 				switch(i) {
 					case 0 : break;
 					case 1: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel1, &exists); break;
-					case 2: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel2, &exists);; break;
-					case 3: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel3, &exists);; break;
+					case 2: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel2, &exists); break;
+					case 3: name = pMapObj->getProperties()->getAsciiString(TheKey_waypointPathLabel3, &exists); break;
 					default: name.clear();
 				}
 				if (!name.isEmpty()) {

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h

@@ -211,7 +211,7 @@ class RailroadBehavior	: public PhysicsBehavior
 	};
 
 	typedef std::vector<AsciiString> TemplateNameVector;
-	typedef TemplateNameVector::const_iterator TemplateNameIterator;;
+	typedef TemplateNameVector::const_iterator TemplateNameIterator;
 
 
 

GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp

@@ -4198,7 +4198,7 @@ void Player::xfer( Xfer *xfer )
 	{
 
 		DEBUG_CRASH(( "Player::xfer - m_ai present/missing mismatch" ));
-		throw SC_INVALID_DATA;;
+		throw SC_INVALID_DATA;
 
 	}
 	if( m_ai )

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp

@@ -959,7 +959,7 @@ const Image* ControlBar::calculateVeterancyOverlayForThing( const ThingTemplate
 		case LEVEL_HEROIC:
 			return m_rankHeroicIcon;
 	}
-	return NULL;;
+	return NULL;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -981,7 +981,7 @@ const Image* ControlBar::calculateVeterancyOverlayForObject( const Object *obj )
 		case LEVEL_HEROIC:
 			return m_rankHeroicIcon;
 	}
-	return NULL;;
+	return NULL;
 }
 
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp

@@ -485,7 +485,7 @@ void GameTextManager::removeLeadingAndTrailing ( Char *buffer )
 
 	while ( (*ptr++ = *first++) != 0 );
 
-	ptr -= 2;;
+	ptr -= 2;
 
 	while ( (ptr > buffer) && (ch = *ptr) != 0 && iswspace ( ch ) )
 	{

GeneralsMD/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp

@@ -214,7 +214,7 @@ void	DebugDisplay::printf( const Char *format, ...)
 	DEBUG_ASSERTCRASH( result < sizeof(text), ("text overflow in DebugDisplay::printf() - string too long"));
 
 	// find every line and print it
-	Char *ptr = text;;
+	Char *ptr = text;
 	Char *lineStart = ptr;
 	Int lineLen = 0;
 	Char ch;

GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp

@@ -94,7 +94,7 @@ Bool TerrainVisual::load( AsciiString filename )
 
 	m_filenameString = filename;
 
-	return TRUE;;  // success
+	return TRUE;  // success
 
 }
 

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp

@@ -383,7 +383,7 @@ void AIPlayer::queueSupplyTruck( void )
 			m_player->setCanBuildUnits(true);
 			const ThingTemplate *tTemplate = TheThingFactory->firstTemplate();
 			while (tTemplate) {
-				Bool isSupplyTruck = tTemplate->isKindOf(KINDOF_HARVESTER);;
+				Bool isSupplyTruck = tTemplate->isKindOf(KINDOF_HARVESTER);
 				if (isSupplyTruck) {
 					Object *factory = findFactory(tTemplate, false);
 					if (factory) {
@@ -3617,7 +3617,7 @@ void TeamInQueue::xfer( Xfer *xfer )
 
 	// version
 	XferVersion currentVersion = 1;
-	XferVersion version = currentVersion;;
+	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
 	// xfer work order count

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp

@@ -365,7 +365,7 @@ void BridgeBehavior::resolveFX( void )
 				DEBUG_CRASH(( "OCL list '%s' not found", name.str() ));
 
 			name = bridgeTemplate->getRepairedToFXString( (BodyDamageType)bodyState, i );
-			m_repairToFX[ bodyState ][ i ] = TheFXListStore->findFXList( name.str() );;
+			m_repairToFX[ bodyState ][ i ] = TheFXListStore->findFXList( name.str() );
 			if( name.isEmpty() == FALSE && m_repairToFX[ bodyState ][ i ] == NULL )
 				DEBUG_CRASH(( "FX list '%s' not found", name.str() ));
 

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp

@@ -584,7 +584,7 @@ Object *SpawnBehavior::reclaimOrphanSpawn( void )
 	{
 		if (prevName.compare(*tempName)) // the list may have redundancy, this will skip some of it
 			continue;
-		orphanData.m_matchTemplate = TheThingFactory->findTemplate( *tempName );;
+		orphanData.m_matchTemplate = TheThingFactory->findTemplate( *tempName );
 		orphanData.m_source = getObject();
 		orphanData.m_closest = NULL;
 		orphanData.m_closestDistSq = BIG_DISTANCE;
@@ -898,7 +898,7 @@ void SpawnBehavior::computeAggregateStates(void)
 				SlavedUpdateInterface* sdu = (*update)->getSlavedUpdateInterface();
 				if (sdu != NULL)
 				{
-					m_selfTaskingSpawnCount += ( sdu->isSelfTasking());;
+					m_selfTaskingSpawnCount += ( sdu->isSelfTasking());
 					break;
 				}
 			}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp

@@ -3266,7 +3266,7 @@ Bool Object::isAbleToAttack() const
 			{
 				//The turret is enable, meaning we have an enabled weapon. Quit.
 				anyEnabled = TRUE;
-				break;;
+				break;
 			}
 		}
 		if( anyWeapon && !anyEnabled )

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp

@@ -873,7 +873,7 @@ void ParticleUplinkCannonUpdate::createConnectorLasers( IntensityTypes intensity
 		case IT_LIGHT:
 			break;
 		case IT_MEDIUM:
-			str = data->m_connectorMediumLaserNameName;;
+			str = data->m_connectorMediumLaserNameName;
 			break;
 		case IT_INTENSE:
 			str = data->m_connectorIntenseLaserNameName;