diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2026-10-19 13:14:40 -0400 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2026-10-19 13:14:40 -0400 |
| commit | f8ad5b8923d52d670fa2135d18a87d9323fdae7b (patch) | |
| tree | caca8b2aeaeff7417efae607d68ad94372f23e7f /src | |
| parent | ffe45f52ac6f4e1bccf0ed306c2d870e5fdee9cb (diff) | |
merge fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/REL/d/a/obj/d_a_obj_control_panel.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/REL/d/a/obj/d_a_obj_control_panel.cpp b/src/REL/d/a/obj/d_a_obj_control_panel.cpp index a6a0457d..dc7b09c5 100644 --- a/src/REL/d/a/obj/d_a_obj_control_panel.cpp +++ b/src/REL/d/a/obj/d_a_obj_control_panel.cpp @@ -1,13 +1,11 @@ #include "d/a/obj/d_a_obj_control_panel.h" -#include "c/c_lib.h" #include "common.h" #include "d/a/d_a_itembase.h" #include "d/a/d_a_player.h" #include "d/a/obj/d_a_obj_D3_dummy.h" #include "d/a/obj/d_a_obj_base.h" #include "d/col/bg/d_bg_s.h" -#include "d/d_base.h" #include "d/d_camera.h" #include "d/d_cs_game.h" #include "d/d_pad.h" @@ -120,8 +118,8 @@ bool dAcOCtrlPnl_c::createHeap() { int dAcOCtrlPnl_c::actorCreate() { CREATE_ALLOCATOR_SIZE(dAcOCtrlPnl_c, 0x8000); dBgS::GetInstance()->Regist(&mBgW, this); - mAcceleration = 0.f; - mMaxSpeed = 0.f; + mGravity = 0.f; + mMaxFallSpeed = 0.f; mBoundingBox.Set(mVec3_c(-200.f, -0.f, -200.f), mVec3_c(200.f, 200.f, 200.f)); updatePuzzleFromFile(); updateTilePositions(); @@ -197,7 +195,7 @@ int dAcOCtrlPnl_c::actorExecute() { } int dAcOCtrlPnl_c::draw() { - drawModelType1(&mModel); + drawModel(&mModel); return SUCCEEDED; } |