diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-05-04 13:50:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-04 13:50:55 -0400 |
| commit | def3445cc69b874cdde54aaa082d6cceec5d42fc (patch) | |
| tree | 82f65a62f5391221bb569d191a13697964ab25b1 /src/d/actor/d_a_npc_os.cpp | |
| parent | 6bc01f1d02376ef07145899cbf6988453f67b10c (diff) | |
Fix particle_set inlines (#971)
Diffstat (limited to 'src/d/actor/d_a_npc_os.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_os.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index db25d2eb..00ff1f26 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -2132,7 +2132,9 @@ BOOL daNpc_Os_c::execute() { static JGeometry::TVec3<f32> splash_scale(0.6f, 0.6f, 0.6f); static JGeometry::TVec3<f32> ripple_scale(1.0f, 1.0f, 1.0f); +#if VERSION > VERSION_DEMO field_0x784 &= ~0x10; +#endif fopAcM_OffStatus(this, fopAcStts_SHOWMAP_e); checkPlayerRoom(); if(!finishCheck()) { @@ -2166,7 +2168,14 @@ BOOL daNpc_Os_c::execute() { mAcchCir[1].SetWallR(40.0f); } +#if VERSION == VERSION_DEMO + if (mpPedestal == NULL) { + mpPedestal = (daPedestal::daPds_c*)searchFromName(l_daiza_name[argument], 0xFF, 1); + } +#else mpPedestal = (daPedestal::daPds_c*)searchFromName(l_daiza_name[argument], 0xFF, 1); +#endif + if(mpPedestal) { if(!isFinish()) { if(finishCheck()) { @@ -2190,7 +2199,9 @@ BOOL daNpc_Os_c::execute() { mAcch.CrrPos(*dComIfG_Bgsp()); +#if VERSION > VERSION_DEMO field_0x784 |= 0x10; +#endif if(mAcch.GetGroundH() != -G_CM3D_F_INF) { tevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd); tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd); @@ -2254,7 +2265,9 @@ BOOL daNpc_Os_c::execute() { mAcch.CrrPos(*dComIfG_Bgsp()); +#if VERSION > VERSION_DEMO field_0x784 |= 0x10; +#endif if(chkPlayerAction(&daNpc_Os_c::walkPlayerAction) || chkNpcAction(&daNpc_Os_c::searchNpcAction)) { if(!mAcch.ChkGroundHit()) { @@ -2326,6 +2339,7 @@ BOOL daNpc_Os_c::execute() { } } } +#if VERSION > VERSION_DEMO else { mAcch.CrrPos(*dComIfG_Bgsp()); @@ -2335,6 +2349,7 @@ BOOL daNpc_Os_c::execute() { tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd); } } +#endif if(!fopAcM_checkCarryNow(this)) { setCollision(); |