mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 12:39:27 -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_rafrel.cpp
+4 -3
View File
@@ -8,6 +8,7 @@
#include "d/actor/d_a_npc_rafrel.h"
#include "d/actor/d_a_npc.h"
#include "d/d_debug_viewer.h"
#include <cstring>
static daNpc_GetParam2 l_bckGetParamList[29] = {
{-1, 2, 0},
@@ -377,8 +378,8 @@ int daNpcRafrel_c::Draw() {
}
int daNpcRafrel_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int jnt_no = i_joint->getJntNo();
u16 jointNo = jnt_no;
J3DJoint* joint = i_joint;
int jnt_no = joint->getJntNo();
int spC[] = {1, 3, 4};
if (jnt_no == 0) {
@@ -420,7 +421,7 @@ int daNpcRafrel_c::createHeapCallBack(fopAc_ac_c* i_this) {
}
int daNpcRafrel_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == NULL) {
if (param_1 == 0) {
J3DModel* mdl_p = j3dSys.getModel();
daNpcRafrel_c* i_this = (daNpcRafrel_c*)mdl_p->getUserArea();