diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-06 14:45:13 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-06 14:45:13 +0200 |
| commit | 88076a005010fe67c029e55ba9819ed3c484fdbb (patch) | |
| tree | 2fb4cc3d58f8a32a81b8228c786da6365d39b7f5 /src | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| parent | setting some areas so objects dont disappear (diff) | |
| download | re3-88076a005010fe67c029e55ba9819ed3c484fdbb.tar re3-88076a005010fe67c029e55ba9819ed3c484fdbb.tar.gz re3-88076a005010fe67c029e55ba9819ed3c484fdbb.tar.bz2 re3-88076a005010fe67c029e55ba9819ed3c484fdbb.tar.lz re3-88076a005010fe67c029e55ba9819ed3c484fdbb.tar.xz re3-88076a005010fe67c029e55ba9819ed3c484fdbb.tar.zst re3-88076a005010fe67c029e55ba9819ed3c484fdbb.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/entities/Entity.cpp | 1 | ||||
| -rw-r--r-- | src/objects/DummyObject.cpp | 1 | ||||
| -rw-r--r-- | src/objects/Object.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 5427665a..e3ecf50f 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -79,6 +79,7 @@ CEntity::CEntity(void) m_scanCode = 0; m_modelIndex = -1; m_rwObject = nil; + m_area = AREA_MAIN_MAP; m_randomSeed = CGeneral::GetRandomNumber(); m_pFirstReference = nil; } diff --git a/src/objects/DummyObject.cpp b/src/objects/DummyObject.cpp index d5805073..8dd1643d 100644 --- a/src/objects/DummyObject.cpp +++ b/src/objects/DummyObject.cpp @@ -10,4 +10,5 @@ CDummyObject::CDummyObject(CObject *obj) AttachToRwObject(obj->m_rwObject); obj->DetachFromRwObject(); m_level = obj->m_level; + m_area = obj->m_area; } diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index ab1290b0..fb1ab1a7 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -68,6 +68,7 @@ CObject::CObject(CDummyObject *dummy) dummy->DetachFromRwObject(); Init(); m_level = dummy->m_level; + m_area = dummy->m_area; } CObject::~CObject(void) |