summaryrefslogtreecommitdiffstats
path: root/src/entities/Entity.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-04 19:03:31 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-04 19:03:31 +0100
commit601f77b5c818d870146d829137e83a62cc7b36b9 (patch)
treebe3094ffee8685eef15e969f93fc60acb45d8be0 /src/entities/Entity.cpp
parentfix (diff)
parentDouble the volume for mission audio in OAL + small fix (diff)
downloadre3-601f77b5c818d870146d829137e83a62cc7b36b9.tar
re3-601f77b5c818d870146d829137e83a62cc7b36b9.tar.gz
re3-601f77b5c818d870146d829137e83a62cc7b36b9.tar.bz2
re3-601f77b5c818d870146d829137e83a62cc7b36b9.tar.lz
re3-601f77b5c818d870146d829137e83a62cc7b36b9.tar.xz
re3-601f77b5c818d870146d829137e83a62cc7b36b9.tar.zst
re3-601f77b5c818d870146d829137e83a62cc7b36b9.zip
Diffstat (limited to 'src/entities/Entity.cpp')
-rw-r--r--src/entities/Entity.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 9b6be5f6..c252735e 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -126,6 +126,7 @@ CEntity::CreateRwObject(void)
m_matrix.AttachRW(RwFrameGetMatrix(RpAtomicGetFrame((RpAtomic*)m_rwObject)), false);
else if(RwObjectGetType(m_rwObject) == rpCLUMP)
m_matrix.AttachRW(RwFrameGetMatrix(RpClumpGetFrame((RpClump*)m_rwObject)), false);
+
mi->AddRef();
}
}
@@ -139,6 +140,7 @@ CEntity::AttachToRwObject(RwObject *obj)
m_matrix.Attach(RwFrameGetMatrix(RpAtomicGetFrame((RpAtomic*)m_rwObject)), false);
else if(RwObjectGetType(m_rwObject) == rpCLUMP)
m_matrix.Attach(RwFrameGetMatrix(RpClumpGetFrame((RpClump*)m_rwObject)), false);
+
CModelInfo::GetModelInfo(m_modelIndex)->AddRef();
}
}
@@ -239,12 +241,8 @@ CEntity::GetBoundRadius(void)
void
CEntity::UpdateRwFrame(void)
{
- if(m_rwObject){
- if(RwObjectGetType(m_rwObject) == rpATOMIC)
- RwFrameUpdateObjects(RpAtomicGetFrame((RpAtomic*)m_rwObject));
- else if(RwObjectGetType(m_rwObject) == rpCLUMP)
- RwFrameUpdateObjects(RpClumpGetFrame((RpClump*)m_rwObject));
- }
+ if(m_rwObject)
+ RwFrameUpdateObjects(rwObjectGetParent(m_rwObject));
}
void