GameExecutable: Some improvements part II

Sources/SeriousSam/GUI/Components/MGArrow.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGArrow.h"
 

Sources/SeriousSam/GUI/Components/MGButton.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "LevelInfo.h"
 #include "VarList.h"

Sources/SeriousSam/GUI/Components/MGChangePlayer.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGChangePlayer.h"
 

Sources/SeriousSam/GUI/Components/MGEdit.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGEdit.h"
 

Sources/SeriousSam/GUI/Components/MGFileButton.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGFileButton.h"
 

Sources/SeriousSam/GUI/Components/MGHighScore.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGHighScore.h"
 

Sources/SeriousSam/GUI/Components/MGKeyDefinition.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGKeyDefinition.h"
 

Sources/SeriousSam/GUI/Components/MGLevelButton.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGLevelButton.h"
 

Sources/SeriousSam/GUI/Components/MGModel.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGModel.h"
 

Sources/SeriousSam/GUI/Components/MGServerList.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGServerList.h"
 #include "MGEdit.h"

Sources/SeriousSam/GUI/Components/MGSlider.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGSlider.h"
 

Sources/SeriousSam/GUI/Components/MGTitle.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGTitle.h"
 

Sources/SeriousSam/GUI/Components/MGTrigger.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "MGTrigger.h"
 

Sources/SeriousSam/GUI/Components/MGVarButton.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "VarList.h"
 #include "MGVarButton.h"

Sources/SeriousSam/GUI/Components/MenuGadget.cpp

@@ -3,7 +3,6 @@
 #include "StdH.h"
 #include <Engine/Base/KeyNames.h>
 #include <Engine/CurrentVersion.h>
-#include "MenuPrinting.h"
 #include <GameMP/LCDDrawing.h>
 #include "LevelInfo.h"
 #include "VarList.h"

Sources/SeriousSam/GUI/Components/MenuGadget.h

@@ -6,6 +6,7 @@
   #pragma once
 #endif
 
+#include "MenuPrinting.h"
 
 #define DOING_NOTHING 0
 #define PRESS_KEY_WAITING 1
@@ -13,6 +14,7 @@
 
 #define EMPTYSLOTSTRING TRANS("<save a new one>")
 
