summaryrefslogtreecommitdiffstats
path: root/src/core/World.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-20 12:41:12 +0200
committerGitHub <noreply@github.com>2020-05-20 12:41:12 +0200
commitfd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b (patch)
treeb32e29a80a2bb4c4692ed6dccef9b8c5e7f81185 /src/core/World.cpp
parentMerge pull request #568 from Nick007J/miami (diff)
parentCEntity and friends (diff)
downloadre3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar
re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.gz
re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.bz2
re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.lz
re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.xz
re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.zst
re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.zip
Diffstat (limited to '')
-rw-r--r--src/core/World.cpp24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index f6817f8b..16e5e80d 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -1813,18 +1813,22 @@ void
CWorld::RepositionOneObject(CEntity *pEntity)
{
int16 modelId = pEntity->GetModelIndex();
- if (IsTrafficLight(modelId) || IsTreeModel(modelId) || modelId == MI_PARKINGMETER ||
- modelId == MI_PHONEBOOTH1 || modelId == MI_WASTEBIN || modelId == MI_BIN || modelId == MI_POSTBOX1 ||
- modelId == MI_NEWSSTAND || modelId == MI_TRAFFICCONE || modelId == MI_DUMP1 ||
- modelId == MI_ROADWORKBARRIER1 || modelId == MI_BUSSIGN1 || modelId == MI_NOPARKINGSIGN1 ||
- modelId == MI_PHONESIGN || modelId == MI_TAXISIGN || modelId == MI_FISHSTALL01 ||
- modelId == MI_FISHSTALL02 || modelId == MI_FISHSTALL03 || modelId == MI_FISHSTALL04 ||
- modelId == MI_BAGELSTAND2 || modelId == MI_FIRE_HYDRANT || modelId == MI_BOLLARDLIGHT ||
- modelId == MI_PARKTABLE) {
+ if (modelId == MI_PARKINGMETER || modelId == MI_PHONEBOOTH1 || modelId == MI_WASTEBIN ||
+ modelId == MI_BIN || modelId == MI_POSTBOX1 || modelId == MI_NEWSSTAND || modelId == MI_TRAFFICCONE ||
+ modelId == MI_DUMP1 || modelId == MI_ROADWORKBARRIER1 || modelId == MI_BUSSIGN1 || modelId == MI_NOPARKINGSIGN1 ||
+ modelId == MI_PHONESIGN || modelId == MI_FIRE_HYDRANT || modelId == MI_BOLLARDLIGHT ||
+ modelId == MI_PARKTABLE || modelId == MI_PARKINGMETER2 || modelId == MI_TELPOLE02 ||
+ modelId == MI_PARKBENCH || modelId == MI_BARRIER1 || IsTreeModel(modelId)
+// TODO(MIAMI): this is actually a different case
+|| IsStreetLight(modelId)
+ ) {
CVector &position = pEntity->GetMatrix().GetPosition();
- float fBoundingBoxMinZ = pEntity->GetColModel()->boundingBox.min.z;
+ CColModel *pColModel = pEntity->GetColModel();
+ float fBoundingBoxMinZ = pColModel->boundingBox.min.z;
+ float fHeight = pColModel->boundingBox.max.z - pColModel->boundingBox.min.z;
+ if(fHeight < OBJECT_REPOSITION_OFFSET_Z) fHeight = OBJECT_REPOSITION_OFFSET_Z;
position.z = CWorld::FindGroundZFor3DCoord(position.x, position.y,
- position.z + OBJECT_REPOSITION_OFFSET_Z, nil) -
+ position.z + fHeight, nil) -
fBoundingBoxMinZ;
pEntity->m_matrix.UpdateRW();
pEntity->UpdateRwFrame();