summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-28 18:52:44 +0100
committerGitHub <noreply@github.com>2020-11-28 18:52:44 +0100
commitc57fee38caed4cc770aa8e57b74672ca85aa0fa3 (patch)
treed9b0a02ad6c0d81fc78b9c8f0bbb018189d92d39 /src/vehicles
parentMake texture conversion work a bit faster (diff)
parentmoved some stuff to MemoryMgr (diff)
downloadre3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar
re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar.gz
re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar.bz2
re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar.lz
re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar.xz
re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.tar.zst
re3-c57fee38caed4cc770aa8e57b74672ca85aa0fa3.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Plane.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp
index 1a6f1a88..532be938 100644
--- a/src/vehicles/Plane.cpp
+++ b/src/vehicles/Plane.cpp
@@ -15,6 +15,7 @@
#include "World.h"
#include "HandlingMgr.h"
#include "Plane.h"
+#include "MemoryHeap.h"
CPlaneNode *pPathNodes;
CPlaneNode *pPath2Nodes;
@@ -551,9 +552,11 @@ CPlane::ProcessControl(void)
if(m_rwObject && RwObjectGetType(m_rwObject) == rpCLUMP){
DeleteRwObject();
if(mi->m_planeLodId != -1){
+ PUSH_MEMID(MEMID_WORLD);
m_rwObject = CModelInfo::GetModelInfo(mi->m_planeLodId)->CreateInstance();
+ POP_MEMID();
if(m_rwObject)
- m_matrix.Attach(RwFrameGetMatrix(RpAtomicGetFrame((RpAtomic*)m_rwObject)));
+ m_matrix.AttachRW(RwFrameGetMatrix(RpAtomicGetFrame((RpAtomic*)m_rwObject)));
}
}
}else if(CStreaming::HasModelLoaded(GetModelIndex())){