Split Residence implementation to source file

OutpostUniverse · Feb 11, 2025 · f7ec864 · f7ec864
1 parent d9f29e5
commit f7ec864
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 80 deletions.
diff --git a/appOPHD/MapObjects/Structures/Residence.cpp b/appOPHD/MapObjects/Structures/Residence.cpp
@@ -0,0 +1,89 @@
+#include "Residence.h"
+
+#include "../../Constants/Strings.h"
+
+#include <algorithm>
+
+
+namespace
+{
+	const int ResidentialWasteCapacityBase = 1000;
+	const int ResidentialColonistCapacityBase = 25;
+}
+
+
+Residence::Residence() : Structure(
+	StructureClass::Residence,
+	StructureID::SID_RESIDENCE)
+{
+}
+
+
+int Residence::capacity() const { return ResidentialColonistCapacityBase; }
+
+int Residence::wasteCapacity() const { return ResidentialWasteCapacityBase; }
+
+int Residence::wasteAccumulated() const { return mWasteAccumulated; }
+void Residence::wasteAccumulated(int amount) { mWasteAccumulated = amount; }
+
+int Residence::wasteOverflow() const { return mWasteOverflow; }
+void Residence::wasteOverflow(int amount) { mWasteOverflow = amount; }
+
+
+int Residence::pullWaste(int amount)
+{
+	const int pulledAmount = std::clamp(amount, 0, wasteAccumulated() + wasteOverflow());
+
+	const int pulledOverflow = std::clamp(pulledAmount, 0, wasteOverflow());
+	mWasteOverflow -= pulledOverflow;
+
+	if (pulledOverflow < amount)
+	{
+		mWasteAccumulated -= pulledAmount - pulledOverflow;
+	}
+
+	return pulledAmount;
+}
+
+
+void Residence::assignColonists(int amount)
+{
+	mAssignedColonists = std::clamp(amount, 0, capacity());
+}
+
+
+int Residence::assignedColonists() const { return mAssignedColonists; }
+
+
+StringTable Residence::createInspectorViewTable()
+{
+	StringTable stringTable(2, 6);
+
+	stringTable[{0, 0}].text = "Colonist Capacity:";
+	stringTable[{1, 0}].text = std::to_string(capacity());
+
+	stringTable[{0, 1}].text = "Colonists Assigned:";
+	stringTable[{1, 1}].text = std::to_string(assignedColonists());
+
+	stringTable[{0, 3}].text = "Waste Capacity:";
+	stringTable[{1, 3}].text = std::to_string(wasteCapacity());
+
+	stringTable[{0, 4}].text = "Waste Accumulated:";
+	stringTable[{1, 4}].text = std::to_string(wasteAccumulated());
+
+	stringTable[{0, 5}].text = "Waste Overflow:";
+	stringTable[{1, 5}].text = std::to_string(wasteOverflow());
+
+	return stringTable;
+}
+
+
+void Residence::think()
+{
+	mWasteAccumulated += mAssignedColonists;
+	if (mWasteAccumulated > wasteCapacity())
+	{
+		mWasteOverflow += mWasteAccumulated - wasteCapacity();
+		mWasteAccumulated = wasteCapacity();
+	}
+}
diff --git a/appOPHD/MapObjects/Structures/Residence.h b/appOPHD/MapObjects/Structures/Residence.h
@@ -2,14 +2,6 @@
 
 #include "../Structure.h"
 
