GameObjects: merge the two property name headers.

src/CMakeLists.txt

@@ -177,10 +177,9 @@ add_executable(MassBuilderSaveTool
     GameObjects/Mass_Weapons.cpp
     GameObjects/Mass_Styles.cpp
     GameObjects/Mass_DecalsAccessories.cpp
-    GameObjects/MassPropertyNames.h
+    GameObjects/PropertyNames.h
     GameObjects/Profile.h
     GameObjects/Profile.cpp
-    GameObjects/ProfilePropertyNames.h
     GameObjects/Weapon.h
     GameObjects/Weapon.cpp
     GameObjects/WeaponPart.h

src/GameObjects/Mass.cpp

@@ -21,7 +21,7 @@
 #include <Corrade/Containers/ScopeGuard.h>
 #include <Corrade/Utility/Path.h>
 
-#include "MassPropertyNames.h"
+#include "PropertyNames.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 "MassPropertyNames.h"
+#include "PropertyNames.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 "MassPropertyNames.h"
+#include "PropertyNames.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 "MassPropertyNames.h"
+#include "PropertyNames.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 "MassPropertyNames.h"
+#include "PropertyNames.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 "MassPropertyNames.h"
+#include "PropertyNames.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 "ProfilePropertyNames.h"
+#include "PropertyNames.h"
 #include "../Logger/Logger.h"
 #include "../Gvas/Types/ArrayProperty.h"
 #include "../Gvas/Types/ResourceItemValue.h"

src/GameObjects/ProfilePropertyNames.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#define PROFILE_NAME "CompanyName"
-#define PROFILE_ACTIVE_FRAME_SLOT "ActiveFrameSlot"
-#define PROFILE_CREDITS "Credit"
-#define PROFILE_STORY_PROGRESS "StoryProgress"
-#define PROFILE_LAST_MISSION_ID "LastMissionID"
-#define PROFILE_MATERIAL "ResourceMaterial"
-#define PROFILE_QUARK_DATA "ResourceQuarkData"
-#define PROFILE_ACCOUNT "Account"

src/GameObjects/PropertyNames.h

@@ -1,5 +1,32 @@
 #pragma once
 
+// MassBuilderSaveTool
+// Copyright (C) 2021-2024 Guillaume Jacquemin
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+// Profile stuff
+#define PROFILE_NAME "CompanyName"
+#define PROFILE_ACTIVE_FRAME_SLOT "ActiveFrameSlot"
+#define PROFILE_CREDITS "Credit"
+#define PROFILE_STORY_PROGRESS "StoryProgress"
+#define PROFILE_LAST_MISSION_ID "LastMissionID"
+#define PROFILE_MATERIAL "ResourceMaterial"
+#define PROFILE_QUARK_DATA "ResourceQuarkData"
+#define PROFILE_ACCOUNT "Account"
+
+// Basic MASS stuff
 #define MASS_UNIT_DATA "UnitData"
 #define MASS_NAME "Name_45_A037C5D54E53456407BDF091344529BB"
 #define MASS_ACCOUNT "Account"