5 files changed, 96 insertions, 0 deletions

diff --git a/src/buildings/Building.cpp b/src/buildings/Building.cpp
new file mode 100644
index 00000000..8035cf25
--- /dev/null
+++ b/src/buildings/Building.cpp
@@ -0,0 +1,44 @@
+#include "common.h"
+
+#include "Building.h"
+#include "Streaming.h"
+#include "Pools.h"
+
+void *CBuilding::operator new(size_t sz) { return CPools::GetBuildingPool()->New();  }
+void CBuilding::operator delete(void *p, size_t sz) { CPools::GetBuildingPool()->Delete((CBuilding*)p); }
+
+void
+CBuilding::ReplaceWithNewModel(int32 id)
+{
+	DeleteRwObject();
+
+	if (CModelInfo::GetModelInfo(m_modelIndex)->GetNumRefs() == 0)
+		CStreaming::RemoveModel(m_modelIndex);
+	m_modelIndex = id;
+
+	if(bIsBIGBuilding)
+		if(m_level == LEVEL_GENERIC || m_level == CGame::currLevel)
+			CStreaming::RequestModel(id, STREAMFLAGS_DONT_REMOVE);
+}
+
+bool
+IsBuildingPointerValid(CBuilding* pBuilding)
+{
+	if (!pBuilding)
+		return false;
+	if (pBuilding->GetIsATreadable()) {
+		int index = CPools::GetTreadablePool()->GetJustIndex_NoFreeAssert((CTreadable*)pBuilding);
+#ifdef FIX_BUGS
+		return index >= 0 && index < CPools::GetTreadablePool()->GetSize();
+#else
+		return index >= 0 && index <= CPools::GetTreadablePool()->GetSize();
+#endif
+	} else {
+		int index = CPools::GetBuildingPool()->GetJustIndex_NoFreeAssert(pBuilding);
+#ifdef FIX_BUGS
+		return index >= 0 && index < CPools::GetBuildingPool()->GetSize();
+#else
+		return index >= 0 && index <= CPools::GetBuildingPool()->GetSize();
+#endif
+	}
+}
diff --git a/src/buildings/Building.h b/src/buildings/Building.h
new file mode 100644
index 00000000..2c2dfb1f
--- /dev/null
+++ b/src/buildings/Building.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "Entity.h"
+
+class CBuilding : public CEntity
+{
+public:
+	CBuilding(void) {
+		m_type = ENTITY_TYPE_BUILDING;
+		bUsesCollision = true;
+	}
+	static void *operator new(size_t);
+	static void operator delete(void*, size_t);
+
+	void ReplaceWithNewModel(int32 id);
+
+	virtual bool GetIsATreadable(void) { return false; }
+};
+
+bool IsBuildingPointerValid(CBuilding*);
diff --git a/src/buildings/Solid.h b/src/buildings/Solid.h
new file mode 100644
index 00000000..4ca800c2
--- /dev/null
+++ b/src/buildings/Solid.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "Entity.h"
+
+class CSolid : public CEntity
+{
+public:
+	CSolid(void) {
+		m_type = ENTITY_TYPE_BUILDING;
+		bUsesCollision = true;
+	}
+};
\ No newline at end of file
diff --git a/src/buildings/Treadable.cpp b/src/buildings/Treadable.cpp
new file mode 100644
index 00000000..00abbe13
--- /dev/null
+++ b/src/buildings/Treadable.cpp
@@ -0,0 +1,8 @@
+#include "common.h"
+
+#include "rpworld.h"
+#include "Treadable.h"
+#include "Pools.h"
+
+void *CTreadable::operator new(size_t sz) { return CPools::GetTreadablePool()->New();  }
+void CTreadable::operator delete(void *p, size_t sz) { CPools::GetTreadablePool()->Delete((CTreadable*)p); }
diff --git a/src/buildings/Treadable.h b/src/buildings/Treadable.h
new file mode 100644
index 00000000..c3ab755e
--- /dev/null
+++ b/src/buildings/Treadable.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "Building.h"
+
+class CTreadable : public CBuilding
+{
+public:
+	static void *operator new(size_t);
+	static void operator delete(void*, size_t);
+
+	bool GetIsATreadable(void) { return true; }
+};