summaryrefslogtreecommitdiff
path: root/src/d/d_throwstone.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2023-10-16 04:42:11 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2023-10-16 04:42:11 -0400
commit0e82b07cf2ef257d80fc5549100fbadb88d6c0a6 (patch)
tree767824a8c9375e36d643e723a45175244f670a57 /src/d/d_throwstone.cpp
parentd2a941d15ffa83c01ecb38ae1e32f1b2e6db6219 (diff)
d_throwstone match
Diffstat (limited to 'src/d/d_throwstone.cpp')
-rw-r--r--src/d/d_throwstone.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp
index 0a6c7c94..81e43fac 100644
--- a/src/d/d_throwstone.cpp
+++ b/src/d/d_throwstone.cpp
@@ -29,7 +29,7 @@ public:
const char daThrowstone_c::M_arcname[] = "Aisi";
/* 8023B544-8023B564 .text CheckCreateHeap__FP10fopAc_ac_c */
-s32 CheckCreateHeap(fopAc_ac_c* i_actor) {
+static s32 CheckCreateHeap(fopAc_ac_c* i_actor) {
daThrowstone_c* i_this = (daThrowstone_c*)i_actor;
return i_this->CreateHeap();
}
@@ -86,8 +86,10 @@ BOOL daThrowstone_c::_execute() {
dDemo_setDemoData(this, 0x6a, NULL, NULL, 0, NULL, 0, 0);
mpModel->setBaseScale(mScale);
- mDoMtx_stack_c::transS(getPosition());
- mDoMtx_stack_c::ZXYrotM(shape_angle);
+ f32 pos_x = current.pos.x;
+ mDoMtx_stack_c::transS(pos_x, current.pos.y, current.pos.z);
+ s16 rot_x = shape_angle.x;
+ mDoMtx_stack_c::ZXYrotM(rot_x, shape_angle.y, shape_angle.z);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);