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

1

Browse Source
This commit is contained in:
aozhiwei 2019-10-08 14:17:35 +08:00
parent ada3a9bb35
commit f044c2dd9c
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/human.cc
View File

@ -145,6 +145,15 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
p->set_parachute(parachute); p->set_parachute(parachute);
} }
FillBodyState(p->mutable_states()); FillBodyState(p->mutable_states());
if (dead) {
if (real_dead){
p->set_can_revive(false);
} else {
p->set_can_revive(true);
p->set_revive_countdown(std::ceil(room->xtimer.GetRemainTime(revive_timer) / SERVER_FRAME_RATE));
p->set_killer_name(stats.killer_name);
}
}
} }
void Human::FillMFPlayerStats(cs::MFPlayerStats* stats_pb) void Human::FillMFPlayerStats(cs::MFPlayerStats* stats_pb)

3
server/gameserver/human.h
View File

@ -88,6 +88,9 @@ class Human : public Entity
int emoji2 = 0; int emoji2 = 0;
int parachute = 0; int parachute = 0;
bool has_pass = 0; bool has_pass = 0;
bool real_dead = false;
xtimer_list* revive_timer = nullptr;
int revive_count = 0;
Weapon default_weapon; Weapon default_weapon;
Weapon tank_weapon; Weapon tank_weapon;

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit ee4ceec3d96375f9ca6ba4816ade7508bd570a92 Subproject commit 403fbb49bc0e8267264f6b75b31bd41abdc8a235