server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add is_destory

Browse Source
This commit is contained in:
aozhiwei 2022-11-24 13:07:41 +08:00
parent 9bb00d28af
commit b81b921ed1
14 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/buff.cc
View File

@ -160,7 +160,7 @@ void Buff::InternalTimerAddBuff()
} }
}; };
auto timer_after_func = auto timer_after_func =
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
SkillCasterState* caster_state = (SkillCasterState*)param.param1.GetUserData(); SkillCasterState* caster_state = (SkillCasterState*)param.param1.GetUserData();
delete caster_state; delete caster_state;
@ -487,7 +487,7 @@ void Buff::ProcSprint()
} }
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
std::map<int, long long>* hited_objects = (std::map<int, long long>*) std::map<int, long long>* hited_objects = (std::map<int, long long>*)
param.param1.GetUserData(); param.param1.GetUserData();
@ -756,7 +756,7 @@ void Buff::ProcAutoShot()
} }
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Buff* buff = (Buff*)param.sender.GetUserData(); Buff* buff = (Buff*)param.sender.GetUserData();
if (buff->owner->IsHuman()) { if (buff->owner->IsHuman()) {

8
server/gameserver/bullet.cc
View File

@ -221,7 +221,7 @@ void Bullet::ProcBomb()
#endif #endif
}, },
&room->timer_attacher.timer_list_, &room->timer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
} }
); );
@ -360,7 +360,7 @@ void Bullet::ProcSmokeBomb()
{ {
}, },
&room->timer_attacher.timer_list_, &room->timer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
SmokeMiTask* task = (SmokeMiTask*)param.sender.GetUserData(); SmokeMiTask* task = (SmokeMiTask*)param.sender.GetUserData();
task->Done(); task->Done();
@ -695,7 +695,7 @@ void Bullet::ProcFragBomb(int delay_time)
task->Done(); task->Done();
}, },
&task->timer_attacher.timer_list_, &task->timer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
FragMiTask* task = (FragMiTask*)param.sender.GetUserData(); FragMiTask* task = (FragMiTask*)param.sender.GetUserData();
delete task; delete task;
@ -749,7 +749,7 @@ void Bullet::ProcC4Bomb(Car* target, int delay_time)
task->Done(); task->Done();
}, },
&task->timer_attacher.timer_list_, &task->timer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
FragMiTask* task = (FragMiTask*)param.sender.GetUserData(); FragMiTask* task = (FragMiTask*)param.sender.GetUserData();
delete task; delete task;

16
server/gameserver/creature.cc
View File

@ -211,7 +211,7 @@ int Creature::AddBuff(Creature* caster,
c->RemoveBuffByUniId(param.param1); c->RemoveBuffByUniId(param.param1);
}, },
&buff->xtimer_attacher.timer_list_, &buff->xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Buff* buff = (Buff*)param.param2.GetUserData(); Buff* buff = (Buff*)param.param2.GetUserData();
if (buff->remover_timer) { if (buff->remover_timer) {
@ -341,7 +341,7 @@ std::weak_ptr<a8::XTimerPtr> Creature::TryDelayAddBuff(Creature* caster, int buf
} }
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
DelayAddBuffHandle* handle = (DelayAddBuffHandle*)param.param3.GetUserData(); DelayAddBuffHandle* handle = (DelayAddBuffHandle*)param.param3.GetUserData();
delete handle; delete handle;
@ -1016,7 +1016,7 @@ void Creature::ProcSkillPhase(MetaData::SkillPhase* phase)
c->context_pos = old_context_pos; c->context_pos = old_context_pos;
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
}); });
@ -2913,7 +2913,7 @@ Hero* Creature::InternalSummonHero(Buff* buff, MetaData::Player* hero_meta, a8::
{ {
}, },
&hero->xtimer_attacher.timer_list_, &hero->xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
}); });
@ -2927,7 +2927,7 @@ Hero* Creature::InternalSummonHero(Buff* buff, MetaData::Player* hero_meta, a8::
#endif #endif
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
SummonHeroInfo* summon_info = (SummonHeroInfo*)param.param1.GetUserData(); SummonHeroInfo* summon_info = (SummonHeroInfo*)param.param1.GetUserData();
delete summon_info; delete summon_info;
@ -3002,7 +3002,7 @@ void Creature::AutoSwitchWeapon()
param, param,
switch_func, switch_func,
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Creature* c = (Creature*)param.sender.GetUserData(); Creature* c = (Creature*)param.sender.GetUserData();
c->auto_switch_weapon_timer_ = nullptr; c->auto_switch_weapon_timer_ = nullptr;
@ -3043,7 +3043,7 @@ void Creature::CheckLoadingBullet()
} }
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Creature* c = (Creature*)param.sender.GetUserData(); Creature* c = (Creature*)param.sender.GetUserData();
if (c->reload_delay_timer_) { if (c->reload_delay_timer_) {
@ -3435,7 +3435,7 @@ void Creature::LockAttackDir(int time)
Creature* c = (Creature*)param.sender.GetUserData(); Creature* c = (Creature*)param.sender.GetUserData();
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Creature* c = (Creature*)param.sender.GetUserData(); Creature* c = (Creature*)param.sender.GetUserData();
c->DecDisableAttackDirTimes(); c->DecDisableAttackDirTimes();

2
server/gameserver/explosion.cc
View File

@ -185,7 +185,7 @@ void Explosion::InternalAttack()
(*self)->ProcDamage(); (*self)->ProcDamage();
}, },
&room_->xtimer_attacher_.timer_list_, &room_->xtimer_attacher_.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
auto self = (std::shared_ptr<Explosion>*)param.sender.GetUserData(); auto self = (std::shared_ptr<Explosion>*)param.sender.GetUserData();
delete self; delete self;

