diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-05-10 02:34:21 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-05-10 02:45:04 +0300 |
| commit | 3dda658e4296c0b009f0670d6a9c6d2da2878569 (patch) | |
| tree | 42fd6704034e4ebb218a0b23a5fe727f58822a07 /src/vehicles | |
| parent | 1817727a66a8834b8291957ca8178ee36e7544a2 (diff) | |
Use some GetMatrix/SetMatrix logic based on SA
# Conflicts:
# src/control/Pickups.cpp
# src/control/RoadBlocks.cpp
# src/core/World.cpp
# src/entities/Entity.cpp
# src/objects/CutsceneHead.cpp
# src/objects/Object.cpp
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Plane.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp index 48f7b8c0..0b40ca7e 100644 --- a/src/vehicles/Plane.cpp +++ b/src/vehicles/Plane.cpp @@ -123,7 +123,7 @@ void CPlane::DeleteRwObject(void) { if(m_rwObject && RwObjectGetType(m_rwObject) == rpATOMIC){ - m_matrix.Detach(); + GetMatrix().Detach(); if(RwObjectGetType(m_rwObject) == rpATOMIC){ // useless check RwFrame *f = RpAtomicGetFrame((RpAtomic*)m_rwObject); RpAtomicDestroy((RpAtomic*)m_rwObject); @@ -567,13 +567,13 @@ CPlane::ProcessControl(void) m_rwObject = CModelInfo::GetModelInfo(mi->m_planeLodId)->CreateInstance(); POP_MEMID(); if(m_rwObject) - m_matrix.AttachRW(RwFrameGetMatrix(RpAtomicGetFrame((RpAtomic*)m_rwObject))); + GetMatrix().AttachRW(RwFrameGetMatrix(RpAtomicGetFrame((RpAtomic*)m_rwObject))); } } }else if(CStreaming::HasModelLoaded(GetModelIndex())){ if(m_rwObject && RwObjectGetType(m_rwObject) == rpATOMIC){ // Get rid of LOD model - m_matrix.Detach(); + GetMatrix().Detach(); if(m_rwObject){ // useless check if(RwObjectGetType(m_rwObject) == rpATOMIC){ // useless check RwFrame *f = RpAtomicGetFrame((RpAtomic*)m_rwObject); |