summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-12-20 11:39:44 +0100
committerSergeanur <s.anureev@yandex.ua>2020-12-20 11:39:44 +0100
commitaffd3c6baa9505328a804263434b14ee0aba1b3f (patch)
tree8c2bbbfd0d6e1c02740532662b93d99284f463b1 /src/entities
parentfixes to last HUD commits (diff)
downloadre3-affd3c6baa9505328a804263434b14ee0aba1b3f.tar
re3-affd3c6baa9505328a804263434b14ee0aba1b3f.tar.gz
re3-affd3c6baa9505328a804263434b14ee0aba1b3f.tar.bz2
re3-affd3c6baa9505328a804263434b14ee0aba1b3f.tar.lz
re3-affd3c6baa9505328a804263434b14ee0aba1b3f.tar.xz
re3-affd3c6baa9505328a804263434b14ee0aba1b3f.tar.zst
re3-affd3c6baa9505328a804263434b14ee0aba1b3f.zip
Diffstat (limited to 'src/entities')
-rw-r--r--src/entities/Building.cpp22
-rw-r--r--src/entities/Building.h21
-rw-r--r--src/entities/Solid.h12
-rw-r--r--src/entities/Treadable.cpp8
-rw-r--r--src/entities/Treadable.h17
5 files changed, 0 insertions, 80 deletions
diff --git a/src/entities/Building.cpp b/src/entities/Building.cpp
deleted file mode 100644
index 00bbb21e..00000000
--- a/src/entities/Building.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#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);
-}
diff --git a/src/entities/Building.h b/src/entities/Building.h
deleted file mode 100644
index 3586a8dc..00000000
--- a/src/entities/Building.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#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; }
-};
-
-VALIDATE_SIZE(CBuilding, 0x64);
-
diff --git a/src/entities/Solid.h b/src/entities/Solid.h
deleted file mode 100644
index 4ca800c2..00000000
--- a/src/entities/Solid.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#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/entities/Treadable.cpp b/src/entities/Treadable.cpp
deleted file mode 100644
index 00abbe13..00000000
--- a/src/entities/Treadable.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#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/entities/Treadable.h b/src/entities/Treadable.h
deleted file mode 100644
index c3160f47..00000000
--- a/src/entities/Treadable.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "Building.h"
-
-class CTreadable : public CBuilding
-{
-public:
- static void *operator new(size_t);
- static void operator delete(void*, size_t);
-
- int16 m_nodeIndices[2][12]; // first car, then ped
-
- bool GetIsATreadable(void) { return true; }
-};
-
-VALIDATE_SIZE(CTreadable, 0x94);
-