fix friendly fire achievement

This commit is contained in:
madeline
2026-04-28 06:21:41 -07:00
parent 3c25633ee9
commit 7566949b42
2 changed files with 13 additions and 9 deletions
+13
View File
@@ -8,6 +8,10 @@
#include "d/actor/d_a_horse.h"
#include "d/actor/d_a_crod.h"
#include "d/d_msg_object.h"
#ifdef TARGET_PC
#include "d/actor/d_a_obj_carry.h"
#include "dusk/achievements.h"
#endif
#if DEBUG
#include "d/d_s_menu.h"
@@ -677,6 +681,15 @@ BOOL daAlink_c::checkDamageAction() {
}
setDamagePoint(dmg, at_mtrl == dCcD_MTRL_FIRE || at_mtrl == dCcD_MTRL_ICE, TRUE, 0);
#ifdef TARGET_PC
if (tghit_ac_name == fpcNm_Obj_Carry_e) {
auto* carry = static_cast<daObjCarry_c*>(tghit_ac);
if (carry->prm_chk_type_ironball() && carry->checkCannon()) {
dusk::AchievementSystem::get().signal("iron_ball_hit_player");
}
}
#endif
if (armor_no_dmg && at_mtrl != dCcD_MTRL_ELECTRIC && at_mtrl != dCcD_MTRL_ICE) {
setGuardSe(var_r29);
-9
View File
@@ -21,9 +21,6 @@
#include "d/d_lib.h"
#include "d/d_debug_viewer.h"
#include "f_op/f_op_kankyo_mng.h"
#ifdef TARGET_PC
#include "dusk/achievements.h"
#endif
static const cM3dGCylS l_cyl_info[] = {
{ 0.0f, 0.0f, 0.0f, 30.0f, 100.0f },
@@ -3585,12 +3582,6 @@ bool daObjCarry_c::cc_damage_proc_ironball() {
}
}
#ifdef TARGET_PC
if (mCannon && mCyl.ChkAtHit() && mCyl.GetAtHitAc() == daPy_getPlayerActorClass()) {
dusk::AchievementSystem::get().signal("iron_ball_hit_player");
}
#endif
return var_r26;
}