src/CMakeLists.txt

@@ -160,34 +160,34 @@ add_executable(MassBuilderSaveTool
     GameData/Accessories.h
     GameData/ArmourSets.h
     GameData/LastMissionId.h
+    GameData/ResourceIDs.h
     GameData/StoryProgress.h
     GameData/StyleNames.h
     GameData/WeaponParts.h
+    GameObjects/Accessory.h
+    GameObjects/ArmourPart.h
+    GameObjects/BulletLauncherAttachment.h
+    GameObjects/CustomStyle.h
+    GameObjects/Decal.h
+    GameObjects/Joints.h
+    GameObjects/Mass.h
+    GameObjects/Mass.cpp
+    GameObjects/Mass_Frame.cpp
+    GameObjects/Mass_Armour.cpp
+    GameObjects/Mass_Weapons.cpp
+    GameObjects/Mass_Styles.cpp
+    GameObjects/Mass_DecalsAccessories.cpp
+    GameObjects/MassPropertyNames.h
+    GameObjects/Profile.h
+    GameObjects/Profile.cpp
+    GameObjects/ProfilePropertyNames.h
+    GameObjects/Weapon.h
+    GameObjects/Weapon.cpp
+    GameObjects/WeaponPart.h
     ProfileManager/ProfileManager.h
     ProfileManager/ProfileManager.cpp
-    Profile/Profile.h
-    Profile/Profile.cpp
-    Profile/PropertyNames.h
-    Profile/ResourceIDs.h
     MassManager/MassManager.h
     MassManager/MassManager.cpp
-    Mass/Accessory.h
-    Mass/ArmourPart.h
-    Mass/BulletLauncherAttachment.h
-    Mass/CustomStyle.h
-    Mass/Decal.h
-    Mass/Joints.h
-    Mass/Mass.h
-    Mass/Mass.cpp
-    Mass/Mass_Frame.cpp
-    Mass/Mass_Armour.cpp
-    Mass/Mass_Weapons.cpp
-    Mass/Mass_Styles.cpp
-    Mass/Mass_DecalsAccessories.cpp
-    Mass/PropertyNames.h
-    Mass/Weapon.h
-    Mass/Weapon.cpp
-    Mass/WeaponPart.h
     Maps/ArmourSlots.hpp
     Maps/BulletLauncherAttachmentStyles.hpp
     Maps/BulletLauncherSockets.hpp

src/GameObjects/Mass.cpp

@@ -21,7 +21,7 @@
 #include <Corrade/Containers/ScopeGuard.h>
 #include <Corrade/Utility/Path.h>
 
-#include "PropertyNames.h"
+#include "MassPropertyNames.h"
 #include "../Logger/Logger.h"
 #include "../Gvas/Types/ArrayProperty.h"
 #include "../Gvas/Types/BoolProperty.h"

src/GameObjects/Mass_Armour.cpp

@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "PropertyNames.h"
+#include "MassPropertyNames.h"
 #include "../Logger/Logger.h"
 #include "../Gvas/Types/ArrayProperty.h"
 #include "../Gvas/Types/ByteProperty.h"

src/GameObjects/Mass_DecalsAccessories.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "PropertyNames.h"
+#include "MassPropertyNames.h"
 #include "../Gvas/Types/ArrayProperty.h"
 #include "../Gvas/Types/BoolProperty.h"
 #include "../Gvas/Types/ColourStructProperty.h"

src/GameObjects/Mass_Frame.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "PropertyNames.h"
+#include "MassPropertyNames.h"
 #include "../Logger/Logger.h"
 #include "../Gvas/Types/ArrayProperty.h"
 #include "../Gvas/Types/ColourStructProperty.h"

src/GameObjects/Mass_Styles.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "PropertyNames.h"
+#include "MassPropertyNames.h"
 #include "../Logger/Logger.h"
 #include "../Gvas/Types/ArrayProperty.h"
 #include "../Gvas/Types/ColourStructProperty.h"

src/GameObjects/Mass_Weapons.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "PropertyNames.h"
+#include "MassPropertyNames.h"
 #include "../Logger/Logger.h"
 #include "../Gvas/Types/ArrayProperty.h"
 #include "../Gvas/Types/BoolProperty.h"

src/GameObjects/Profile.cpp

@@ -19,7 +19,7 @@
 #include <Corrade/Containers/Pair.h>
 #include <Corrade/Utility/Path.h>
 
-#include "PropertyNames.h"
+#include "ProfilePropertyNames.h"
 #include "../Logger/Logger.h"
 #include "../Gvas/Types/ArrayProperty.h"
 #include "../Gvas/Types/ResourceItemValue.h"

src/GameObjects/Profile.h

@@ -21,10 +21,9 @@
 #include <Corrade/Containers/String.h>
 #include <Corrade/Containers/StringView.h>
 
+#include "../GameData/ResourceIDs.h"
 #include "../Gvas/File.h"
 
-#include "ResourceIDs.h"
-
 using namespace Corrade;
 
 namespace mbst { namespace GameObjects {

src/ImportExport/Export.h

@@ -18,7 +18,7 @@
 
 #include <Corrade/Containers/StringView.h>
 
-#include "../Mass/CustomStyle.h"
+#include "../GameObjects/CustomStyle.h"
 
 using namespace Corrade;
 

src/ImportExport/Import.h

@@ -18,7 +18,7 @@
 
 #include <Corrade/Containers/StringView.h>
 
-#include "../Mass/CustomStyle.h"
+#include "../GameObjects/CustomStyle.h"
 
 using namespace Corrade;
 

src/MassManager/MassManager.h

@@ -22,7 +22,7 @@
 #include <Corrade/Containers/String.h>
 #include <Corrade/Containers/StringView.h>
 
-#include "../Mass/Mass.h"
+#include "../GameObjects/Mass.h"
 
 using namespace Corrade;
 

src/ProfileManager/ProfileManager.h

@@ -23,7 +23,7 @@
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/String.h>
 
-#include "../Profile/Profile.h"
+#include "../GameObjects/Profile.h"
 
 using namespace Corrade;