a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 03:00:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/miami' into miami

Browse source
This commit is contained in:
Nikolay Korolev 2020-05-06 15:45:13 +03:00
parent 4d06271a29 25a4091fa8
commit 88076a0050
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/entities/Entity.cpp
View file

@ -79,6 +79,7 @@ CEntity::CEntity(void)
m_scanCode = 0; m_scanCode = 0;
m_modelIndex = -1; m_modelIndex = -1;
m_rwObject = nil; m_rwObject = nil;
m_area = AREA_MAIN_MAP;
m_randomSeed = CGeneral::GetRandomNumber(); m_randomSeed = CGeneral::GetRandomNumber();
m_pFirstReference = nil; m_pFirstReference = nil;
} }

1
src/objects/DummyObject.cpp
View file

@ -10,4 +10,5 @@ CDummyObject::CDummyObject(CObject *obj)
AttachToRwObject(obj->m_rwObject); AttachToRwObject(obj->m_rwObject);
obj->DetachFromRwObject(); obj->DetachFromRwObject();
m_level = obj->m_level; m_level = obj->m_level;
m_area = obj->m_area;
} }

1
src/objects/Object.cpp
View file

@ -68,6 +68,7 @@ CObject::CObject(CDummyObject *dummy)
dummy->DetachFromRwObject(); dummy->DetachFromRwObject();
Init(); Init();
m_level = dummy->m_level; m_level = dummy->m_level;
m_area = dummy->m_area;
} }
CObject::~CObject(void) CObject::~CObject(void)