summaryrefslogtreecommitdiffstats
path: root/src/core/FileLoader.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-12-18 13:58:59 +0100
committeraap <aap@papnet.eu>2020-12-18 13:58:59 +0100
commita080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334 (patch)
tree078abe2791a1be02b3c366518293f04686f49a27 /src/core/FileLoader.cpp
parentPlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes (diff)
downloadre3-a080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334.tar
re3-a080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334.tar.gz
re3-a080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334.tar.bz2
re3-a080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334.tar.lz
re3-a080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334.tar.xz
re3-a080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334.tar.zst
re3-a080fbfbd41ac8a2bc6cfe053d4fa0932dd8d334.zip
Diffstat (limited to 'src/core/FileLoader.cpp')
-rw-r--r--src/core/FileLoader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index b9d475b8..0ad03f61 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -1065,7 +1065,7 @@ CFileLoader::LoadMLOInstance(int id, const char *line)
&rot.x, &rot.y, &rot.z,
&angle);
float rad = Acos(angle) * 2.0f;
- CInstance *inst = CModelInfo::GetMloInstanceStore().alloc();
+ CInstance *inst = CModelInfo::GetMloInstanceStore().Alloc();
minfo->lastInstance++;
RwMatrix *matrix = RwMatrixCreate();
@@ -1305,7 +1305,7 @@ CFileLoader::Load2dEffect(const char *line)
CTxdStore::SetCurrentTxd(CTxdStore::FindTxdSlot("particle"));
mi = CModelInfo::GetModelInfo(id);
- effect = CModelInfo::Get2dEffectStore().alloc();
+ effect = CModelInfo::Get2dEffectStore().Alloc();
mi->Add2dEffect(effect);
effect->pos = CVector(x, y, z);
effect->col = CRGBA(r, g, b, a);