14
server/gameserver/human.cc
View File

@ -1131,7 +1131,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id,
); );
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
KillInfo* info = (KillInfo*)param.param1.GetUserData(); KillInfo* info = (KillInfo*)param.param1.GetUserData();
delete info; delete info;
@ -1247,7 +1247,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
.SetParam1(info), .SetParam1(info),
downed_func, downed_func,
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
DownedInfo* info = (DownedInfo*)param.param1.GetUserData(); DownedInfo* info = (DownedInfo*)param.param1.GetUserData();
delete info; delete info;
@ -2934,7 +2934,7 @@ void Human::Revive()
.SetSender(this), .SetSender(this),
callback, callback,
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Human* hum = (Human*)param.sender.GetUserData(); Human* hum = (Human*)param.sender.GetUserData();
hum->revive_timer = nullptr; hum->revive_timer = nullptr;
@ -3354,7 +3354,7 @@ void Human::ProcUseItemAction()
} }
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Human* hum = (Human*)param.sender.GetUserData(); Human* hum = (Human*)param.sender.GetUserData();
hum->pain_killer_timer = nullptr; hum->pain_killer_timer = nullptr;
@ -3915,7 +3915,7 @@ void Human::StartRefreshViewTimer()
hum->UpdateViewObjects(); hum->UpdateViewObjects();
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Human* hum = (Human*)param.sender.GetUserData(); Human* hum = (Human*)param.sender.GetUserData();
hum->refresh_view_timer_ = nullptr; hum->refresh_view_timer_ = nullptr;
@ -4522,7 +4522,7 @@ void Human::DoFollow(int target_id)
} }
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Player* hum = (Player*)param.sender.GetUserData(); Player* hum = (Player*)param.sender.GetUserData();
hum->follow_target_timer_ = nullptr; hum->follow_target_timer_ = nullptr;
@ -4650,7 +4650,7 @@ void Human::InternalBeKill(int killer_id, const std::string& killer_name, int we
hum->SendGameOver(); hum->SendGameOver();
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Human* hum = (Human*)param.sender.GetUserData(); Human* hum = (Human*)param.sender.GetUserData();
hum->dead_timer = nullptr; hum->dead_timer = nullptr;

2
server/gameserver/incubator.cc
View File

@ -46,7 +46,7 @@ void Incubator::InitPve()
incubator->OnEnterNewWave(param.param1.GetInt()); incubator->OnEnterNewWave(param.param1.GetInt());
}, },
&xtimer_attacher_.timer_list_, &xtimer_attacher_.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
int wave = param.param1.GetInt(); int wave = param.param1.GetInt();
Incubator* incubator = (Incubator*)param.sender.GetUserData(); Incubator* incubator = (Incubator*)param.sender.GetUserData();

2
server/gameserver/killmgr.cc
View File