-#include "../../Constants/Strings.h"
-
-#include <algorithm>
-
-
-const int ResidentialWasteCapacityBase = 1000;
-const int ResidentialColonistCapacityBase = 25;
-
 
 /**
  * Base Residential structure.
@@ -20,83 +12,23 @@ const int ResidentialColonistCapacityBase = 25;
 class Residence : public Structure
 {
 public:
-	Residence() : Structure(
-		StructureClass::Residence,
-		StructureID::SID_RESIDENCE)
-	{
-	}
-
-
-	int capacity() const { return ResidentialColonistCapacityBase; }
-
-	int wasteCapacity() const { return ResidentialWasteCapacityBase; }
-
-	int wasteAccumulated() const { return mWasteAccumulated; }
-	void wasteAccumulated(int amount) { mWasteAccumulated = amount; }
-
-	int wasteOverflow() const { return mWasteOverflow; }
-	void wasteOverflow(int amount) { mWasteOverflow = amount; }
-
-
-	int pullWaste(int amount)
-	{
-		const int pulledAmount = std::clamp(amount, 0, wasteAccumulated() + wasteOverflow());
-
-		const int pulledOverflow = std::clamp(pulledAmount, 0, wasteOverflow());
-		mWasteOverflow -= pulledOverflow;
-
-		if (pulledOverflow < amount)
-		{
-			mWasteAccumulated -= pulledAmount - pulledOverflow;
-		}
+	Residence();
 
-		return pulledAmount;
-	}
+	int capacity() const;
+	int wasteCapacity() const;
+	int wasteAccumulated() const;
+	void wasteAccumulated(int amount);
+	int wasteOverflow() const;
+	void wasteOverflow(int amount);
+	int pullWaste(int amount);
 
+	void assignColonists(int amount);
+	int assignedColonists() const;
 
-	void assignColonists(int amount)
-	{
-		mAssignedColonists = std::clamp(amount, 0, capacity());
-	}
-
-
-	int assignedColonists() const { return mAssignedColonists; }
-
-
-	StringTable createInspectorViewTable() override
-	{
-		StringTable stringTable(2, 6);
-
-		stringTable[{0, 0}].text = "Colonist Capacity:";
-		stringTable[{1, 0}].text = std::to_string(capacity());
-
-		stringTable[{0, 1}].text = "Colonists Assigned:";
-		stringTable[{1, 1}].text = std::to_string(assignedColonists());
-
-		stringTable[{0, 3}].text = "Waste Capacity:";
-		stringTable[{1, 3}].text = std::to_string(wasteCapacity());
-
-		stringTable[{0, 4}].text = "Waste Accumulated:";
-		stringTable[{1, 4}].text = std::to_string(wasteAccumulated());
-
-		stringTable[{0, 5}].text = "Waste Overflow:";
-		stringTable[{1, 5}].text = std::to_string(wasteOverflow());
-
-		return stringTable;
-	}
-
+	StringTable createInspectorViewTable() override;
 
 protected:
-	void think() override
-	{
-		mWasteAccumulated += mAssignedColonists;
-		if (mWasteAccumulated > wasteCapacity())
-		{
-			mWasteOverflow += mWasteAccumulated - wasteCapacity();
-			mWasteAccumulated = wasteCapacity();
-		}
-	}
-
+	void think() override;
 
 protected:
 	int mWasteAccumulated = 0;

diff --git a/appOPHD/appOPHD.vcxproj b/appOPHD/appOPHD.vcxproj
@@ -202,6 +202,7 @@
     <ClCompile Include="MapObjects\Structures\MineFacility.cpp" />
     <ClCompile Include="MapObjects\Structures\OreRefining.cpp" />
     <ClCompile Include="MapObjects\Structures\ResearchFacility.cpp" />
+    <ClCompile Include="MapObjects\Structures\Residence.cpp" />
     <ClCompile Include="MapObjects\Structures\SolarPanelArray.cpp" />
     <ClCompile Include="MapObjects\Structures\SolarPlant.cpp" />
     <ClCompile Include="MapObjects\Structures\StorageTanks.cpp" />

diff --git a/appOPHD/appOPHD.vcxproj.filters b/appOPHD/appOPHD.vcxproj.filters
@@ -129,6 +129,9 @@
     <ClCompile Include="MapObjects\Structures\ResearchFacility.cpp">
       <Filter>Source Files\MapObjects\Structures</Filter>
     </ClCompile>
+    <ClCompile Include="MapObjects\Structures\Residence.cpp">
+      <Filter>Source Files\MapObjects\Structures</Filter>
+    </ClCompile>
     <ClCompile Include="MapObjects\Structures\SolarPanelArray.cpp">
       <Filter>Source Files\MapObjects\Structures</Filter>
     </ClCompile>