From 9431cf51bd4bc9173fb0aa1d8be64bb8b07673c6 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 20 Oct 2023 18:34:16 -0700
Subject: [PATCH] d_a_swtact match

---
 configure.py               | 8 ++++----
 src/d/actor/d_a_swtact.cpp | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure.py b/configure.py
index a01541b95..3fd115775 100644
--- a/configure.py
+++ b/configure.py
@@ -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"),
diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp
index dd2f67e24..2eae55a9b 100644
--- a/src/d/actor/d_a_swtact.cpp
+++ b/src/d/actor/d_a_swtact.cpp
@@ -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;