From 917a4932e56b2dd1371d82bc4b92ff17f13d94fb Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 20 Jul 2019 13:51:19 +0800 Subject: [PATCH] rename skill_meta -> skill_meta_ --- server/gameserver/android.cc | 2 +- server/gameserver/human.cc | 42 ++++++++++++++++++------------------ server/gameserver/human.h | 2 +- server/gameserver/player.cc | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index 2a947ea..6b1970e 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -28,7 +28,7 @@ void Android::Initialize() SetTankInfo(MetaMgr::Instance()->RandTank()); tank_meta = MetaMgr::Instance()->GetTank(TankId()); if (tank_meta) { - skill_meta = MetaMgr::Instance()->GetSkill(tank_meta->i->skill_id()); + skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta->i->skill_id()); } GiveEquip(); MetaData::TankSkin* tank_tank_meta = MetaMgr::Instance()->GetTankSkin(TankId()); diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 2809e81..ee61891 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -371,9 +371,9 @@ float Human::GetMaxHP() void Human::UpdateSkill() { - if (skill_meta) { - if (curr_skill_phase < skill_meta->phases.size()) { - MetaData::SkillPhase* phase = &skill_meta->phases[curr_skill_phase]; + if (skill_meta_) { + if (curr_skill_phase < skill_meta_->phases.size()) { + MetaData::SkillPhase* phase = &skill_meta_->phases[curr_skill_phase]; if (phase->time_offset >= (int)((room->frame_no - last_use_skill_frameno_) * FRAME_RATE_MS)) { ProcSkillPhase(phase); ++curr_skill_phase; @@ -538,7 +538,7 @@ bool Human::HasLiveTeammate() void Human::DoSkill() { - if (skill_meta && GetSkillLeftTime() <= 0 && !a8::HasBitFlag(status, HS_Assaulting)) { + if (skill_meta_ && GetSkillLeftTime() <= 0 && !a8::HasBitFlag(status, HS_Assaulting)) { use_skill = false; curr_skill_phase = 0; skill_dir = a8::Vec2(); @@ -552,8 +552,8 @@ void Human::DoSkill() std::set target_list; skill_target_pos = hum->pos; SelectSkillTargets(hum->pos, target_list); - TriggerBuff(skill_meta, target_list, BTT_UseSkill); - if (!skill_meta->phases.empty() && skill_meta->phases[0].time_offset <= 0) { + TriggerBuff(skill_meta_, target_list, BTT_UseSkill); + if (!skill_meta_->phases.empty() && skill_meta_->phases[0].time_offset <= 0) { UpdateSkill(); } } else { @@ -722,7 +722,7 @@ void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data) player_data->set_max_energy_shield(max_energy_shield); } #endif - if (skill_meta) { + if (skill_meta_) { player_data->set_skill_left_time(GetSkillLeftTime()); player_data->set_skill_cd_time(GetSkillCd()); } @@ -1045,12 +1045,12 @@ int Human::TankLv() int Human::GetSkillLeftTime() { - if (skill_meta) { + if (skill_meta_) { if (last_use_skill_frameno_ == 0) { return 0; } else { int passed_time = (room->frame_no - last_use_skill_frameno_) * FRAME_RATE_MS; - int skill_left_time = std::max(0, skill_meta->i->skill_cd() * 1000 - passed_time); + int skill_left_time = std::max(0, skill_meta_->i->skill_cd() * 1000 - passed_time); return skill_left_time; } } @@ -1059,7 +1059,7 @@ int Human::GetSkillLeftTime() int Human::GetSkillCd() { - return skill_meta ? skill_meta->i->skill_cd() * 1000 : 0; + return skill_meta_ ? skill_meta_->i->skill_cd() * 1000 : 0; } void Human::TriggerBuff(MetaData::Skill* sender_skill_meta, @@ -1497,8 +1497,8 @@ void Human::_UpdateAssaultMove() } CheckGrass(); if (move_end) { - if (!skill_meta->phases.empty()) { - MetaData::SkillPhase* phase = &skill_meta->phases[0]; + if (!skill_meta_->phases.empty()) { + MetaData::SkillPhase* phase = &skill_meta_->phases[0]; std::set target_list; for (auto& cell : grid_list) { for (Human* hum : cell->human_list) { @@ -1519,7 +1519,7 @@ void Human::_UpdateAssaultMove() } } } - TriggerBuff(skill_meta, target_list, BTT_SkillHit); + TriggerBuff(skill_meta_, target_list, BTT_SkillHit); room->frame_event.AddExplosion(0, pos, 2); room->grid_service.MoveHuman(this); } @@ -1639,12 +1639,12 @@ void Human::Revive() void Human::SelectSkillTargets(const a8::Vec2& target_pos, std::set& target_list) { - switch (skill_meta->i->skill_target()) { + switch (skill_meta_->i->skill_target()) { case ST_All: { for (auto& cell : grid_list) { for (Human* hum : cell->human_list) { - if (hum->pos.Distance(target_pos) < skill_meta->i->skill_distance()) { + if (hum->pos.Distance(target_pos) < skill_meta_->i->skill_distance()) { target_list.insert(hum); } } @@ -1662,7 +1662,7 @@ void Human::SelectSkillTargets(const a8::Vec2& target_pos, std::set& ta for (auto& cell : grid_list) { for (Human* hum : cell->human_list) { if ((hum == this || hum->team_id == team_id) && - hum->pos.Distance(target_pos) < skill_meta->i->skill_distance()) { + hum->pos.Distance(target_pos) < skill_meta_->i->skill_distance()) { target_list.insert(hum); } } @@ -1674,7 +1674,7 @@ void Human::SelectSkillTargets(const a8::Vec2& target_pos, std::set& ta for (auto& cell : grid_list) { for (Human* hum : cell->human_list) { if ((hum != this && hum->team_id == team_id) && - hum->pos.Distance(target_pos) < skill_meta->i->skill_distance()) { + hum->pos.Distance(target_pos) < skill_meta_->i->skill_distance()) { target_list.insert(hum); } } @@ -1697,7 +1697,7 @@ void Human::SelectSkillTargets(const a8::Vec2& target_pos, std::set& ta for (auto& cell : grid_list) { for (Human* hum : cell->human_list) { if ((hum->team_id != team_id) && - hum->pos.Distance(target_pos) < skill_meta->i->skill_distance()) { + hum->pos.Distance(target_pos) < skill_meta_->i->skill_distance()) { target_list.insert(hum); } } @@ -1709,7 +1709,7 @@ void Human::SelectSkillTargets(const a8::Vec2& target_pos, std::set& ta for (auto& cell : grid_list) { for (Human* hum : cell->human_list) { if ((hum->team_id != team_id) && - hum->pos.Distance(target_pos) < skill_meta->i->skill_distance()) { + hum->pos.Distance(target_pos) < skill_meta_->i->skill_distance()) { target_list.insert(hum); } } @@ -1721,7 +1721,7 @@ void Human::SelectSkillTargets(const a8::Vec2& target_pos, std::set& ta for (auto& cell : grid_list) { for (Human* hum : cell->human_list) { if ((hum == this || hum->team_id != team_id) && - hum->pos.Distance(target_pos) < skill_meta->i->skill_distance()) { + hum->pos.Distance(target_pos) < skill_meta_->i->skill_distance()) { target_list.insert(hum); } } @@ -1801,7 +1801,7 @@ void Human::ProcSkillPhase(MetaData::SkillPhase* phase) { MetaData::Equip* bullet_meta = MetaMgr::Instance()->GetEquip(phase->param1.GetInt()); if (bullet_meta) { - DirectShot(bullet_meta, skill_meta->i->skill_id()); + DirectShot(bullet_meta, skill_meta_->i->skill_id()); if (bullet_meta->NeedTrace()) { room->xtimer.AddDeadLineTimerAndAttach(bullet_meta->i->time() * SERVER_FRAME_RATE, a8::XParams() diff --git a/server/gameserver/human.h b/server/gameserver/human.h index 2912dc3..1d057fb 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -40,7 +40,6 @@ class Human : public Entity int account_registertime = 0; MetaData::Player* meta = nullptr; MetaData::Tank* tank_meta = nullptr; - MetaData::Skill* skill_meta = nullptr; MetaData::Driver* driver_meta = nullptr; HumanAbility ability; int born_point = 0; @@ -236,6 +235,7 @@ protected: std::set observers_; Human* follow_target_ = nullptr; bool follow_synced_active_player = false; + MetaData::Skill* skill_meta_ = nullptr; private: CircleCollider* self_collider_ = nullptr; diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index ac9c8ab..b995ebc 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -32,7 +32,7 @@ void Player::Initialize() Human::Initialize(); tank_meta = MetaMgr::Instance()->GetTank(TankId()); if (tank_meta) { - skill_meta = MetaMgr::Instance()->GetSkill(tank_meta->i->skill_id()); + skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta->i->skill_id()); MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(tank_meta->i->bullet_id()); if (weapon_meta) { weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;