@ -218,7 +218,7 @@ void KillMgr::BoradcastRollMsg(Human* dead_hum,
*pb_msg); *pb_msg);
}, },
&dead_hum->xtimer_attacher.timer_list_, &dead_hum->xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
KillInfo* info = (KillInfo*)param.param1.GetUserData(); KillInfo* info = (KillInfo*)param.param1.GetUserData();
std::shared_ptr<cs::SMRollMsg>* pb_msg = (std::shared_ptr<cs::SMRollMsg>*) std::shared_ptr<cs::SMRollMsg>* pb_msg = (std::shared_ptr<cs::SMRollMsg>*)

6
server/gameserver/player.cc
View File

@ -765,7 +765,7 @@ void Player::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg)
} }
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
}); });
} }
@ -1460,7 +1460,7 @@ void Player::CheckShotHoldState(Weapon* weapon)
} }
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Human* hum = (Human*)param.sender.GetUserData(); Human* hum = (Human*)param.sender.GetUserData();
hum->RemoveBuffById(param.param1); hum->RemoveBuffById(param.param1);
@ -1504,7 +1504,7 @@ void Player::AsyncRequestWatchWar(bool send_rsp_msg)
.SetSender(this), .SetSender(this),
cb, cb,
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Player* hum = (Player*)param.sender.GetUserData(); Player* hum = (Player*)param.sender.GetUserData();
hum->watch_war_req_timer_ = nullptr; hum->watch_war_req_timer_ = nullptr;

6
server/gameserver/room.cc
View File

@ -1349,7 +1349,7 @@ void Room::UpdateGasInactivePvp()
} }
}, },
&xtimer_attacher_.timer_list_, &xtimer_attacher_.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Room* room = (Room*)param.sender.GetUserData(); Room* room = (Room*)param.sender.GetUserData();
room->auto_jump_timer_ = nullptr; room->auto_jump_timer_ = nullptr;
@ -2665,7 +2665,7 @@ void Room::ShuaAndroidTimerFunc()
room->ShuaAndroidTimerFunc(); room->ShuaAndroidTimerFunc();
}, },
&xtimer_attacher_.timer_list_, &xtimer_attacher_.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
} }
); );
@ -2706,7 +2706,7 @@ void Room::DieAndroidTimerFunc()
room->DieAndroidTimerFunc(); room->DieAndroidTimerFunc();
}, },
&xtimer_attacher_.timer_list_, &xtimer_attacher_.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
} }
); );

2
server/gameserver/roomobstacle.cc
View File

@ -526,7 +526,7 @@ void RoomObstacle::ActiveAirDrop()
obstacle->BroadcastFullState(obstacle->room); obstacle->BroadcastFullState(obstacle->room);
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
int i = 0; int i = 0;
}); });

2
server/gameserver/shot.cc
View File

@ -260,7 +260,7 @@ static void InternalCreateBullet(BulletInfo& bullet_info)
InternalCreateBullet(*info_copy); InternalCreateBullet(*info_copy);
}, },
&bullet_info.c.Get()->xtimer_attacher.timer_list_, &bullet_info.c.Get()->xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
BulletInfo* info_copy = (BulletInfo*)param.sender.GetUserData(); BulletInfo* info_copy = (BulletInfo*)param.sender.GetUserData();
delete info_copy; delete info_copy;

4
server/gameserver/skill.cc
View File

@ -194,7 +194,7 @@ void Skill::AddMinorMode(
Skill* skill = (Skill*)param.sender.GetUserData(); Skill* skill = (Skill*)param.sender.GetUserData();
}, },
&owner->xtimer_attacher.timer_list_, &owner->xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
Skill* skill = (Skill*)param.sender.GetUserData(); Skill* skill = (Skill*)param.sender.GetUserData();
skill->minor_type_ = SMT_NONE; skill->minor_type_ = SMT_NONE;
@ -907,7 +907,7 @@ void Skill::ProcFH()
skill->meta); skill->meta);
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
} }
); );

2
server/gameserver/trigger.cc
View File

@ -122,7 +122,7 @@ void Trigger::Shot(MetaData::Equip* weapon_meta)
c->RemoveBuffByUniId(param.param1); c->RemoveBuffByUniId(param.param1);
}, },
&owner_->xtimer_attacher.timer_list_, &owner_->xtimer_attacher.timer_list_,
[] (const a8::XParams& param) [] (const a8::XParams& param, bool is_destory)
{ {
}); });
} }

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit 9d9efccd69f5a81ac2905617d2fe4d197394f27c Subproject commit c02fdb4a9238a282479161226584ba0845703ae9