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

rename huamn meta -> meta_

Browse Source
This commit is contained in:
aozhiwei 2019-07-20 14:09:23 +08:00
parent a1d5e1b7c1
commit ff092cdc10
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/gameserver/human.cc
View File

@ -65,7 +65,7 @@ void Human::Initialize()
Entity::Initialize(); Entity::Initialize();
skill_xtimer_attacher_.xtimer = &room->xtimer; skill_xtimer_attacher_.xtimer = &room->xtimer;
RecalcSelfCollider(); RecalcSelfCollider();
volume_ = meta->volume; volume_ = meta_->volume;
observers_.insert(this); observers_.insert(this);
} }
@ -136,15 +136,20 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
void Human::GetAabbBox(AabbCollider& aabb_box) void Human::GetAabbBox(AabbCollider& aabb_box)
{ {
if (!meta) { if (!meta_) {
abort(); abort();
} }
aabb_box.active = true; aabb_box.active = true;
aabb_box.owner = this; aabb_box.owner = this;
aabb_box._min.x = -meta->i->radius(); aabb_box._min.x = -meta_->i->radius();
aabb_box._min.y = -meta->i->radius(); aabb_box._min.y = -meta_->i->radius();
aabb_box._max.x = meta->i->radius(); aabb_box._max.x = meta_->i->radius();
aabb_box._max.y = meta->i->radius(); aabb_box._max.y = meta_->i->radius();
}
void Human::SetMeta(MetaData::Player* hum_meta)
{
meta_ = hum_meta;
} }
void Human::FillMFTeamData(cs::MFTeamData* team_data) void Human::FillMFTeamData(cs::MFTeamData* team_data)
@ -233,12 +238,12 @@ void Human::RecalcSelfCollider()
AddCollider(self_collider_); AddCollider(self_collider_);
} }
self_collider_->pos = a8::Vec2(); self_collider_->pos = a8::Vec2();
self_collider_->rad = meta->i->radius(); self_collider_->rad = meta_->i->radius();
} }
bool Human::IsCollisionInMapService() bool Human::IsCollisionInMapService()
{ {
if (room->OverBorder(pos, meta->i->radius())){ if (room->OverBorder(pos, meta_->i->radius())){
return true; return true;
} }
@ -356,7 +361,7 @@ void Human::FindPathInMapService()
float Human::GetRadius() float Human::GetRadius()
{ {
return meta->i->radius(); return meta_->i->radius();
} }
float Human::GetHP() float Human::GetHP()
@ -1772,7 +1777,7 @@ void Human::ProcSkillPhase(MetaData::SkillPhase* phase)
{ {
if (obstacle->master->team_id != hum->team_id) { if (obstacle->master->team_id != hum->team_id) {
if (hum->pos.Distance(obstacle->pos) < if (hum->pos.Distance(obstacle->pos) <
hum->meta->i->radius()) { hum->meta_->i->radius()) {
obstacle->dead = true; obstacle->dead = true;
obstacle->Explosion(); obstacle->Explosion();
return false; return false;

4
server/gameserver/human.h
View File

@ -38,7 +38,6 @@ class Human : public Entity
std::string from_appid; std::string from_appid;
std::string team_uuid; std::string team_uuid;
int account_registertime = 0; int account_registertime = 0;
MetaData::Player* meta = nullptr;
HumanAbility ability; HumanAbility ability;
int born_point = 0; int born_point = 0;
int last_attacker_id = 0; int last_attacker_id = 0;
@ -108,6 +107,7 @@ class Human : public Entity
virtual void FillMFObjectPart(cs::MFObjectPart* part_data) override; virtual void FillMFObjectPart(cs::MFObjectPart* part_data) override;
virtual void FillMFObjectFull(cs::MFObjectFull* full_data) override; virtual void FillMFObjectFull(cs::MFObjectFull* full_data) override;
virtual void GetAabbBox(AabbCollider& aabb_box); virtual void GetAabbBox(AabbCollider& aabb_box);
void SetMeta(MetaData::Player* hum_meta);
void FillMFTeamData(cs::MFTeamData* team_data); void FillMFTeamData(cs::MFTeamData* team_data);
void Shot(); void Shot();
void DirectShot(MetaData::Equip* bullet_meta, int skill_id); void DirectShot(MetaData::Equip* bullet_meta, int skill_id);
@ -233,6 +233,8 @@ protected:
std::set<Human*> observers_; std::set<Human*> observers_;
Human* follow_target_ = nullptr; Human* follow_target_ = nullptr;
bool follow_synced_active_player = false; bool follow_synced_active_player = false;
MetaData::Player* meta_ = nullptr;
MetaData::Skill* skill_meta_ = nullptr; MetaData::Skill* skill_meta_ = nullptr;
MetaData::Tank* tank_meta_ = nullptr; MetaData::Tank* tank_meta_ = nullptr;
MetaData::Driver* driver_meta_ = nullptr; MetaData::Driver* driver_meta_ = nullptr;

2
server/gameserver/room.cc
View File

@ -263,7 +263,7 @@ void Room::CreateAndroid(int robot_num)
Android* hum = new Android(); Android* hum = new Android();
hum->name = robot_meta->i->name(); hum->name = robot_meta->i->name();
hum->meta = hum_meta; hum->SetMeta(hum_meta);
hum->robot_meta = robot_meta; hum->robot_meta = robot_meta;
hum->entity_uniid = AllocUniid(); hum->entity_uniid = AllocUniid();
hum->born_point = AllocBornPoint(); hum->born_point = AllocBornPoint();

2
server/gameserver/roommgr.cc
View File

@ -65,7 +65,7 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
room_hash_[room->room_uuid] = room; room_hash_[room->room_uuid] = room;
} }
Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.ip_saddr, hdr.socket_handle, msg); Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.ip_saddr, hdr.socket_handle, msg);
hum->meta = hum_meta; hum->SetMeta(hum_meta);
room->AddPlayer(hum); room->AddPlayer(hum);
hum->ProcPrepareItems(msg.prepare_items()); hum->ProcPrepareItems(msg.prepare_items());