mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-10 06:16:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_swtact match

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-10-20 18:34:16 -07:00
parent d0f5a5a9a8
commit 9431cf51bd
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+4 -4
View File
@@ -698,8 +698,8 @@ config.libs = [
Object(NonMatching, "JSystem/JAudio/JASDriverTables.cpp"),
Object(Matching, "JSystem/JAudio/dspproc.c", extra_cflags="-lang c++ -O4 -func_align 32"),
Object(NonMatching, "JSystem/JAudio/dsptask.c", extra_cflags="-lang c++ -O4 -func_align 32"),
Object(Matching, "JSystem/JAudio/osdsp.c", extra_cflags="-lang c++ -O4 -func_align 32 -str nopool"),
Object(Matching, "JSystem/JAudio/osdsp_task.c", extra_cflags="-lang c++ -O4 -func_align 32"),
Object(Matching, "JSystem/JAudio/osdsp.c", extra_cflags="-lang c++ -O4 -func_align 32 -str nopool"),
Object(Matching, "JSystem/JAudio/osdsp_task.c", extra_cflags="-lang c++ -O4 -func_align 32"),
Object(NonMatching, "JSystem/JAudio/JAIAnimation.cpp"),
Object(NonMatching, "JSystem/JAudio/JAIBasic.cpp"),
Object(NonMatching, "JSystem/JAudio/JAIBankWave.cpp"),
@@ -1560,7 +1560,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_ojtree"),
ActorRel(NonMatching, "d_a_obj_ospbox"),
ActorRel(NonMatching, "d_a_obj_paper"),
ActorRel(Matching, "d_a_obj_pbka"),
ActorRel(Matching, "d_a_obj_pbka"),
ActorRel(NonMatching, "d_a_obj_pfall"),
ActorRel(NonMatching, "d_a_obj_plant"),
ActorRel(NonMatching, "d_a_obj_rflw"),
@@ -1598,7 +1598,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_swattack"),
ActorRel(NonMatching, "d_a_switem"),
ActorRel(NonMatching, "d_a_swpropeller"),
ActorRel(NonMatching, "d_a_swtact"),
ActorRel(Matching, "d_a_swtact"),
ActorRel(NonMatching, "d_a_tag_etc"),
ActorRel(NonMatching, "d_a_tag_island"),
ActorRel(NonMatching, "d_a_tag_kf1"),
src/d/actor/d_a_swtact.cpp
+1 -3
View File
@@ -153,8 +153,7 @@ bool daSwTact_c::_execute() {
if (player == NULL || dComIfGp_checkPlayerStatus0(0, 0x10000))
return true;
cXyz delta = player->getPosition() - getPosition();
if (delta.absXZ() <= getR()) {
if ((player->getPosition() - getPosition()).absXZ() <= getR()) {
if (mPlayerStatus != stts1 && stts1 != 0) {
player->setTactZev(fopAcM_GetID(this), getAnswer(), NULL);
}
@@ -186,7 +185,6 @@ bool daSwTact_c::_execute() {
mTrigger = true;
break;
case 0xFF:
default:
if ((u32)tactMusic <= 4 || tactMusic == 5)
mTrigger = true;
break;