mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 13:03:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 26-02-27-allocator-isolation

Browse Source
This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
parent 038ef4216f 3c6552dbd2
commit 3ffc3266d7
5530 changed files with 252979 additions and 26830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_kn.cpp
+4 -11
View File
@@ -14,6 +14,7 @@
#if DEBUG
#include "JSystem/JHostIO/JORFile.h"
#include "d/d_debug_viewer.h"
#include <cstring>
#endif
dCcD_SrcCyl daNpc_Kn_c::mCcDCyl = {
@@ -4964,7 +4965,7 @@ int daNpc_Kn_c::setPrtcl() {
mParticleMngr[i].mpModel == true ? &mParticleMngr[i].mAngle : NULL,
0, fopAcM_GetRoomNo(this), 0.0f, speedF);
if (mParticleMngr[i].mpModel != NULL) {
if (mParticleMngr[i].mpModel != false) {
emitter = mParticleMngr[i].mManager.getCenterEmitter(0, 0);
if (emitter != NULL) {
switch (i) {
@@ -4994,22 +4995,14 @@ int daNpc_Kn_c::setSlipPrtcl() {
mDoMtx_stack_c::multVecZero(&mParticleMngr[0].mPos);
mParticleMngr[0].mPos.y -= 20.0f;
mParticleMngr[0].mAngle = current.angle;
#if DEBUG
mParticleMngr[0].mAngle.y -= (s16) 0x8000;
#else
mParticleMngr[0].mAngle.y -= 0x8000;
#endif
ANGLE_SUB_2(mParticleMngr[0].mAngle.y, 0x8000);
mParticleMngr[0].mpModel = true;
mDoMtx_stack_c::copy(mpModelMorf[0]->getModel()->getAnmMtx(0x1b));
mDoMtx_stack_c::multVecZero(&mParticleMngr[1].mPos);
mParticleMngr[1].mPos.y -= 20.0f;
mParticleMngr[1].mAngle = current.angle;
#if DEBUG
mParticleMngr[1].mAngle.y -= (s16) 0x8000;
#else
mParticleMngr[1].mAngle.y -= 0x8000;
#endif
ANGLE_SUB_2(mParticleMngr[1].mAngle.y, 0x8000);
mParticleMngr[1].mpModel = true;
return 1;
}