diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d7a2d76..f7e6a34 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/Profile/ResourceIDs.h b/src/GameData/ResourceIDs.h similarity index 100% rename from src/Profile/ResourceIDs.h rename to src/GameData/ResourceIDs.h diff --git a/src/Mass/Accessory.h b/src/GameObjects/Accessory.h similarity index 100% rename from src/Mass/Accessory.h rename to src/GameObjects/Accessory.h diff --git a/src/Mass/ArmourPart.h b/src/GameObjects/ArmourPart.h similarity index 100% rename from src/Mass/ArmourPart.h rename to src/GameObjects/ArmourPart.h diff --git a/src/Mass/BulletLauncherAttachment.h b/src/GameObjects/BulletLauncherAttachment.h similarity index 100% rename from src/Mass/BulletLauncherAttachment.h rename to src/GameObjects/BulletLauncherAttachment.h diff --git a/src/Mass/CustomStyle.h b/src/GameObjects/CustomStyle.h similarity index 100% rename from src/Mass/CustomStyle.h rename to src/GameObjects/CustomStyle.h diff --git a/src/Mass/Decal.h b/src/GameObjects/Decal.h similarity index 100% rename from src/Mass/Decal.h rename to src/GameObjects/Decal.h diff --git a/src/Mass/Joints.h b/src/GameObjects/Joints.h similarity index 100% rename from src/Mass/Joints.h rename to src/GameObjects/Joints.h diff --git a/src/Mass/Mass.cpp b/src/GameObjects/Mass.cpp similarity index 99% rename from src/Mass/Mass.cpp rename to src/GameObjects/Mass.cpp index 9e6f35f..124db44 100644 --- a/src/Mass/Mass.cpp +++ b/src/GameObjects/Mass.cpp @@ -21,7 +21,7 @@ #include #include -#include "PropertyNames.h" +#include "MassPropertyNames.h" #include "../Logger/Logger.h" #include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/BoolProperty.h" diff --git a/src/Mass/Mass.h b/src/GameObjects/Mass.h similarity index 100% rename from src/Mass/Mass.h rename to src/GameObjects/Mass.h diff --git a/src/Mass/PropertyNames.h b/src/GameObjects/MassPropertyNames.h similarity index 100% rename from src/Mass/PropertyNames.h rename to src/GameObjects/MassPropertyNames.h diff --git a/src/Mass/Mass_Armour.cpp b/src/GameObjects/Mass_Armour.cpp similarity index 99% rename from src/Mass/Mass_Armour.cpp rename to src/GameObjects/Mass_Armour.cpp index 34b6f9b..280f572 100644 --- a/src/Mass/Mass_Armour.cpp +++ b/src/GameObjects/Mass_Armour.cpp @@ -16,7 +16,7 @@ #include -#include "PropertyNames.h" +#include "MassPropertyNames.h" #include "../Logger/Logger.h" #include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ByteProperty.h" diff --git a/src/Mass/Mass_DecalsAccessories.cpp b/src/GameObjects/Mass_DecalsAccessories.cpp similarity index 99% rename from src/Mass/Mass_DecalsAccessories.cpp rename to src/GameObjects/Mass_DecalsAccessories.cpp index fe68000..320e34c 100644 --- a/src/Mass/Mass_DecalsAccessories.cpp +++ b/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 . -#include "PropertyNames.h" +#include "MassPropertyNames.h" #include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/BoolProperty.h" #include "../Gvas/Types/ColourStructProperty.h" diff --git a/src/Mass/Mass_Frame.cpp b/src/GameObjects/Mass_Frame.cpp similarity index 99% rename from src/Mass/Mass_Frame.cpp rename to src/GameObjects/Mass_Frame.cpp index e19f20f..c3ab3ff 100644 --- a/src/Mass/Mass_Frame.cpp +++ b/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 . -#include "PropertyNames.h" +#include "MassPropertyNames.h" #include "../Logger/Logger.h" #include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ColourStructProperty.h" diff --git a/src/Mass/Mass_Styles.cpp b/src/GameObjects/Mass_Styles.cpp similarity index 99% rename from src/Mass/Mass_Styles.cpp rename to src/GameObjects/Mass_Styles.cpp index daa0c8d..6c08ccb 100644 --- a/src/Mass/Mass_Styles.cpp +++ b/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 . -#include "PropertyNames.h" +#include "MassPropertyNames.h" #include "../Logger/Logger.h" #include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ColourStructProperty.h" diff --git a/src/Mass/Mass_Weapons.cpp b/src/GameObjects/Mass_Weapons.cpp similarity index 99% rename from src/Mass/Mass_Weapons.cpp rename to src/GameObjects/Mass_Weapons.cpp index ef8f975..6a5367c 100644 --- a/src/Mass/Mass_Weapons.cpp +++ b/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 . -#include "PropertyNames.h" +#include "MassPropertyNames.h" #include "../Logger/Logger.h" #include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/BoolProperty.h" diff --git a/src/Profile/Profile.cpp b/src/GameObjects/Profile.cpp similarity index 99% rename from src/Profile/Profile.cpp rename to src/GameObjects/Profile.cpp index cc342e1..8c0163d 100644 --- a/src/Profile/Profile.cpp +++ b/src/GameObjects/Profile.cpp @@ -19,7 +19,7 @@ #include #include -#include "PropertyNames.h" +#include "ProfilePropertyNames.h" #include "../Logger/Logger.h" #include "../Gvas/Types/ArrayProperty.h" #include "../Gvas/Types/ResourceItemValue.h" diff --git a/src/Profile/Profile.h b/src/GameObjects/Profile.h similarity index 98% rename from src/Profile/Profile.h rename to src/GameObjects/Profile.h index 54d04c2..426d2cc 100644 --- a/src/Profile/Profile.h +++ b/src/GameObjects/Profile.h @@ -21,10 +21,9 @@ #include #include +#include "../GameData/ResourceIDs.h" #include "../Gvas/File.h" -#include "ResourceIDs.h" - using namespace Corrade; namespace mbst { namespace GameObjects { diff --git a/src/Profile/PropertyNames.h b/src/GameObjects/ProfilePropertyNames.h similarity index 100% rename from src/Profile/PropertyNames.h rename to src/GameObjects/ProfilePropertyNames.h diff --git a/src/Mass/Weapon.cpp b/src/GameObjects/Weapon.cpp similarity index 100% rename from src/Mass/Weapon.cpp rename to src/GameObjects/Weapon.cpp diff --git a/src/Mass/Weapon.h b/src/GameObjects/Weapon.h similarity index 100% rename from src/Mass/Weapon.h rename to src/GameObjects/Weapon.h diff --git a/src/Mass/WeaponPart.h b/src/GameObjects/WeaponPart.h similarity index 100% rename from src/Mass/WeaponPart.h rename to src/GameObjects/WeaponPart.h diff --git a/src/ImportExport/Export.h b/src/ImportExport/Export.h index 46c00f8..e869a9f 100644 --- a/src/ImportExport/Export.h +++ b/src/ImportExport/Export.h @@ -18,7 +18,7 @@ #include -#include "../Mass/CustomStyle.h" +#include "../GameObjects/CustomStyle.h" using namespace Corrade; diff --git a/src/ImportExport/Import.h b/src/ImportExport/Import.h index 184ae07..d16990a 100644 --- a/src/ImportExport/Import.h +++ b/src/ImportExport/Import.h @@ -18,7 +18,7 @@ #include -#include "../Mass/CustomStyle.h" +#include "../GameObjects/CustomStyle.h" using namespace Corrade; diff --git a/src/MassManager/MassManager.h b/src/MassManager/MassManager.h index 4b36dcb..71fcf3b 100644 --- a/src/MassManager/MassManager.h +++ b/src/MassManager/MassManager.h @@ -22,7 +22,7 @@ #include #include -#include "../Mass/Mass.h" +#include "../GameObjects/Mass.h" using namespace Corrade; diff --git a/src/ProfileManager/ProfileManager.h b/src/ProfileManager/ProfileManager.h index 99eaab7..b5565c3 100644 --- a/src/ProfileManager/ProfileManager.h +++ b/src/ProfileManager/ProfileManager.h @@ -23,7 +23,7 @@ #include #include -#include "../Profile/Profile.h" +#include "../GameObjects/Profile.h" using namespace Corrade;