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-09-04 11:45:35 +08:00
parent ddf77a1b69
commit 83a972ba4f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/gameserver/human.cc
View File

@ -848,10 +848,10 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
if (member->dead) {
member->SendGameOver();
} else if (member->downed) {
a8::XParams& timer_param = room->xtimer.GetTimerXParams(member->downed_timer);
member->stats.killer_id = timer_param.param1;
member->stats.killer_name = timer_param.param2.GetString();
member->stats.weapon_id = timer_param.param2;
a8::XParams* timer_param = room->xtimer.MutableParams(member->downed_timer);
member->stats.killer_id = timer_param->param1;
member->stats.killer_name = timer_param->param2.GetString();
member->stats.weapon_id = timer_param->param2;
member->dead = true;
member->health = 0.0f;
member->dead_frameno = room->frame_no;
@ -2265,10 +2265,10 @@ void Human::ProcLootSkin(Loot* entity, MetaData::Equip* item_meta)
hum->room->xtimer.DeleteTimer(hum->room->xtimer.GetRunningTimer());
return;
}
a8::XParams& mutable_param = hum->room->xtimer.GetTimerXParams(hum->room->xtimer.GetRunningTimer());
if (std::abs(mutable_param.param2.GetDouble() - (double)hum->tank_oil_value) > 0.1f) {
a8::XParams* mutable_param = hum->room->xtimer.MutableParams(hum->room->xtimer.GetRunningTimer());
if (std::abs(mutable_param->param2.GetDouble() - (double)hum->tank_oil_value) > 0.1f) {
hum->room->frame_event.AddTankOilValueChg(hum);
mutable_param.param2 = hum->tank_oil_value;
mutable_param->param2 = hum->tank_oil_value;
}
};
if (item_meta->i->is_luck()) {

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit 33fec015265a0f47b7d1084fe11bfea75e807388
Subproject commit ee4ceec3d96375f9ca6ba4816ade7508bd570a92