diff options
| author | aap <aap@papnet.eu> | 2020-05-20 19:55:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 19:55:05 +0200 |
| commit | 71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3 (patch) | |
| tree | bcdf3151eaab37430d9aeac886a55acbe7f65ccd /src/core | |
| parent | Merge remote-tracking branch 'origin/master' into miami (diff) | |
| parent | Fixes for melees and various things (diff) | |
| download | re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar.gz re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar.bz2 re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar.lz re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar.xz re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.tar.zst re3-71b9b2ecf97bdd7d6813a11ca2df2dafba89f4b3.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/World.cpp | 5 | ||||
| -rw-r--r-- | src/core/config.h | 2 |
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, |