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 17:56:27 +08:00
parent 623411e231
commit 40274c2c41
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/gameserver/human.cc
View File

@ -1102,12 +1102,7 @@ void Human::DoGetDown()
} }
room->UpdateCarObject(skin_tank.tank_uniid, entity_uniid, pos); room->UpdateCarObject(skin_tank.tank_uniid, entity_uniid, pos);
room->TakeOffCarObject(entity_uniid, pos); room->TakeOffCarObject(entity_uniid, pos);
skin_tank = Skin(); ResetTankSkin();
skin_tank_meta = nullptr;
tank_weapon = Weapon();
tank_oil_value = 0.0f;
tank_oil_max = 0.0f;
RecalcSelfCollider();
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);
room->NotifyUiUpdate(); room->NotifyUiUpdate();
need_sync_active_player = true; need_sync_active_player = true;
@ -2414,3 +2409,13 @@ void Human::Revive()
}); });
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);
} }
void Human::ResetTankSkin()
{
skin_tank = Skin();
skin_tank_meta = nullptr;
tank_weapon = Weapon();
tank_oil_value = 0.0f;
tank_oil_max = 0.0f;
RecalcSelfCollider();
}

1
server/gameserver/human.h
View File

@ -218,6 +218,7 @@ class Human : public Entity
protected: protected:
void _UpdateMove(int speed); void _UpdateMove(int speed);
void ProcLootSkin(Loot* entity, MetaData::Equip* item_meta); void ProcLootSkin(Loot* entity, MetaData::Equip* item_meta);
void ResetTankSkin();
private: private:
void ClearFrameData(); void ClearFrameData();

1
server/gameserver/player.cc
View File

@ -1090,6 +1090,7 @@ void Player::_CMRevive(f8::MsgHdr& hdr, const cs::CMRevive& msg)
if (dead && !real_dead && revive_timer) { if (dead && !real_dead && revive_timer) {
dead = false; dead = false;
health = GetMaxHP(); health = GetMaxHP();
ResetTankSkin();
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);
room->xtimer.DeleteTimer(revive_timer); room->xtimer.DeleteTimer(revive_timer);
revive_timer = nullptr; revive_timer = nullptr;