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

1

Browse Source
This commit is contained in:
aozhiwei 2020-08-31 13:09:03 +08:00
parent 0b5b069153
commit a067330169
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/human.h
View File

@ -98,6 +98,7 @@ class Human : public MoveableEntity
bool dead = false; bool dead = false;
long long dead_frameno = 0; long long dead_frameno = 0;
long long real_dead_frameno = 0; long long real_dead_frameno = 0;
std::set<std::string> join_team_members;
Weapon default_weapon; Weapon default_weapon;
Weapon car_weapon; Weapon car_weapon;

7
server/gameserver/playermgr.cc
View File

@ -105,6 +105,13 @@ Player* PlayerMgr::CreatePlayerByCMJoin(Player* hum,
} }
} }
#if 1 #if 1
{
for (auto& member : msg.team_members()) {
if (member.account_id() != hum->account_id) {
hum->join_team_members.insert(member.account_id());
}
}
}
{ {
int idx = 0; int idx = 0;
for (int skin_id : msg.baseskin()) { for (int skin_id : msg.baseskin()) {

1
server/gameserver/roommgr.h
View File

@ -63,4 +63,5 @@ class RoomMgr : public a8::Singleton<RoomMgr>
std::map<long long, Room*> over_room_hash_; std::map<long long, Room*> over_room_hash_;
a8::TimerAttacher reportstate_timer_attacher_; a8::TimerAttacher reportstate_timer_attacher_;
std::map<std::string, int> gm_hash_; std::map<std::string, int> gm_hash_;
std::map<std::string, int> team_hash_;
}; };