1
This commit is contained in:
parent
a401d1c6bd
commit
395d8d2246
@ -154,9 +154,10 @@ void CondAddBuff::ProcDisengageBattle()
|
||||
std::vector<std::tuple<int, int>> hold_buff_list;
|
||||
long long last_check_frameno = 0;
|
||||
bool handled = false;
|
||||
a8::XTimerWp timer;
|
||||
);
|
||||
|
||||
a8::XTimerWp timer = owner->room->xtimer.SetIntervalWpEx
|
||||
context->timer = owner->room->xtimer.SetIntervalWpEx
|
||||
(
|
||||
disengate_time * SERVER_FRAME_RATE,
|
||||
[this, context] (int event, const a8::Args* args)
|
||||
@ -193,9 +194,9 @@ void CondAddBuff::ProcDisengageBattle()
|
||||
&xtimer_attacher);
|
||||
|
||||
auto cb =
|
||||
[this, timer, context] (const a8::Args& args) mutable
|
||||
[this, context] (const a8::Args& args) mutable
|
||||
{
|
||||
if (timer.expired()) {
|
||||
if (context->timer.expired()) {
|
||||
return;
|
||||
}
|
||||
if (!meta->_buff_param5_int_set.empty() &&
|
||||
@ -209,7 +210,7 @@ void CondAddBuff::ProcDisengageBattle()
|
||||
context->hold_buff_list.clear();
|
||||
}
|
||||
context->handled = false;
|
||||
owner->room->xtimer.ResetTimer(timer);
|
||||
owner->room->xtimer.ResetTimer(context->timer);
|
||||
};
|
||||
|
||||
event_handlers_.push_back
|
||||
|
@ -2968,9 +2968,11 @@ void Room::SyncFrameData()
|
||||
pair.second->SendUpdateMsg();
|
||||
#ifdef DEBUG
|
||||
end_tick = a8::XGetTickCount();
|
||||
#if 0
|
||||
if (a8::XGetTickCount() - begin_tick > 100) {
|
||||
A8_ABORT();
|
||||
}
|
||||
#endif
|
||||
begin_tick = a8::XGetTickCount();
|
||||
#endif
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user