mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-25 18:04:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc fixes (#2860)

Browse Source 
* Misc matches

* Remove more old dol2asm stuff

* Remove dCcS::SetMass-related fakematches

No longer necessary with the PCH for some reason.

* Use attention types enum in more places

* Remove more dol2asm stuff

* Clean up matDL_dis.py
This commit is contained in:
LagoLunatic
2025-11-25 11:32:34 -05:00
committed by GitHub
parent cd3d634133
commit 2f2f37a734
156 changed files with 209 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc.cpp
+2 -2
View File
@@ -2715,7 +2715,7 @@ BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_actor_p) {
for (int i = 0; i < dComIfGp_getAttention()->GetActionCount(); i++) {
if (dComIfGp_getAttention()->ActionTarget(i) == i_actor_p &&
dComIfGp_getAttention()->getActionBtnB() != NULL &&
dComIfGp_getAttention()->getActionBtnB()->mType == 3)
dComIfGp_getAttention()->getActionBtnB()->mType == fopAc_attn_SPEAK_e)
{
ret = TRUE;
}
@@ -2724,7 +2724,7 @@ BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_actor_p) {
for (int i = 0; i < dComIfGp_getAttention()->GetLockonCount(); i++) {
if (dComIfGp_getAttention()->LockonTarget(i) == i_actor_p &&
dComIfGp_getAttention()->getActionBtnB() != NULL &&
dComIfGp_getAttention()->getActionBtnB()->mType == 1)
dComIfGp_getAttention()->getActionBtnB()->mType == fopAc_attn_TALK_e)
{
ret = TRUE;
}