From d29d0c64abc763c41b3261fbcd8a6e080af4d8df Mon Sep 17 00:00:00 2001 From: zcaliptium Date: Wed, 16 Mar 2016 21:56:44 +0300 Subject: [PATCH] GameExecutable: Some improvements part II --- Sources/SeriousSam/GUI/Components/MGArrow.cpp | 1 - .../SeriousSam/GUI/Components/MGButton.cpp | 1 - .../GUI/Components/MGChangePlayer.cpp | 1 - Sources/SeriousSam/GUI/Components/MGEdit.cpp | 1 - .../GUI/Components/MGFileButton.cpp | 1 - .../SeriousSam/GUI/Components/MGHighScore.cpp | 1 - .../GUI/Components/MGKeyDefinition.cpp | 1 - .../GUI/Components/MGLevelButton.cpp | 1 - Sources/SeriousSam/GUI/Components/MGModel.cpp | 1 - .../GUI/Components/MGServerList.cpp | 1 - .../SeriousSam/GUI/Components/MGSlider.cpp | 1 - Sources/SeriousSam/GUI/Components/MGTitle.cpp | 1 - .../SeriousSam/GUI/Components/MGTrigger.cpp | 1 - .../SeriousSam/GUI/Components/MGVarButton.cpp | 1 - .../SeriousSam/GUI/Components/MenuGadget.cpp | 1 - .../SeriousSam/GUI/Components/MenuGadget.h | 2 + .../SeriousSam/{ => GUI/Menus}/GameMenu.cpp | 0 Sources/SeriousSam/{ => GUI/Menus}/GameMenu.h | 0 .../{ => GUI/Menus}/MAudioOptions.cpp | 0 .../{ => GUI/Menus}/MAudioOptions.h | 0 .../SeriousSam/{ => GUI/Menus}/MConfirm.cpp | 0 Sources/SeriousSam/{ => GUI/Menus}/MConfirm.h | 0 .../SeriousSam/{ => GUI/Menus}/MControls.cpp | 0 .../SeriousSam/{ => GUI/Menus}/MControls.h | 0 Sources/SeriousSam/{ => GUI/Menus}/MCredits.h | 0 .../{ => GUI/Menus}/MCustomizeAxis.cpp | 0 .../{ => GUI/Menus}/MCustomizeAxis.h | 0 .../{ => GUI/Menus}/MCustomizeKeyboard.cpp | 0 .../{ => GUI/Menus}/MCustomizeKeyboard.h | 0 .../SeriousSam/{ => GUI/Menus}/MDisabled.cpp | 0 .../SeriousSam/{ => GUI/Menus}/MDisabled.h | 0 .../SeriousSam/{ => GUI/Menus}/MHighScore.cpp | 0 .../SeriousSam/{ => GUI/Menus}/MHighScore.h | 0 .../SeriousSam/{ => GUI/Menus}/MInGame.cpp | 0 Sources/SeriousSam/{ => GUI/Menus}/MInGame.h | 0 .../SeriousSam/{ => GUI/Menus}/MLevels.cpp | 0 Sources/SeriousSam/{ => GUI/Menus}/MLevels.h | 0 .../SeriousSam/{ => GUI/Menus}/MLoadSave.cpp | 0 .../SeriousSam/{ => GUI/Menus}/MLoadSave.h | 0 Sources/SeriousSam/{ => GUI/Menus}/MMain.cpp | 0 Sources/SeriousSam/{ => GUI/Menus}/MMain.h | 0 .../SeriousSam/{ => GUI/Menus}/MNetwork.cpp | 0 Sources/SeriousSam/{ => GUI/Menus}/MNetwork.h | 0 .../{ => GUI/Menus}/MNetworkJoin.cpp | 0 .../SeriousSam/{ => GUI/Menus}/MNetworkJoin.h | 0 .../{ => GUI/Menus}/MNetworkOpen.cpp | 0 .../SeriousSam/{ => GUI/Menus}/MNetworkOpen.h | 0 .../{ => GUI/Menus}/MNetworkStart.cpp | 0 .../{ => GUI/Menus}/MNetworkStart.h | 0 .../SeriousSam/{ => GUI/Menus}/MOptions.cpp | 0 Sources/SeriousSam/{ => GUI/Menus}/MOptions.h | 0 .../{ => GUI/Menus}/MPlayerProfile.cpp | 0 .../{ => GUI/Menus}/MPlayerProfile.h | 0 .../{ => GUI/Menus}/MRenderingOptions.h | 0 .../{ => GUI/Menus}/MSelectPlayers.cpp | 0 .../{ => GUI/Menus}/MSelectPlayers.h | 0 .../SeriousSam/{ => GUI/Menus}/MServers.cpp | 0 Sources/SeriousSam/{ => GUI/Menus}/MServers.h | 0 .../{ => GUI/Menus}/MSinglePlayer.cpp | 0 .../{ => GUI/Menus}/MSinglePlayer.h | 0 .../{ => GUI/Menus}/MSinglePlayerNew.cpp | 0 .../{ => GUI/Menus}/MSinglePlayerNew.h | 0 .../{ => GUI/Menus}/MSplitScreen.cpp | 0 .../SeriousSam/{ => GUI/Menus}/MSplitScreen.h | 0 .../{ => GUI/Menus}/MSplitStart.cpp | 0 .../SeriousSam/{ => GUI/Menus}/MSplitStart.h | 0 Sources/SeriousSam/{ => GUI/Menus}/MVar.cpp | 0 Sources/SeriousSam/{ => GUI/Menus}/MVar.h | 0 .../{ => GUI/Menus}/MVideoOptions.cpp | 0 .../{ => GUI/Menus}/MVideoOptions.h | 0 Sources/SeriousSam/{ => GUI/Menus}/Menu.cpp | 0 Sources/SeriousSam/{ => GUI/Menus}/Menu.h | 0 .../{ => GUI/Menus}/MenuPrinting.cpp | 0 .../SeriousSam/{ => GUI/Menus}/MenuPrinting.h | 0 .../SeriousSam/{ => GUI/Menus}/MenuStuff.cpp | 0 .../SeriousSam/{ => GUI/Menus}/MenuStuff.h | 0 Sources/SeriousSam/SeriousSam.vcxproj | 128 +++-- Sources/SeriousSam/SeriousSam.vcxproj.filters | 439 +++++++++--------- Sources/SeriousSam/StdH.h | 2 +- 79 files changed, 284 insertions(+), 302 deletions(-) rename Sources/SeriousSam/{ => GUI/Menus}/GameMenu.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/GameMenu.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MAudioOptions.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MAudioOptions.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MConfirm.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MConfirm.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MControls.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MControls.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MCredits.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MCustomizeAxis.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MCustomizeAxis.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MCustomizeKeyboard.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MCustomizeKeyboard.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MDisabled.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MDisabled.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MHighScore.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MHighScore.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MInGame.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MInGame.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MLevels.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MLevels.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MLoadSave.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MLoadSave.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MMain.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MMain.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MNetwork.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MNetwork.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MNetworkJoin.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MNetworkJoin.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MNetworkOpen.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MNetworkOpen.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MNetworkStart.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MNetworkStart.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MOptions.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MOptions.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MPlayerProfile.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MPlayerProfile.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MRenderingOptions.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MSelectPlayers.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MSelectPlayers.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MServers.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MServers.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MSinglePlayer.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MSinglePlayer.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MSinglePlayerNew.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MSinglePlayerNew.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MSplitScreen.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MSplitScreen.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MSplitStart.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MSplitStart.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MVar.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MVar.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MVideoOptions.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MVideoOptions.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/Menu.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/Menu.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MenuPrinting.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MenuPrinting.h (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MenuStuff.cpp (100%) rename Sources/SeriousSam/{ => GUI/Menus}/MenuStuff.h (100%) diff --git a/Sources/SeriousSam/GUI/Components/MGArrow.cpp b/Sources/SeriousSam/GUI/Components/MGArrow.cpp index 65c553e..5cc09a2 100644 --- a/Sources/SeriousSam/GUI/Components/MGArrow.cpp +++ b/Sources/SeriousSam/GUI/Components/MGArrow.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGArrow.h" diff --git a/Sources/SeriousSam/GUI/Components/MGButton.cpp b/Sources/SeriousSam/GUI/Components/MGButton.cpp index 9fedc4a..49fc985 100644 --- a/Sources/SeriousSam/GUI/Components/MGButton.cpp +++ b/Sources/SeriousSam/GUI/Components/MGButton.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "LevelInfo.h" #include "VarList.h" diff --git a/Sources/SeriousSam/GUI/Components/MGChangePlayer.cpp b/Sources/SeriousSam/GUI/Components/MGChangePlayer.cpp index e7b2a4c..8a466a5 100644 --- a/Sources/SeriousSam/GUI/Components/MGChangePlayer.cpp +++ b/Sources/SeriousSam/GUI/Components/MGChangePlayer.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGChangePlayer.h" diff --git a/Sources/SeriousSam/GUI/Components/MGEdit.cpp b/Sources/SeriousSam/GUI/Components/MGEdit.cpp index 0ae93f3..1b0d642 100644 --- a/Sources/SeriousSam/GUI/Components/MGEdit.cpp +++ b/Sources/SeriousSam/GUI/Components/MGEdit.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGEdit.h" diff --git a/Sources/SeriousSam/GUI/Components/MGFileButton.cpp b/Sources/SeriousSam/GUI/Components/MGFileButton.cpp index 56e6ffe..13c9a91 100644 --- a/Sources/SeriousSam/GUI/Components/MGFileButton.cpp +++ b/Sources/SeriousSam/GUI/Components/MGFileButton.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGFileButton.h" diff --git a/Sources/SeriousSam/GUI/Components/MGHighScore.cpp b/Sources/SeriousSam/GUI/Components/MGHighScore.cpp index 61b4109..3b7bfaa 100644 --- a/Sources/SeriousSam/GUI/Components/MGHighScore.cpp +++ b/Sources/SeriousSam/GUI/Components/MGHighScore.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGHighScore.h" diff --git a/Sources/SeriousSam/GUI/Components/MGKeyDefinition.cpp b/Sources/SeriousSam/GUI/Components/MGKeyDefinition.cpp index 8ef80d5..b06ffc2 100644 --- a/Sources/SeriousSam/GUI/Components/MGKeyDefinition.cpp +++ b/Sources/SeriousSam/GUI/Components/MGKeyDefinition.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGKeyDefinition.h" diff --git a/Sources/SeriousSam/GUI/Components/MGLevelButton.cpp b/Sources/SeriousSam/GUI/Components/MGLevelButton.cpp index 33fede9..4237435 100644 --- a/Sources/SeriousSam/GUI/Components/MGLevelButton.cpp +++ b/Sources/SeriousSam/GUI/Components/MGLevelButton.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGLevelButton.h" diff --git a/Sources/SeriousSam/GUI/Components/MGModel.cpp b/Sources/SeriousSam/GUI/Components/MGModel.cpp index 243a9bd..a776b32 100644 --- a/Sources/SeriousSam/GUI/Components/MGModel.cpp +++ b/Sources/SeriousSam/GUI/Components/MGModel.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGModel.h" diff --git a/Sources/SeriousSam/GUI/Components/MGServerList.cpp b/Sources/SeriousSam/GUI/Components/MGServerList.cpp index 331c197..279b2ec 100644 --- a/Sources/SeriousSam/GUI/Components/MGServerList.cpp +++ b/Sources/SeriousSam/GUI/Components/MGServerList.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGServerList.h" #include "MGEdit.h" diff --git a/Sources/SeriousSam/GUI/Components/MGSlider.cpp b/Sources/SeriousSam/GUI/Components/MGSlider.cpp index 9dbe014..a1e131a 100644 --- a/Sources/SeriousSam/GUI/Components/MGSlider.cpp +++ b/Sources/SeriousSam/GUI/Components/MGSlider.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGSlider.h" diff --git a/Sources/SeriousSam/GUI/Components/MGTitle.cpp b/Sources/SeriousSam/GUI/Components/MGTitle.cpp index 215fa11..1151fa3 100644 --- a/Sources/SeriousSam/GUI/Components/MGTitle.cpp +++ b/Sources/SeriousSam/GUI/Components/MGTitle.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGTitle.h" diff --git a/Sources/SeriousSam/GUI/Components/MGTrigger.cpp b/Sources/SeriousSam/GUI/Components/MGTrigger.cpp index 7a4363d..494e576 100644 --- a/Sources/SeriousSam/GUI/Components/MGTrigger.cpp +++ b/Sources/SeriousSam/GUI/Components/MGTrigger.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "MGTrigger.h" diff --git a/Sources/SeriousSam/GUI/Components/MGVarButton.cpp b/Sources/SeriousSam/GUI/Components/MGVarButton.cpp index 93e1032..0a2f899 100644 --- a/Sources/SeriousSam/GUI/Components/MGVarButton.cpp +++ b/Sources/SeriousSam/GUI/Components/MGVarButton.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "VarList.h" #include "MGVarButton.h" diff --git a/Sources/SeriousSam/GUI/Components/MenuGadget.cpp b/Sources/SeriousSam/GUI/Components/MenuGadget.cpp index fab91ba..449ac78 100644 --- a/Sources/SeriousSam/GUI/Components/MenuGadget.cpp +++ b/Sources/SeriousSam/GUI/Components/MenuGadget.cpp @@ -3,7 +3,6 @@ #include "StdH.h" #include #include -#include "MenuPrinting.h" #include #include "LevelInfo.h" #include "VarList.h" diff --git a/Sources/SeriousSam/GUI/Components/MenuGadget.h b/Sources/SeriousSam/GUI/Components/MenuGadget.h index 66974dd..d788e59 100644 --- a/Sources/SeriousSam/GUI/Components/MenuGadget.h +++ b/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("") + class CMenuGadget { public: CListNode mg_lnNode; diff --git a/Sources/SeriousSam/GameMenu.cpp b/Sources/SeriousSam/GUI/Menus/GameMenu.cpp similarity index 100% rename from Sources/SeriousSam/GameMenu.cpp rename to Sources/SeriousSam/GUI/Menus/GameMenu.cpp diff --git a/Sources/SeriousSam/GameMenu.h b/Sources/SeriousSam/GUI/Menus/GameMenu.h similarity index 100% rename from Sources/SeriousSam/GameMenu.h rename to Sources/SeriousSam/GUI/Menus/GameMenu.h diff --git a/Sources/SeriousSam/MAudioOptions.cpp b/Sources/SeriousSam/GUI/Menus/MAudioOptions.cpp similarity index 100% rename from Sources/SeriousSam/MAudioOptions.cpp rename to Sources/SeriousSam/GUI/Menus/MAudioOptions.cpp diff --git a/Sources/SeriousSam/MAudioOptions.h b/Sources/SeriousSam/GUI/Menus/MAudioOptions.h similarity index 100% rename from Sources/SeriousSam/MAudioOptions.h rename to Sources/SeriousSam/GUI/Menus/MAudioOptions.h diff --git a/Sources/SeriousSam/MConfirm.cpp b/Sources/SeriousSam/GUI/Menus/MConfirm.cpp similarity index 100% rename from Sources/SeriousSam/MConfirm.cpp rename to Sources/SeriousSam/GUI/Menus/MConfirm.cpp diff --git a/Sources/SeriousSam/MConfirm.h b/Sources/SeriousSam/GUI/Menus/MConfirm.h similarity index 100% rename from Sources/SeriousSam/MConfirm.h rename to Sources/SeriousSam/GUI/Menus/MConfirm.h diff --git a/Sources/SeriousSam/MControls.cpp b/Sources/SeriousSam/GUI/Menus/MControls.cpp similarity index 100% rename from Sources/SeriousSam/MControls.cpp rename to Sources/SeriousSam/GUI/Menus/MControls.cpp diff --git a/Sources/SeriousSam/MControls.h b/Sources/SeriousSam/GUI/Menus/MControls.h similarity index 100% rename from Sources/SeriousSam/MControls.h rename to Sources/SeriousSam/GUI/Menus/MControls.h diff --git a/Sources/SeriousSam/MCredits.h b/Sources/SeriousSam/GUI/Menus/MCredits.h similarity index 100% rename from Sources/SeriousSam/MCredits.h rename to Sources/SeriousSam/GUI/Menus/MCredits.h diff --git a/Sources/SeriousSam/MCustomizeAxis.cpp b/Sources/SeriousSam/GUI/Menus/MCustomizeAxis.cpp similarity index 100% rename from Sources/SeriousSam/MCustomizeAxis.cpp rename to Sources/SeriousSam/GUI/Menus/MCustomizeAxis.cpp diff --git a/Sources/SeriousSam/MCustomizeAxis.h b/Sources/SeriousSam/GUI/Menus/MCustomizeAxis.h similarity index 100% rename from Sources/SeriousSam/MCustomizeAxis.h rename to Sources/SeriousSam/GUI/Menus/MCustomizeAxis.h diff --git a/Sources/SeriousSam/MCustomizeKeyboard.cpp b/Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.cpp similarity index 100% rename from Sources/SeriousSam/MCustomizeKeyboard.cpp rename to Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.cpp diff --git a/Sources/SeriousSam/MCustomizeKeyboard.h b/Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.h similarity index 100% rename from Sources/SeriousSam/MCustomizeKeyboard.h rename to Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.h diff --git a/Sources/SeriousSam/MDisabled.cpp b/Sources/SeriousSam/GUI/Menus/MDisabled.cpp similarity index 100% rename from Sources/SeriousSam/MDisabled.cpp rename to Sources/SeriousSam/GUI/Menus/MDisabled.cpp diff --git a/Sources/SeriousSam/MDisabled.h b/Sources/SeriousSam/GUI/Menus/MDisabled.h similarity index 100% rename from Sources/SeriousSam/MDisabled.h rename to Sources/SeriousSam/GUI/Menus/MDisabled.h diff --git a/Sources/SeriousSam/MHighScore.cpp b/Sources/SeriousSam/GUI/Menus/MHighScore.cpp similarity index 100% rename from Sources/SeriousSam/MHighScore.cpp rename to Sources/SeriousSam/GUI/Menus/MHighScore.cpp diff --git a/Sources/SeriousSam/MHighScore.h b/Sources/SeriousSam/GUI/Menus/MHighScore.h similarity index 100% rename from Sources/SeriousSam/MHighScore.h rename to Sources/SeriousSam/GUI/Menus/MHighScore.h diff --git a/Sources/SeriousSam/MInGame.cpp b/Sources/SeriousSam/GUI/Menus/MInGame.cpp similarity index 100% rename from Sources/SeriousSam/MInGame.cpp rename to Sources/SeriousSam/GUI/Menus/MInGame.cpp diff --git a/Sources/SeriousSam/MInGame.h b/Sources/SeriousSam/GUI/Menus/MInGame.h similarity index 100% rename from Sources/SeriousSam/MInGame.h rename to Sources/SeriousSam/GUI/Menus/MInGame.h diff --git a/Sources/SeriousSam/MLevels.cpp b/Sources/SeriousSam/GUI/Menus/MLevels.cpp similarity index 100% rename from Sources/SeriousSam/MLevels.cpp rename to Sources/SeriousSam/GUI/Menus/MLevels.cpp diff --git a/Sources/SeriousSam/MLevels.h b/Sources/SeriousSam/GUI/Menus/MLevels.h similarity index 100% rename from Sources/SeriousSam/MLevels.h rename to Sources/SeriousSam/GUI/Menus/MLevels.h diff --git a/Sources/SeriousSam/MLoadSave.cpp b/Sources/SeriousSam/GUI/Menus/MLoadSave.cpp similarity index 100% rename from Sources/SeriousSam/MLoadSave.cpp rename to Sources/SeriousSam/GUI/Menus/MLoadSave.cpp diff --git a/Sources/SeriousSam/MLoadSave.h b/Sources/SeriousSam/GUI/Menus/MLoadSave.h similarity index 100% rename from Sources/SeriousSam/MLoadSave.h rename to Sources/SeriousSam/GUI/Menus/MLoadSave.h diff --git a/Sources/SeriousSam/MMain.cpp b/Sources/SeriousSam/GUI/Menus/MMain.cpp similarity index 100% rename from Sources/SeriousSam/MMain.cpp rename to Sources/SeriousSam/GUI/Menus/MMain.cpp diff --git a/Sources/SeriousSam/MMain.h b/Sources/SeriousSam/GUI/Menus/MMain.h similarity index 100% rename from Sources/SeriousSam/MMain.h rename to Sources/SeriousSam/GUI/Menus/MMain.h diff --git a/Sources/SeriousSam/MNetwork.cpp b/Sources/SeriousSam/GUI/Menus/MNetwork.cpp similarity index 100% rename from Sources/SeriousSam/MNetwork.cpp rename to Sources/SeriousSam/GUI/Menus/MNetwork.cpp diff --git a/Sources/SeriousSam/MNetwork.h b/Sources/SeriousSam/GUI/Menus/MNetwork.h similarity index 100% rename from Sources/SeriousSam/MNetwork.h rename to Sources/SeriousSam/GUI/Menus/MNetwork.h diff --git a/Sources/SeriousSam/MNetworkJoin.cpp b/Sources/SeriousSam/GUI/Menus/MNetworkJoin.cpp similarity index 100% rename from Sources/SeriousSam/MNetworkJoin.cpp rename to Sources/SeriousSam/GUI/Menus/MNetworkJoin.cpp diff --git a/Sources/SeriousSam/MNetworkJoin.h b/Sources/SeriousSam/GUI/Menus/MNetworkJoin.h similarity index 100% rename from Sources/SeriousSam/MNetworkJoin.h rename to Sources/SeriousSam/GUI/Menus/MNetworkJoin.h diff --git a/Sources/SeriousSam/MNetworkOpen.cpp b/Sources/SeriousSam/GUI/Menus/MNetworkOpen.cpp similarity index 100% rename from Sources/SeriousSam/MNetworkOpen.cpp rename to Sources/SeriousSam/GUI/Menus/MNetworkOpen.cpp diff --git a/Sources/SeriousSam/MNetworkOpen.h b/Sources/SeriousSam/GUI/Menus/MNetworkOpen.h similarity index 100% rename from Sources/SeriousSam/MNetworkOpen.h rename to Sources/SeriousSam/GUI/Menus/MNetworkOpen.h diff --git a/Sources/SeriousSam/MNetworkStart.cpp b/Sources/SeriousSam/GUI/Menus/MNetworkStart.cpp similarity index 100% rename from Sources/SeriousSam/MNetworkStart.cpp rename to Sources/SeriousSam/GUI/Menus/MNetworkStart.cpp diff --git a/Sources/SeriousSam/MNetworkStart.h b/Sources/SeriousSam/GUI/Menus/MNetworkStart.h similarity index 100% rename from Sources/SeriousSam/MNetworkStart.h rename to Sources/SeriousSam/GUI/Menus/MNetworkStart.h diff --git a/Sources/SeriousSam/MOptions.cpp b/Sources/SeriousSam/GUI/Menus/MOptions.cpp similarity index 100% rename from Sources/SeriousSam/MOptions.cpp rename to Sources/SeriousSam/GUI/Menus/MOptions.cpp diff --git a/Sources/SeriousSam/MOptions.h b/Sources/SeriousSam/GUI/Menus/MOptions.h similarity index 100% rename from Sources/SeriousSam/MOptions.h rename to Sources/SeriousSam/GUI/Menus/MOptions.h diff --git a/Sources/SeriousSam/MPlayerProfile.cpp b/Sources/SeriousSam/GUI/Menus/MPlayerProfile.cpp similarity index 100% rename from Sources/SeriousSam/MPlayerProfile.cpp rename to Sources/SeriousSam/GUI/Menus/MPlayerProfile.cpp diff --git a/Sources/SeriousSam/MPlayerProfile.h b/Sources/SeriousSam/GUI/Menus/MPlayerProfile.h similarity index 100% rename from Sources/SeriousSam/MPlayerProfile.h rename to Sources/SeriousSam/GUI/Menus/MPlayerProfile.h diff --git a/Sources/SeriousSam/MRenderingOptions.h b/Sources/SeriousSam/GUI/Menus/MRenderingOptions.h similarity index 100% rename from Sources/SeriousSam/MRenderingOptions.h rename to Sources/SeriousSam/GUI/Menus/MRenderingOptions.h diff --git a/Sources/SeriousSam/MSelectPlayers.cpp b/Sources/SeriousSam/GUI/Menus/MSelectPlayers.cpp similarity index 100% rename from Sources/SeriousSam/MSelectPlayers.cpp rename to Sources/SeriousSam/GUI/Menus/MSelectPlayers.cpp diff --git a/Sources/SeriousSam/MSelectPlayers.h b/Sources/SeriousSam/GUI/Menus/MSelectPlayers.h similarity index 100% rename from Sources/SeriousSam/MSelectPlayers.h rename to Sources/SeriousSam/GUI/Menus/MSelectPlayers.h diff --git a/Sources/SeriousSam/MServers.cpp b/Sources/SeriousSam/GUI/Menus/MServers.cpp similarity index 100% rename from Sources/SeriousSam/MServers.cpp rename to Sources/SeriousSam/GUI/Menus/MServers.cpp diff --git a/Sources/SeriousSam/MServers.h b/Sources/SeriousSam/GUI/Menus/MServers.h similarity index 100% rename from Sources/SeriousSam/MServers.h rename to Sources/SeriousSam/GUI/Menus/MServers.h diff --git a/Sources/SeriousSam/MSinglePlayer.cpp b/Sources/SeriousSam/GUI/Menus/MSinglePlayer.cpp similarity index 100% rename from Sources/SeriousSam/MSinglePlayer.cpp rename to Sources/SeriousSam/GUI/Menus/MSinglePlayer.cpp diff --git a/Sources/SeriousSam/MSinglePlayer.h b/Sources/SeriousSam/GUI/Menus/MSinglePlayer.h similarity index 100% rename from Sources/SeriousSam/MSinglePlayer.h rename to Sources/SeriousSam/GUI/Menus/MSinglePlayer.h diff --git a/Sources/SeriousSam/MSinglePlayerNew.cpp b/Sources/SeriousSam/GUI/Menus/MSinglePlayerNew.cpp similarity index 100% rename from Sources/SeriousSam/MSinglePlayerNew.cpp rename to Sources/SeriousSam/GUI/Menus/MSinglePlayerNew.cpp diff --git a/Sources/SeriousSam/MSinglePlayerNew.h b/Sources/SeriousSam/GUI/Menus/MSinglePlayerNew.h similarity index 100% rename from Sources/SeriousSam/MSinglePlayerNew.h rename to Sources/SeriousSam/GUI/Menus/MSinglePlayerNew.h diff --git a/Sources/SeriousSam/MSplitScreen.cpp b/Sources/SeriousSam/GUI/Menus/MSplitScreen.cpp similarity index 100% rename from Sources/SeriousSam/MSplitScreen.cpp rename to Sources/SeriousSam/GUI/Menus/MSplitScreen.cpp diff --git a/Sources/SeriousSam/MSplitScreen.h b/Sources/SeriousSam/GUI/Menus/MSplitScreen.h similarity index 100% rename from Sources/SeriousSam/MSplitScreen.h rename to Sources/SeriousSam/GUI/Menus/MSplitScreen.h diff --git a/Sources/SeriousSam/MSplitStart.cpp b/Sources/SeriousSam/GUI/Menus/MSplitStart.cpp similarity index 100% rename from Sources/SeriousSam/MSplitStart.cpp rename to Sources/SeriousSam/GUI/Menus/MSplitStart.cpp diff --git a/Sources/SeriousSam/MSplitStart.h b/Sources/SeriousSam/GUI/Menus/MSplitStart.h similarity index 100% rename from Sources/SeriousSam/MSplitStart.h rename to Sources/SeriousSam/GUI/Menus/MSplitStart.h diff --git a/Sources/SeriousSam/MVar.cpp b/Sources/SeriousSam/GUI/Menus/MVar.cpp similarity index 100% rename from Sources/SeriousSam/MVar.cpp rename to Sources/SeriousSam/GUI/Menus/MVar.cpp diff --git a/Sources/SeriousSam/MVar.h b/Sources/SeriousSam/GUI/Menus/MVar.h similarity index 100% rename from Sources/SeriousSam/MVar.h rename to Sources/SeriousSam/GUI/Menus/MVar.h diff --git a/Sources/SeriousSam/MVideoOptions.cpp b/Sources/SeriousSam/GUI/Menus/MVideoOptions.cpp similarity index 100% rename from Sources/SeriousSam/MVideoOptions.cpp rename to Sources/SeriousSam/GUI/Menus/MVideoOptions.cpp diff --git a/Sources/SeriousSam/MVideoOptions.h b/Sources/SeriousSam/GUI/Menus/MVideoOptions.h similarity index 100% rename from Sources/SeriousSam/MVideoOptions.h rename to Sources/SeriousSam/GUI/Menus/MVideoOptions.h diff --git a/Sources/SeriousSam/Menu.cpp b/Sources/SeriousSam/GUI/Menus/Menu.cpp similarity index 100% rename from Sources/SeriousSam/Menu.cpp rename to Sources/SeriousSam/GUI/Menus/Menu.cpp diff --git a/Sources/SeriousSam/Menu.h b/Sources/SeriousSam/GUI/Menus/Menu.h similarity index 100% rename from Sources/SeriousSam/Menu.h rename to Sources/SeriousSam/GUI/Menus/Menu.h diff --git a/Sources/SeriousSam/MenuPrinting.cpp b/Sources/SeriousSam/GUI/Menus/MenuPrinting.cpp similarity index 100% rename from Sources/SeriousSam/MenuPrinting.cpp rename to Sources/SeriousSam/GUI/Menus/MenuPrinting.cpp diff --git a/Sources/SeriousSam/MenuPrinting.h b/Sources/SeriousSam/GUI/Menus/MenuPrinting.h similarity index 100% rename from Sources/SeriousSam/MenuPrinting.h rename to Sources/SeriousSam/GUI/Menus/MenuPrinting.h diff --git a/Sources/SeriousSam/MenuStuff.cpp b/Sources/SeriousSam/GUI/Menus/MenuStuff.cpp similarity index 100% rename from Sources/SeriousSam/MenuStuff.cpp rename to Sources/SeriousSam/GUI/Menus/MenuStuff.cpp diff --git a/Sources/SeriousSam/MenuStuff.h b/Sources/SeriousSam/GUI/Menus/MenuStuff.h similarity index 100% rename from Sources/SeriousSam/MenuStuff.h rename to Sources/SeriousSam/GUI/Menus/MenuStuff.h diff --git a/Sources/SeriousSam/SeriousSam.vcxproj b/Sources/SeriousSam/SeriousSam.vcxproj index 71b362f..4d0e9ac 100644 --- a/Sources/SeriousSam/SeriousSam.vcxproj +++ b/Sources/SeriousSam/SeriousSam.vcxproj @@ -178,7 +178,6 @@ copy Release\$(TargetName).map $(SolutionDir)..\Bin\ >nul - @@ -195,22 +194,38 @@ copy Release\$(TargetName).map $(SolutionDir)..\Bin\ >nul + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - Use - StdH.h - Use - StdH.h - - @@ -226,29 +241,37 @@ copy Release\$(TargetName).map $(SolutionDir)..\Bin\ >nul - - CppCode - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Use StdH.h @@ -270,41 +293,10 @@ copy Release\$(TargetName).map $(SolutionDir)..\Bin\ >nul - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/SeriousSam/SeriousSam.vcxproj.filters b/Sources/SeriousSam/SeriousSam.vcxproj.filters index c15f77e..6e9db1e 100644 --- a/Sources/SeriousSam/SeriousSam.vcxproj.filters +++ b/Sources/SeriousSam/SeriousSam.vcxproj.filters @@ -19,18 +19,24 @@ {332d9393-d918-4caf-86b2-2e63c2cca9bd} - - {47ffb7e3-433b-480c-a22a-849524a5bd1e} + + {b1fe2cd0-889c-48dd-897c-cdbbdcb0a131} - + {3bc65fe2-8c15-4ecd-bf59-de962bb42275} - + {df54d6d1-39c3-4f26-93f8-116311f5a0eb} - + + {4c95322d-560a-4738-a631-e3e860b59560} + + {9a04e8a8-ecfc-42c3-bf28-fe3d8b49e626} + + {47ffb7e3-433b-480c-a22a-849524a5bd1e} + @@ -51,9 +57,6 @@ Source Files - - Source Files - Source Files @@ -66,134 +69,137 @@ Source Files - - Source Files - - - Source Files\Menus - - - Source Files\Menus - - - Source Files - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - - Source Files\Menus - - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets - Source Files\Gadgets + Source Files\GUI\Gadgets + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus + + + Source Files\GUI\Menus @@ -218,9 +224,6 @@ Header Files - - Header Files - Header Files @@ -236,149 +239,149 @@ Header Files - - Header Files - Header Files - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - Header Files - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files\Menus headers - - - Header Files - - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers - Header Files\Gadgets headers + Header Files\GUI headers\Gadgets headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers + + + Header Files\GUI headers\Menus headers diff --git a/Sources/SeriousSam/StdH.h b/Sources/SeriousSam/StdH.h index 1c65f03..e918afb 100644 --- a/Sources/SeriousSam/StdH.h +++ b/Sources/SeriousSam/StdH.h @@ -23,4 +23,4 @@ #define TECHTESTONLY 0 #include "SeriousSam.h" -#include "Menu.h" \ No newline at end of file +#include "GUI/Menus/Menu.h" \ No newline at end of file