src/Application/Application_MainManager.cpp

@@ -25,8 +25,8 @@
 
 #include "../Configuration/Configuration.h"
 #include "../FontAwesome/IconsFontAwesome5.h"
-#include "../Maps/LastMissionId.h"
+#include "../GameData/LastMissionId.h"
-#include "../Maps/StoryProgress.h"
+#include "../GameData/StoryProgress.h"
 
 #include "Application.h"
 

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"
 

src/Application/Application_MassViewer_Armour.cpp

@@ -15,9 +15,8 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "../FontAwesome/IconsFontAwesome5.h"
-
+#include "../GameData/ArmourSets.h"
-#include "../Maps/ArmourSets.h"
+#include "../GameData/StyleNames.h"
-#include "../Maps/StyleNames.h"
 
 #include "Application.h"
 

src/Application/Application_MassViewer_Frame.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "../FontAwesome/IconsFontAwesome5.h"
-#include "../Maps/StyleNames.h"
+#include "../GameData/StyleNames.h"
 
 #include "Application.h"
 

src/Application/Application_MassViewer_Weapons.cpp

@@ -16,8 +16,8 @@
 
 #include "../FontAwesome/IconsFontAwesome5.h"
 
-#include "../Maps/StyleNames.h"
+#include "../GameData/StyleNames.h"
-#include "../Maps/WeaponParts.h"
+#include "../GameData/WeaponParts.h"
 
 #include "Application.h"
 

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