d_a_swtact match

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
+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;