1
This commit is contained in:
parent
f87e733b56
commit
31360687eb
@ -1261,9 +1261,11 @@ void Creature::UpdatePoisoning()
|
||||
}
|
||||
poisoning_time -= 1000;
|
||||
}
|
||||
#if 0
|
||||
if (need_notify && IsEntitySubType(EST_Player)) {
|
||||
SyncAroundPlayers(__FILE__, __LINE__, __func__);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void Creature::Shot(glm::vec3& target_dir, bool& shot_ok, float fly_distance, int trace_target_uniid)
|
||||
|
@ -182,6 +182,14 @@ void Skill::AddMinorMode(
|
||||
[this] (int event, const a8::Args* args)
|
||||
{
|
||||
if (a8::TIMER_EXEC_EVENT == event) {
|
||||
} else if (a8::TIMER_DELETE_EVENT == event) {
|
||||
minor_type_ = SMT_NONE;
|
||||
minor_cd_time_ = 0;
|
||||
minor_frameno_ = 0;
|
||||
if (minor_cb_) {
|
||||
minor_cb_(0);
|
||||
}
|
||||
minor_cb_ = nullptr;
|
||||
ResetSkillCd();
|
||||
if (owner->IsHuman()) {
|
||||
Human* hum = owner->AsHuman();
|
||||
@ -197,14 +205,6 @@ void Skill::AddMinorMode(
|
||||
);
|
||||
NotifySkillState();
|
||||
}
|
||||
} else if (a8::TIMER_DELETE_EVENT == event) {
|
||||
minor_type_ = SMT_NONE;
|
||||
minor_cd_time_ = 0;
|
||||
minor_frameno_ = 0;
|
||||
if (minor_cb_) {
|
||||
minor_cb_(0);
|
||||
}
|
||||
minor_cb_ = nullptr;
|
||||
}
|
||||
},
|
||||
&xtimer_attacher);
|
||||
|
Loading…
x
Reference in New Issue
Block a user