From 99453d2ba4e55dc1016b2e68d4109ab6a5dc1eb1 Mon Sep 17 00:00:00 2001
From: Caball009 <82909616+Caball009@users.noreply.github.com>
Date: Thu, 2 Apr 2026 16:33:09 +0200
Subject: [PATCH] refactor: Remove superfluous extern keyword from variable
 declarations.

---
 Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp         | 2 +-
 .../Source/W3DDevice/GameClient/W3DFileSystem.cpp               | 2 +-
 Generals/Code/Tools/WorldBuilder/src/LayersList.cpp             | 2 +-
 Generals/Code/Tools/WorldBuilder/src/RampOptions.cpp            | 2 +-
 .../Source/W3DDevice/GameClient/W3DFileSystem.cpp               | 2 +-
 GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp           | 2 +-
 GeneralsMD/Code/Tools/WorldBuilder/src/RampOptions.cpp          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp
index 1b4dd6ebe5a..457bdbcc707 100644
--- a/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/PeerDefs.cpp
@@ -48,7 +48,7 @@
 
 
 GameSpyInfoInterface *TheGameSpyInfo = nullptr;
-extern GameSpyStagingRoom *TheGameSpyGame = nullptr;
+GameSpyStagingRoom *TheGameSpyGame = nullptr;
 void deleteNotificationBox();
 
 bool AsciiComparator::operator()(AsciiString s1, AsciiString s2) const
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
index ebb76ecab7d..68300222c0b 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
@@ -402,7 +402,7 @@ void GameFileClass::Close()
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // W3DFileSystem Class ////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-extern W3DFileSystem *TheW3DFileSystem = nullptr;
+W3DFileSystem *TheW3DFileSystem = nullptr;
 
 //-------------------------------------------------------------------------------------------------
 /** Constructor.  Creating an instance of this class overrides the default
diff --git a/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp b/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp
index 2c92b4cea11..0e651efd565 100644
--- a/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp
@@ -870,4 +870,4 @@ END_MESSAGE_MAP()
 std::string LayersList::TheDefaultLayerName = "Default Layer";
 std::string LayersList::TheDefaultNewLayerName = "New Layer";
 const std::string LayersList::TheUnmutableDefaultLayerName = "Default Layer";
-extern LayersList *TheLayersList = nullptr;
+LayersList *TheLayersList = nullptr;
diff --git a/Generals/Code/Tools/WorldBuilder/src/RampOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/RampOptions.cpp
index b428277493c..4b9cc441d49 100644
--- a/Generals/Code/Tools/WorldBuilder/src/RampOptions.cpp
+++ b/Generals/Code/Tools/WorldBuilder/src/RampOptions.cpp
@@ -79,7 +79,7 @@ void RampOptions::OnWidthChange()
 	m_rampWidth = atof(str.GetBuffer(0));
 }
 
-extern RampOptions* TheRampOptions = nullptr;
+RampOptions* TheRampOptions = nullptr;
 
 BEGIN_MESSAGE_MAP(RampOptions, COptionsPanel)
 	ON_BN_CLICKED(IDC_RO_APPLY, OnApply)
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
index 8250a142919..80097fe1ead 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
@@ -429,7 +429,7 @@ void GameFileClass::Close()
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // W3DFileSystem Class ////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-extern W3DFileSystem *TheW3DFileSystem = nullptr;
+W3DFileSystem *TheW3DFileSystem = nullptr;
 
 //-------------------------------------------------------------------------------------------------
 /** Constructor.  Creating an instance of this class overrides the default
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp
index 5135d70b704..298790684fe 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp
@@ -1343,4 +1343,4 @@ std::string LayersList::TheDefaultNewLayerName = "New Layer";
 std::string LayersList::ThePolygonTriggerLayerName = "Default Trigger Layer";
 std::string LayersList::TheActiveLayerName;
 const std::string LayersList::TheUnmutableDefaultLayerName = "Default Object Layer";
-extern LayersList *TheLayersList = nullptr;
+LayersList *TheLayersList = nullptr;
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RampOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RampOptions.cpp
index 509c76b68f2..6553580b6f9 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/src/RampOptions.cpp
+++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RampOptions.cpp
@@ -79,7 +79,7 @@ void RampOptions::OnWidthChange()
 	m_rampWidth = atof(str.GetBuffer(0));
 }
 
-extern RampOptions* TheRampOptions = nullptr;
+RampOptions* TheRampOptions = nullptr;
 
 BEGIN_MESSAGE_MAP(RampOptions, COptionsPanel)
 	ON_BN_CLICKED(IDC_RO_APPLY, OnApply)