From 0b2796e94b9f3aad1f16cb01903abe907d7bb6da Mon Sep 17 00:00:00 2001 From: Guillaume Jacquemin Date: Thu, 28 Mar 2024 12:50:15 +0100 Subject: [PATCH] GameData: move headers into a dedicated folder. From now on, Maps will only be for preprocessor-powered multi-directional mapping fuckery. --- src/Application/Application_MainManager.cpp | 4 ++-- src/Application/Application_MassViewer.cpp | 5 +++-- src/Application/Application_MassViewer_Armour.cpp | 5 ++--- src/Application/Application_MassViewer_Frame.cpp | 2 +- src/Application/Application_MassViewer_Weapons.cpp | 4 ++-- src/CMakeLists.txt | 12 ++++++------ src/{Maps => GameData}/Accessories.h | 0 src/{Maps => GameData}/ArmourSets.h | 0 src/{Maps => GameData}/LastMissionId.h | 0 src/{Maps => GameData}/StoryProgress.h | 0 src/{Maps => GameData}/StyleNames.h | 0 src/{Maps => GameData}/WeaponParts.h | 0 12 files changed, 16 insertions(+), 16 deletions(-) rename src/{Maps => GameData}/Accessories.h (100%) rename src/{Maps => GameData}/ArmourSets.h (100%) rename src/{Maps => GameData}/LastMissionId.h (100%) rename src/{Maps => GameData}/StoryProgress.h (100%) rename src/{Maps => GameData}/StyleNames.h (100%) rename src/{Maps => GameData}/WeaponParts.h (100%) diff --git a/src/Application/Application_MainManager.cpp b/src/Application/Application_MainManager.cpp index a5d56cf..a05770a 100644 --- a/src/Application/Application_MainManager.cpp +++ b/src/Application/Application_MainManager.cpp @@ -25,8 +25,8 @@ #include "../Configuration/Configuration.h" #include "../FontAwesome/IconsFontAwesome5.h" -#include "../Maps/LastMissionId.h" -#include "../Maps/StoryProgress.h" +#include "../GameData/LastMissionId.h" +#include "../GameData/StoryProgress.h" #include "Application.h" diff --git a/src/Application/Application_MassViewer.cpp b/src/Application/Application_MassViewer.cpp index ad3d288..d17c259 100644 --- a/src/Application/Application_MassViewer.cpp +++ b/src/Application/Application_MassViewer.cpp @@ -21,9 +21,10 @@ #include "../Configuration/Configuration.h" #include "../FontAwesome/IconsFontAwesome5.h" -#include "../Maps/Accessories.h" +#include "../GameData/Accessories.h" #define STYLENAMES_DEFINITION -#include "../Maps/StyleNames.h" +#include "../GameData/StyleNames.h" +#include "../ImportExport/Export.h" #include "Application.h" diff --git a/src/Application/Application_MassViewer_Armour.cpp b/src/Application/Application_MassViewer_Armour.cpp index 21346db..cc323d8 100644 --- a/src/Application/Application_MassViewer_Armour.cpp +++ b/src/Application/Application_MassViewer_Armour.cpp @@ -15,9 +15,8 @@ // along with this program. If not, see . #include "../FontAwesome/IconsFontAwesome5.h" - -#include "../Maps/ArmourSets.h" -#include "../Maps/StyleNames.h" +#include "../GameData/ArmourSets.h" +#include "../GameData/StyleNames.h" #include "Application.h" diff --git a/src/Application/Application_MassViewer_Frame.cpp b/src/Application/Application_MassViewer_Frame.cpp index 39c2fcb..49d4a71 100644 --- a/src/Application/Application_MassViewer_Frame.cpp +++ b/src/Application/Application_MassViewer_Frame.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "../FontAwesome/IconsFontAwesome5.h" -#include "../Maps/StyleNames.h" +#include "../GameData/StyleNames.h" #include "Application.h" diff --git a/src/Application/Application_MassViewer_Weapons.cpp b/src/Application/Application_MassViewer_Weapons.cpp index 96b3c9f..7865a0e 100644 --- a/src/Application/Application_MassViewer_Weapons.cpp +++ b/src/Application/Application_MassViewer_Weapons.cpp @@ -16,8 +16,8 @@ #include "../FontAwesome/IconsFontAwesome5.h" -#include "../Maps/StyleNames.h" -#include "../Maps/WeaponParts.h" +#include "../GameData/StyleNames.h" +#include "../GameData/WeaponParts.h" #include "Application.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ef8f1a7..d7a2d76 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -157,6 +157,12 @@ add_executable(MassBuilderSaveTool Application/Application_UpdateChecker.cpp Configuration/Configuration.h Configuration/Configuration.cpp + GameData/Accessories.h + GameData/ArmourSets.h + GameData/LastMissionId.h + GameData/StoryProgress.h + GameData/StyleNames.h + GameData/WeaponParts.h ProfileManager/ProfileManager.h ProfileManager/ProfileManager.cpp Profile/Profile.h @@ -182,17 +188,11 @@ add_executable(MassBuilderSaveTool Mass/Weapon.h Mass/Weapon.cpp Mass/WeaponPart.h - Maps/Accessories.h - Maps/ArmourSets.h Maps/ArmourSlots.hpp Maps/BulletLauncherAttachmentStyles.hpp Maps/BulletLauncherSockets.hpp Maps/DamageTypes.hpp Maps/EffectColourModes.hpp - Maps/LastMissionId.h - Maps/StoryProgress.h - Maps/StyleNames.h - Maps/WeaponParts.h Maps/WeaponTypes.hpp ToastQueue/ToastQueue.h ToastQueue/ToastQueue.cpp diff --git a/src/Maps/Accessories.h b/src/GameData/Accessories.h similarity index 100% rename from src/Maps/Accessories.h rename to src/GameData/Accessories.h diff --git a/src/Maps/ArmourSets.h b/src/GameData/ArmourSets.h similarity index 100% rename from src/Maps/ArmourSets.h rename to src/GameData/ArmourSets.h diff --git a/src/Maps/LastMissionId.h b/src/GameData/LastMissionId.h similarity index 100% rename from src/Maps/LastMissionId.h rename to src/GameData/LastMissionId.h diff --git a/src/Maps/StoryProgress.h b/src/GameData/StoryProgress.h similarity index 100% rename from src/Maps/StoryProgress.h rename to src/GameData/StoryProgress.h diff --git a/src/Maps/StyleNames.h b/src/GameData/StyleNames.h similarity index 100% rename from src/Maps/StyleNames.h rename to src/GameData/StyleNames.h diff --git a/src/Maps/WeaponParts.h b/src/GameData/WeaponParts.h similarity index 100% rename from src/Maps/WeaponParts.h rename to src/GameData/WeaponParts.h