diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp index e69a99e6b3..6f190d0063 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DVideoBuffer.cpp +++ b/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); diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp index 927e92146b..593e407de8 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp +++ b/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); } diff --git a/Core/Libraries/Source/WWVegas/WWLib/thread.cpp b/Core/Libraries/Source/WWVegas/WWLib/thread.cpp index 6cbb50d84d..aaad589d7f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/thread.cpp +++ b/Core/Libraries/Source/WWVegas/WWLib/thread.cpp @@ -37,7 +37,7 @@ ThreadClass::ThreadClass(const char *thread_name, ExceptionHandlerType exception 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; diff --git a/Core/Libraries/Source/WWVegas/WWMath/obbox.cpp b/Core/Libraries/Source/WWVegas/WWMath/obbox.cpp index 0dd789bca6..e92787a274 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/obbox.cpp +++ b/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; diff --git a/Core/Tools/Autorun/GameText.cpp b/Core/Tools/Autorun/GameText.cpp index f0989b1f4d..edde74bdfa 100644 --- a/Core/Tools/Autorun/GameText.cpp +++ b/Core/Tools/Autorun/GameText.cpp @@ -441,7 +441,7 @@ void GameTextManager::removeLeadingAndTrailing ( Char *buffer ) while ( (*ptr++ = *first++) != 0 ); - ptr -= 2;; + ptr -= 2; while ( (ptr > buffer) && (ch = *ptr) != 0 && iswspace ( ch ) ) { diff --git a/Core/Tools/Babylon/BabylonDlg.cpp b/Core/Tools/Babylon/BabylonDlg.cpp index 5f1480052d..0b40dbc28b 100644 --- a/Core/Tools/Babylon/BabylonDlg.cpp +++ b/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 )); diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/ImagePackerProc.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/ImagePackerProc.cpp index d89cfe244c..333f4e11c3 100644 --- a/Core/Tools/ImagePacker/Source/WindowProcedures/ImagePackerProc.cpp +++ b/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; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h index 056746f7a7..b33a49da94 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h @@ -211,7 +211,7 @@ class RailroadBehavior : public PhysicsBehavior }; typedef std::vector TemplateNameVector; - typedef TemplateNameVector::const_iterator TemplateNameIterator;; + typedef TemplateNameVector::const_iterator TemplateNameIterator; diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp index 0c098e793f..691788c0c6 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/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 ) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp index 7e44a82608..b66bee908e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp +++ b/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; } //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp b/Generals/Code/GameEngine/Source/GameClient/GameText.cpp index 5b617b793c..a2437adf52 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/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 ) ) { diff --git a/Generals/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp b/Generals/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp index c101461162..1cb33defbe 100644 --- a/Generals/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp +++ b/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; diff --git a/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp b/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp index d18efc0299..712769dde3 100644 --- a/Generals/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp +++ b/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 } diff --git a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp index 38eaf8e8bd..80d0533883 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp +++ b/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 diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp index d837e3271b..af4d7ea89f 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp +++ b/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() )); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp index 5562102e18..e7409a19b7 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp +++ b/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; } } diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp index a9d887a612..87abf137f9 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/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 ) diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp index 4e1a344342..3ebe93f320 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp +++ b/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; diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp index 8d0042d0dc..1c7d5dcab9 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp +++ b/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 ) diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp index 34ff71f1d1..94caea0b44 100644 --- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp +++ b/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; } diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h index 699532358d..be45b08d2d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/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) diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp index 983395a390..fbdcd9c347 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp @@ -851,7 +851,7 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f 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); diff --git a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp index c126574eab..e9327dfa98 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp +++ b/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; } diff --git a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp index b867dd42fa..79aa9bf2dd 100644 --- a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/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()) { diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h index f142d92cfb..994a7e67de 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h @@ -211,7 +211,7 @@ class RailroadBehavior : public PhysicsBehavior }; typedef std::vector TemplateNameVector; - typedef TemplateNameVector::const_iterator TemplateNameIterator;; + typedef TemplateNameVector::const_iterator TemplateNameIterator; diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp index 9aae3bb315..dfe4d9eba9 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/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 ) diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp index 9b9bbca7d3..534237076e 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp +++ b/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; } //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp index 012f01250e..8df77e4708 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameText.cpp +++ b/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 ) ) { diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp index 8321f30fc9..d103c4e1b8 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp +++ b/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; diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp index b00a6fc1d8..fd2aff3e4a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/Terrain/TerrainVisual.cpp +++ b/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 } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp index 17d37bc845..bb5b91ef5a 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp +++ b/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 diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp index 20f0eda136..df75da3aa3 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/BridgeBehavior.cpp +++ b/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() )); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp index 437e521e68..b343f4c053 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SpawnBehavior.cpp +++ b/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; } } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp index 0d932d277e..4f772e8083 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/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 ) diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp index abf32ccdfa..514f6b1691 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp +++ b/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; diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp index 68ed20d448..7516211b1c 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp @@ -393,7 +393,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 ) @@ -492,7 +492,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 ) diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp index 28bb07e9ab..9bcf74d80e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp @@ -1597,7 +1597,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; } diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp index 3342bbf0a7..d11d305123 100644 --- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp +++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp @@ -236,7 +236,7 @@ Bool W3DSmudgeManager::testHardwareSupport(void) //bottom right v[0].p = Vector4( BLOCK_SIZE-0.5f, BLOCK_SIZE-0.5f, 0.0f, 1.0f ); - v[0].u = BLOCK_SIZE/(Real)TheDisplay->getWidth(); v[0].v = BLOCK_SIZE/(Real)TheDisplay->getHeight();; + v[0].u = BLOCK_SIZE/(Real)TheDisplay->getWidth(); v[0].v = BLOCK_SIZE/(Real)TheDisplay->getHeight(); //top right v[1].p = Vector4( BLOCK_SIZE-0.5f, 0-0.5f, 0.0f, 1.0f ); v[1].u = BLOCK_SIZE/(Real)TheDisplay->getWidth(); v[1].v = 0; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h index b763a47880..db5b93030c 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h @@ -1345,7 +1345,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) diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp index feda5af18f..32ffd19632 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp @@ -844,7 +844,7 @@ WW3DErrorType WW3D::Begin_Render(bool clear,bool clearz,const Vector3 & color, f 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); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp index 59c6348146..d326723eb4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp @@ -979,7 +979,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; } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp index 2cfa7e5fcd..a612d1bd7e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -2467,8 +2467,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() && m_showWaypoints) {