+
 class CMenuGadget {
 public:
 	CListNode mg_lnNode;

Sources/SeriousSam/SeriousSam.vcxproj

@@ -178,7 +178,6 @@ copy Release\$(TargetName).map $(SolutionDir)..\Bin\ &gt;nul </Command>
   <ItemGroup>
     <ClCompile Include="CmdLine.cpp" />
     <ClCompile Include="Credits.cpp" />
-    <ClCompile Include="GameMenu.cpp" />
     <ClCompile Include="GLSettings.cpp" />
     <ClCompile Include="GUI\Components\MenuGadget.cpp" />
     <ClCompile Include="GUI\Components\MGArrow.cpp" />
@@ -195,22 +194,38 @@ copy Release\$(TargetName).map $(SolutionDir)..\Bin\ &gt;nul </Command>
     <ClCompile Include="GUI\Components\MGTitle.cpp" />
     <ClCompile Include="GUI\Components\MGTrigger.cpp" />
     <ClCompile Include="GUI\Components\MGVarButton.cpp" />
+    <ClCompile Include="GUI\Menus\GameMenu.cpp" />
+    <ClCompile Include="GUI\Menus\MAudioOptions.cpp" />
+    <ClCompile Include="GUI\Menus\MConfirm.cpp" />
+    <ClCompile Include="GUI\Menus\MControls.cpp" />
+    <ClCompile Include="GUI\Menus\MCustomizeAxis.cpp" />
+    <ClCompile Include="GUI\Menus\MCustomizeKeyboard.cpp" />
+    <ClCompile Include="GUI\Menus\MDisabled.cpp" />
+    <ClCompile Include="GUI\Menus\Menu.cpp" />
+    <ClCompile Include="GUI\Menus\MenuPrinting.cpp" />
+    <ClCompile Include="GUI\Menus\MenuStuff.cpp" />
+    <ClCompile Include="GUI\Menus\MHighScore.cpp" />
+    <ClCompile Include="GUI\Menus\MInGame.cpp" />
+    <ClCompile Include="GUI\Menus\MLevels.cpp" />
+    <ClCompile Include="GUI\Menus\MLoadSave.cpp" />
+    <ClCompile Include="GUI\Menus\MMain.cpp" />
+    <ClCompile Include="GUI\Menus\MNetwork.cpp" />
+    <ClCompile Include="GUI\Menus\MNetworkJoin.cpp" />
+    <ClCompile Include="GUI\Menus\MNetworkOpen.cpp" />
+    <ClCompile Include="GUI\Menus\MNetworkStart.cpp" />
+    <ClCompile Include="GUI\Menus\MOptions.cpp" />
+    <ClCompile Include="GUI\Menus\MPlayerProfile.cpp" />
+    <ClCompile Include="GUI\Menus\MSelectPlayers.cpp" />
+    <ClCompile Include="GUI\Menus\MServers.cpp" />
+    <ClCompile Include="GUI\Menus\MSinglePlayer.cpp" />
+    <ClCompile Include="GUI\Menus\MSinglePlayerNew.cpp" />
+    <ClCompile Include="GUI\Menus\MSplitScreen.cpp" />
+    <ClCompile Include="GUI\Menus\MSplitStart.cpp" />
+    <ClCompile Include="GUI\Menus\MVar.cpp" />
+    <ClCompile Include="GUI\Menus\MVideoOptions.cpp" />
     <ClCompile Include="LCDDrawing.cpp" />
     <ClCompile Include="LevelInfo.cpp" />
     <ClCompile Include="MainWindow.cpp" />
-    <ClCompile Include="MAudioOptions.cpp" />
-    <ClCompile Include="MConfirm.cpp" />
-    <ClCompile Include="MControls.cpp" />
-    <ClCompile Include="MCustomizeAxis.cpp" />
-    <ClCompile Include="MCustomizeKeyboard.cpp" />
-    <ClCompile Include="MDisabled.cpp" />
-    <ClCompile Include="Menu.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">StdH.h</PrecompiledHeaderFile>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">StdH.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="MenuPrinting.cpp" />
     <ClInclude Include="GUI\Components\MenuGadget.h" />
     <ClInclude Include="GUI\Components\MGArrow.h" />
     <ClInclude Include="GUI\Components\MGButton.h" />
@@ -226,29 +241,37 @@ copy Release\$(TargetName).map $(SolutionDir)..\Bin\ &gt;nul </Command>
     <ClInclude Include="GUI\Components\MGTitle.h" />
     <ClInclude Include="GUI\Components\MGTrigger.h" />
     <ClInclude Include="GUI\Components\MGVarButton.h" />
-    <ClInclude Include="MenuStuff.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClCompile Include="MenuStuff.cpp" />
-    <ClCompile Include="MHighScore.cpp" />
-    <ClCompile Include="MInGame.cpp" />
-    <ClCompile Include="MLevels.cpp" />
-    <ClCompile Include="MLoadSave.cpp" />
-    <ClCompile Include="MMain.cpp" />
-    <ClCompile Include="MNetwork.cpp" />
-    <ClCompile Include="MNetworkJoin.cpp" />
-    <ClCompile Include="MNetworkOpen.cpp" />
-    <ClCompile Include="MNetworkStart.cpp" />
-    <ClCompile Include="MOptions.cpp" />
-    <ClCompile Include="MPlayerProfile.cpp" />
-    <ClCompile Include="MSelectPlayers.cpp" />
-    <ClCompile Include="MServers.cpp" />
-    <ClCompile Include="MSinglePlayer.cpp" />
-    <ClCompile Include="MSinglePlayerNew.cpp" />
-    <ClCompile Include="MSplitScreen.cpp" />
-    <ClCompile Include="MSplitStart.cpp" />
-    <ClCompile Include="MVar.cpp" />
-    <ClCompile Include="MVideoOptions.cpp" />
+    <ClInclude Include="GUI\Menus\GameMenu.h" />
+    <ClInclude Include="GUI\Menus\MAudioOptions.h" />
+    <ClInclude Include="GUI\Menus\MConfirm.h" />
+    <ClInclude Include="GUI\Menus\MControls.h" />
+    <ClInclude Include="GUI\Menus\MCredits.h" />
+    <ClInclude Include="GUI\Menus\MCustomizeAxis.h" />
+    <ClInclude Include="GUI\Menus\MCustomizeKeyboard.h" />
+    <ClInclude Include="GUI\Menus\MDisabled.h" />
+    <ClInclude Include="GUI\Menus\Menu.h" />
+    <ClInclude Include="GUI\Menus\MenuPrinting.h" />
+    <ClInclude Include="GUI\Menus\MenuStuff.h" />
+    <ClInclude Include="GUI\Menus\MHighScore.h" />
+    <ClInclude Include="GUI\Menus\MInGame.h" />
+    <ClInclude Include="GUI\Menus\MLevels.h" />
+    <ClInclude Include="GUI\Menus\MLoadSave.h" />
+    <ClInclude Include="GUI\Menus\MMain.h" />
+    <ClInclude Include="GUI\Menus\MNetwork.h" />
+    <ClInclude Include="GUI\Menus\MNetworkJoin.h" />
+    <ClInclude Include="GUI\Menus\MNetworkOpen.h" />
+    <ClInclude Include="GUI\Menus\MNetworkStart.h" />
+    <ClInclude Include="GUI\Menus\MOptions.h" />
+    <ClInclude Include="GUI\Menus\MPlayerProfile.h" />
+    <ClInclude Include="GUI\Menus\MRenderingOptions.h" />
+    <ClInclude Include="GUI\Menus\MSelectPlayers.h" />
+    <ClInclude Include="GUI\Menus\MServers.h" />
+    <ClInclude Include="GUI\Menus\MSinglePlayer.h" />
+    <ClInclude Include="GUI\Menus\MSinglePlayerNew.h" />
+    <ClInclude Include="GUI\Menus\MSplitScreen.h" />
+    <ClInclude Include="GUI\Menus\MSplitStart.h" />
+    <ClInclude Include="GUI\Menus\MVar.h" />
+    <ClInclude Include="GUI\Menus\MVideoOptions.h" />
     <ClCompile Include="SeriousSam.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">StdH.h</PrecompiledHeaderFile>
@@ -270,41 +293,10 @@ copy Release\$(TargetName).map $(SolutionDir)..\Bin\ &gt;nul </Command>
     <ClInclude Include="CmdLine.h" />
     <ClInclude Include="Credits.h" />
     <ClInclude Include="FileInfo.h" />
-    <ClInclude Include="GameMenu.h" />
     <ClInclude Include="GLSettings.h" />
     <ClInclude Include="LCDDrawing.h" />
     <ClInclude Include="LevelInfo.h" />
     <ClInclude Include="MainWindow.h" />
-    <ClInclude Include="MAudioOptions.h" />
-    <ClInclude Include="MConfirm.h" />
-    <ClInclude Include="MControls.h" />
-    <ClInclude Include="MCredits.h" />
-    <ClInclude Include="MCustomizeAxis.h" />
-    <ClInclude Include="MCustomizeKeyboard.h" />
-    <ClInclude Include="MDisabled.h" />
-    <ClInclude Include="Menu.h" />
-    <ClInclude Include="MenuGadget.h" />
-    <ClInclude Include="MenuPrinting.h" />
-    <ClInclude Include="MHighScore.h" />
-    <ClInclude Include="MInGame.h" />
-    <ClInclude Include="MLevels.h" />
-    <ClInclude Include="MLoadSave.h" />
-    <ClInclude Include="MMain.h" />
-    <ClInclude Include="MNetwork.h" />
-    <ClInclude Include="MNetworkJoin.h" />
-    <ClInclude Include="MNetworkOpen.h" />
-    <ClInclude Include="MNetworkStart.h" />
-    <ClInclude Include="MOptions.h" />
-    <ClInclude Include="MPlayerProfile.h" />
-    <ClInclude Include="MRenderingOptions.h" />
-    <ClInclude Include="MSelectPlayers.h" />
-    <ClInclude Include="MServers.h" />
-    <ClInclude Include="MSinglePlayer.h" />
-    <ClInclude Include="MSinglePlayerNew.h" />
-    <ClInclude Include="MSplitScreen.h" />
-    <ClInclude Include="MSplitStart.h" />
-    <ClInclude Include="MVar.h" />
-    <ClInclude Include="MVideoOptions.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="SeriousSam.h" />
     <ClInclude Include="SplashScreen.h" />

Sources/SeriousSam/SeriousSam.vcxproj.filters

@@ -19,18 +19,24 @@
     <Filter Include="Texts">
       <UniqueIdentifier>{332d9393-d918-4caf-86b2-2e63c2cca9bd}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Gadgets">
-      <UniqueIdentifier>{47ffb7e3-433b-480c-a22a-849524a5bd1e}</UniqueIdentifier>
+    <Filter Include="Header Files\GUI headers">
+      <UniqueIdentifier>{b1fe2cd0-889c-48dd-897c-cdbbdcb0a131}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Gadgets headers">
+    <Filter Include="Header Files\GUI headers\Gadgets headers">
       <UniqueIdentifier>{3bc65fe2-8c15-4ecd-bf59-de962bb42275}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Menus headers">
+    <Filter Include="Header Files\GUI headers\Menus headers">
       <UniqueIdentifier>{df54d6d1-39c3-4f26-93f8-116311f5a0eb}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Menus">
+    <Filter Include="Source Files\GUI">
+      <UniqueIdentifier>{4c95322d-560a-4738-a631-e3e860b59560}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\GUI\Menus">
       <UniqueIdentifier>{9a04e8a8-ecfc-42c3-bf28-fe3d8b49e626}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\GUI\Gadgets">
+      <UniqueIdentifier>{47ffb7e3-433b-480c-a22a-849524a5bd1e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CmdLine.cpp">
@@ -51,9 +57,6 @@
     <ClCompile Include="MainWindow.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MenuPrinting.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="SeriousSam.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -66,134 +69,137 @@
     <ClCompile Include="VarList.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MenuStuff.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MConfirm.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MMain.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="Menu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MInGame.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MSinglePlayer.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MSinglePlayerNew.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MDisabled.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MLevels.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MVar.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MSplitStart.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MSplitScreen.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MNetworkOpen.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MNetworkJoin.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MNetwork.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MOptions.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MHighScore.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MCustomizeAxis.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MCustomizeKeyboard.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MSelectPlayers.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MNetworkStart.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MServers.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MControls.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MAudioOptions.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MVideoOptions.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MLoadSave.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="MPlayerProfile.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
-    <ClCompile Include="GameMenu.cpp">
-      <Filter>Source Files\Menus</Filter>
-    </ClCompile>
     <ClCompile Include="GUI\Components\MGHighScore.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGServerList.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGButton.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGFileButton.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGKeyDefinition.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGModel.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGSlider.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGTitle.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGTrigger.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGVarButton.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MenuGadget.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGChangePlayer.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGLevelButton.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGArrow.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
     </ClCompile>
     <ClCompile Include="GUI\Components\MGEdit.cpp">
-      <Filter>Source Files\Gadgets</Filter>
+      <Filter>Source Files\GUI\Gadgets</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\Menu.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MenuStuff.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\GameMenu.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MConfirm.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MPlayerProfile.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MOptions.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MLoadSave.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MVideoOptions.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MSelectPlayers.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MSplitStart.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MNetworkStart.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MCustomizeAxis.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MControls.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MAudioOptions.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MCustomizeKeyboard.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MServers.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MHighScore.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MNetwork.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MSplitScreen.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MNetworkJoin.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MNetworkOpen.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MVar.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MLevels.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MDisabled.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MSinglePlayerNew.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MSinglePlayer.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MInGame.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MMain.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
+    </ClCompile>
+    <ClCompile Include="GUI\Menus\MenuPrinting.cpp">
+      <Filter>Source Files\GUI\Menus</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -218,9 +224,6 @@
     <ClInclude Include="MainWindow.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MenuPrinting.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -236,149 +239,149 @@
     <ClInclude Include="VarList.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MenuGadget.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="ArrowDir.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GameMenu.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MConfirm.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MMain.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Menu.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MInGame.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MSinglePlayer.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MCredits.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MDisabled.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MSinglePlayerNew.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MLevels.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MVar.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MServers.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MPlayerProfile.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MControls.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MLoadSave.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
     <ClInclude Include="FileInfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MHighScore.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MNetwork.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MNetworkStart.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MNetworkOpen.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MNetworkJoin.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MSplitScreen.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MSplitStart.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MSelectPlayers.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MOptions.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MVideoOptions.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MRenderingOptions.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MAudioOptions.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MCustomizeKeyboard.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MCustomizeAxis.h">
-      <Filter>Header Files\Menus headers</Filter>
-    </ClInclude>
-    <ClInclude Include="MenuStuff.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="GUI\Components\MGModel.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGVarButton.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGTrigger.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGTitle.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGSlider.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGServerList.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGLevelButton.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGKeyDefinition.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGHighScore.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGEdit.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGButton.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGArrow.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGFileButton.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MGChangePlayer.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
     </ClInclude>
     <ClInclude Include="GUI\Components\MenuGadget.h">
-      <Filter>Header Files\Gadgets headers</Filter>
+      <Filter>Header Files\GUI headers\Gadgets headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MControls.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MInGame.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MLevels.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MNetwork.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MCustomizeKeyboard.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MDisabled.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MHighScore.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MLoadSave.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MMain.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MNetworkJoin.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MNetworkOpen.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MNetworkStart.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MOptions.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MPlayerProfile.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MSelectPlayers.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MServers.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MSinglePlayer.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MSplitStart.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MSplitScreen.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MSinglePlayerNew.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MVar.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MCustomizeAxis.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MConfirm.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MAudioOptions.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MenuStuff.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MVideoOptions.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\Menu.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MRenderingOptions.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MCredits.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\GameMenu.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
+    </ClInclude>
+    <ClInclude Include="GUI\Menus\MenuPrinting.h">
+      <Filter>Header Files\GUI headers\Menus headers</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

Sources/SeriousSam/StdH.h

@@ -23,4 +23,4 @@
 #define TECHTESTONLY 0
 
 #include "SeriousSam.h"
-#include "Menu.h"
+#include "GUI/Menus/Menu.h"