summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-05-20 19:10:05 +0200
committereray orçunus <erayorcunus@gmail.com>2020-05-20 19:21:27 +0200
commit2ab3fb5dd02aad980718f1ac176f06f7b7e25f41 (patch)
tree974cd9b8b95fb9655621143932eca14154fe7df6 /src/core
parentMerge pull request #569 from aap/miami (diff)
downloadre3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar.gz
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar.bz2
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar.lz
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar.xz
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.tar.zst
re3-2ab3fb5dd02aad980718f1ac176f06f7b7e25f41.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/World.cpp5
-rw-r--r--src/core/config.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 16e5e80d..433f9745 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -1818,9 +1818,8 @@ CWorld::RepositionOneObject(CEntity *pEntity)
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)
+ modelId == MI_PARKBENCH || modelId == MI_BARRIER1 || IsTreeModel(modelId) ||
+ IsLightThatNeedsRepositioning(modelId)
) {
CVector &position = pEntity->GetMatrix().GetPosition();
CColModel *pColModel = pEntity->GetColModel();
diff --git a/src/core/config.h b/src/core/config.h
index 548092f7..105454fa 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -95,7 +95,7 @@ enum Config {
NUMPACMANPICKUPS = 256,
NUMEVENTS = 64,
- NUM_CARGENS = 160,
+ NUM_CARGENS = 185,
NUM_PATH_NODES_IN_AUTOPILOT = 8,