mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-27 23:45:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/TakaRikka/dusk

Browse Source
This commit is contained in:
TakaRikka
2026-04-02 21:11:03 -07:00
parent 5e5e72ca1b 507ba41a26
commit 806bef466c
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_grz.cpp
+9 -1
View File
@@ -1363,7 +1363,15 @@ void daNpc_Grz_c::playExpression() {
daNpcF_anmPlayData dat7 = {ANM_LIEDOWN, mpHIO->m.common.morf_frame, 0};
daNpcF_anmPlayData* pDat7[1] = {&dat7};
daNpcF_anmPlayData dat8 = {ANM_GETUP, mpHIO->m.common.morf_frame, 1};
daNpcF_anmPlayData* pDat8[1] = {&dat8};
#if TARGET_PC
// BUG: If mNumLoops is non-zero, the data array MUST be null-terminated to prevent
// playExpression from reading junk when it increments the index.
// For some reason this doesn't crash on hardware, but it triggers a segfault on PC
// when first talking to Fyrus after defating him.
daNpcF_anmPlayData* pDat8[2] = {&dat8, NULL};
#else
daNpcF_anmPlayData* pDat8[2] = {&dat8};
#endif
daNpcF_anmPlayData dat9 = {ANM_F_WEAK_WAIT, mpHIO->m.common.morf_frame, 0};
daNpcF_anmPlayData* pDat9[1] = {&dat9};
daNpcF_anmPlayData dat10 = {ANM_NONE, mpHIO->m.common.morf_frame, 0};
src/d/actor/d_a_npc_tks.cpp
+5 -3
View File
@@ -824,9 +824,11 @@ void daNpcTks_c::playMotion() {
daNpcF_anmPlayData dat4b = {ANM_FLY, 0.0f, 0};
daNpcF_anmPlayData* pDat4[2] = {&dat4a, &dat4b};
#if TARGET_PC
// Note: this fixes a crash in the cutscene after entering city and likely needs to be revisited as its
// unclear why this was 1 in the first place and unclear why this fixes it
#if TARGET_PC
// BUG: If mNumLoops is non-zero, the data array MUST be null-terminated to prevent
// playExpression from reading junk when it increments the index.
// For some reason this doesn't crash on hardware, but it triggers a segfault on PC
// in the cutscene after entering city.
daNpcF_anmPlayData dat5 = {ANM_JUMP_E, 0.0f, 0};
#else
daNpcF_anmPlayData dat5 = {ANM_JUMP_E, 0.0f, 1};