refactor: Apply clang-tidy fixes for generals-use-this-instead-of-singleton (#2017)

Author: bobtista

Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp

@@ -508,7 +508,7 @@ void FirewallHelperClass::writeFirewallBehavior(void)
 	numstr = num;
 	(pref)["FirewallBehavior"] = numstr;
 
-	TheWritableGlobalData->m_firewallPortAllocationDelta = TheFirewallHelper->getSourcePortAllocationDelta();
+	TheWritableGlobalData->m_firewallPortAllocationDelta = getSourcePortAllocationDelta();
 	num[0] = 0;
 	itoa(TheGlobalData->m_firewallPortAllocationDelta, num, 10);
 	numstr = num;

Core/GameEngine/Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp

@@ -844,7 +844,7 @@ void GameSpyStagingRoom::launchGame( void )
 	// shutdown the top, but do not pop it off the stack
 //		TheShell->hideShell();
 	// setup the Global Data with the Map and Seed
-	TheWritableGlobalData->m_pendingFile = TheGameSpyGame->getMap();
+	TheWritableGlobalData->m_pendingFile = getMap();
 
 	// send a message to the logic for a new game
 	GameMessage *msg = TheMessageStream->appendMessage( GameMessage::MSG_NEW_GAME );
@@ -861,7 +861,7 @@ void GameSpyStagingRoom::launchGame( void )
 	req.buddyRequestType = BuddyRequest::BUDDYREQUEST_SETSTATUS;
 	req.arg.status.status = GP_PLAYING;
 	strcpy(req.arg.status.statusString, "Loading");
-	sprintf(req.arg.status.locationString, "%s", WideCharStringToMultiByte(TheGameSpyGame->getGameName().str()).c_str());
+	sprintf(req.arg.status.locationString, "%s", WideCharStringToMultiByte(getGameName().str()).c_str());
 	TheGameSpyBuddyMessageQueue->addRequest(req);
 
 	delete TheNAT;

Core/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp

@@ -709,7 +709,7 @@ void LANAPI::handleInActive(LANMessage *msg, UnsignedInt senderIP) {
 	}
 
 	// don't want to unaccept the host, that's silly.  They can't hit start alt-tabbed anyways.
-	if (senderIP == TheLAN->GetLocalIP()) {
+	if (senderIP == GetLocalIP()) {
 		return;
 	}
 

Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp

@@ -1023,7 +1023,7 @@ void WaterTracksRenderSystem::loadTracks(void)
 				goto tryagain;
 			}
 
-			umod=TheWaterTracksRenderSystem->bindTrack(wtype);
+			umod=bindTrack(wtype);
 			if (umod)
 			{	//umod->init(1.5f*MAP_XY_FACTOR,Vector2(0,0),Vector2(1,1),"wave256.tga");
 				flipU ^= 1;	//toggle flip state
@@ -1032,7 +1032,7 @@ void WaterTracksRenderSystem::loadTracks(void)
 
 				if (waveTypeInfo[wtype].m_secondWaveTimeOffset)	//check if we need a second wave to follow
 				{
-					umod=TheWaterTracksRenderSystem->bindTrack(wtype);
+					umod=bindTrack(wtype);
 					if (umod)
 					{
 						umod->init(waveTypeInfo[wtype].m_finalHeight,waveTypeInfo[wtype].m_finalWidth,startPos,endPos,waveTypeInfo[wtype].m_textureName,waveTypeInfo[wtype].m_secondWaveTimeOffset);

Core/Tools/ImagePacker/Source/ImagePacker.cpp

@@ -179,7 +179,7 @@ Bool ImagePacker::validateImages( void )
 
 		proceed = DialogBox( ApplicationHInstance,
 												 (LPCTSTR)IMAGE_ERRORS,
-												 TheImagePacker->getWindowHandle(),
+												 getWindowHandle(),
 												 (DLGPROC)ImageErrorProc );
 
 	}
@@ -317,7 +317,7 @@ void ImagePacker::writeFinalTextures( void )
 
 		DialogBox( ApplicationHInstance,
 							 (LPCTSTR)PAGE_ERRORS,
-							 TheImagePacker->getWindowHandle(),
+							 getWindowHandle(),
 							 (DLGPROC)PageErrorProc );
 
 	}
@@ -998,33 +998,33 @@ Bool ImagePacker::getSettingsFromDialog( HWND dialog )
 	Bool outputAlpha = FALSE;
 	if( IsDlgButtonChecked( dialog, CHECK_ALPHA ) == BST_CHECKED )
 		outputAlpha = TRUE;
-	TheImagePacker->setOutputAlpha( outputAlpha );
+	setOutputAlpha( outputAlpha );
 
 	// get create INI option
 	Bool createINI = FALSE;
 	if( IsDlgButtonChecked( dialog, CHECK_INI ) == BST_CHECKED )
 		createINI = TRUE;
-	TheImagePacker->setINICreate( createINI );
+	setINICreate( createINI );
 
 	// get preview with image option
 	Bool useBitmap = FALSE;
 	if( IsDlgButtonChecked( dialog, CHECK_BITMAP_PREVIEW ) == BST_CHECKED )
 		useBitmap = TRUE;
-	TheImagePacker->setUseTexturePreview( useBitmap );
+	setUseTexturePreview( useBitmap );
 
 	// get option to compress final textures
 	Bool compress = FALSE;
 	if( IsDlgButtonChecked( dialog, CHECK_COMPRESS ) == BST_CHECKED )
 		compress = TRUE;
-	TheImagePacker->setCompressTextures( compress );
+	setCompressTextures( compress );
 
 	// get options for the gap options
-	TheImagePacker->clearGapMethod( ImagePacker::GAP_METHOD_EXTEND_RGB );
+	clearGapMethod( ImagePacker::GAP_METHOD_EXTEND_RGB );
 	if( IsDlgButtonChecked( dialog, CHECK_GAP_EXTEND_RGB ) == BST_CHECKED )
-		TheImagePacker->setGapMethod( ImagePacker::GAP_METHOD_EXTEND_RGB );
-	TheImagePacker->clearGapMethod( ImagePacker::GAP_METHOD_GUTTER );
+		setGapMethod( ImagePacker::GAP_METHOD_EXTEND_RGB );
+	clearGapMethod( ImagePacker::GAP_METHOD_GUTTER );
 	if( IsDlgButtonChecked( dialog, CHECK_GAP_GUTTER ) == BST_CHECKED )
-		TheImagePacker->setGapMethod( ImagePacker::GAP_METHOD_GUTTER );
+		setGapMethod( ImagePacker::GAP_METHOD_GUTTER );
 
 	// get gutter size whether we are using that option or not
 	Int gutter = GetDlgItemInt( dialog, EDIT_GUTTER, NULL, FALSE );

Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h

@@ -1321,7 +1321,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 	void getCellCenterPos(Int x, Int y, Real& xx, Real& yy);
 
 	// find the cell that covers the world coords (wx,wy) and return its coords.
-	void worldToCell(Real wx, Real wy, Int *cx, Int *cy);
+	void worldToCell(Real wx, Real wy, Int *cx, Int *cy) const;
 
 	// given a distance in world coords, return the number of cells needed to cover that distance (rounding up)
 	Int worldToCellDist(Real w);
@@ -1494,7 +1494,7 @@ class PartitionManager : public SubsystemInterface, public Snapshot
 };
 
 // -----------------------------------------------------------------------------
-inline void PartitionManager::worldToCell(Real wx, Real wy, Int *cx, Int *cy)
+inline void PartitionManager::worldToCell(Real wx, Real wy, Int *cx, Int *cy) const
 {
 	*cx = REAL_TO_INT_FLOOR((wx - m_worldExtents.lo.x) * m_cellSizeInv);
 	*cy = REAL_TO_INT_FLOOR((wy - m_worldExtents.lo.y) * m_cellSizeInv);

Generals/Code/GameEngine/Source/Common/GlobalData.cpp

@@ -1118,7 +1118,7 @@ void GlobalData::reset( void )
 	{
 
 		// get next instance
-		GlobalData* next = TheWritableGlobalData->m_next;
+		GlobalData* next = m_next;
 
 		// delete the head of the global data list (the latest override)
 		delete TheWritableGlobalData;

Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp

@@ -636,7 +636,7 @@ SaveCode GameState::missionSave( void )
 	desc.format( format, TheGameText->fetch( campaign->m_campaignNameLabel ).str(), missionNumber );
 
 	// do an automatic mission save
-	return TheGameState->saveGame( "", desc, SAVE_FILE_TYPE_MISSION );
+	return saveGame( "", desc, SAVE_FILE_TYPE_MISSION );
 
 }
 

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

@@ -188,9 +188,9 @@ void ControlBar::populatePurchaseScience( Player* player )
 			player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3().isEmpty() ||
 			player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8().isEmpty())
 		return;
-	commandSet1 = TheControlBar->findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
-	commandSet3 = TheControlBar->findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
-	commandSet8 = TheControlBar->findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet1 = findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank1()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet3 = findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank3()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet8 = findCommandSet(player->getPlayerTemplate()->getPurchaseScienceCommandSetRank8()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
 
 	for( i = 0; i < MAX_PURCHASE_SCIENCE_RANK_1; i++ )
 		m_sciencePurchaseWindowsRank1[i]->winHide(TRUE);
@@ -2712,7 +2712,7 @@ void ControlBar::showRallyPoint(const Coord3D* loc)
 	marker->setOrientation(TheGlobalData->m_downwindAngle); // To blow down wind -- ML
 
 	// set the marker colors to that of the local player
-	Player* player = TheControlBar->getCurrentlyViewedPlayer();
+	Player* player = getCurrentlyViewedPlayer();
 	if (player)
 	{
 		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
@@ -3258,7 +3258,7 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 	// get command set
 	if(player->getPlayerTemplate()->getSpecialPowerShortcutCommandSet().isEmpty() )
 		return;
-	commandSet = TheControlBar->findCommandSet(player->getPlayerTemplate()->getSpecialPowerShortcutCommandSet()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
+	commandSet = findCommandSet(player->getPlayerTemplate()->getSpecialPowerShortcutCommandSet()); // TEMP WILL CHANGE TO PROPER WAY ONCE WORKING
 	if(!commandSet)
 		return;
 	// populate the button with commands defined

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

@@ -270,7 +270,7 @@ void ControlBar::populateCommand( Object *obj )
 	resetBuildQueueData();
 
 	// get command set
-	commandSet = TheControlBar->findCommandSet( obj->getCommandSetString() );
+	commandSet = findCommandSet( obj->getCommandSetString() );
 
 	// if no command set match is found hide all the buttons
 	if( commandSet == NULL )