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-07-27 17:37:27 +08:00
parent be7a12d163
commit eb46ffae0c
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/human.cc
View File

@ -2308,6 +2308,9 @@ void Human::DeadDrop()
room->DropItem(drop_pos, weapon.weapon_id, 1, weapon.weapon_lv); room->DropItem(drop_pos, weapon.weapon_id, 1, weapon.weapon_lv);
} }
} }
{
curr_weapon = &weapons[0];
}
{ {
Skin* old_skin = GetSkinByIdx(kSkinSlot_HAT); Skin* old_skin = GetSkinByIdx(kSkinSlot_HAT);
if (old_skin && old_skin->skin_id != 0) { if (old_skin && old_skin->skin_id != 0) {

2
server/gameserver/human.h
View File

@ -287,6 +287,7 @@ class Human : public MoveableEntity
void ChangeToRaceAndNotify(RaceType_e race, int level); void ChangeToRaceAndNotify(RaceType_e race, int level);
void WinExp(Human* sender, int exp); void WinExp(Human* sender, int exp);
HumanCar& GetCar() { return car_; } HumanCar& GetCar() { return car_; }
void DeadDrop();
protected: protected:
void _InternalUpdateMove(float speed); void _InternalUpdateMove(float speed);
@ -304,7 +305,6 @@ protected:
private: private:
void ClearFrameData(); void ClearFrameData();
void GenBattleReportData(a8::MutableXObject* params); void GenBattleReportData(a8::MutableXObject* params);
void DeadDrop();
void FillSMGameOver(cs::SMGameOver& msg); void FillSMGameOver(cs::SMGameOver& msg);
void SendBattleReport(); void SendBattleReport();
void FindLocationWithTarget(Entity* target); void FindLocationWithTarget(Entity* target);

4
server/gameserver/player.cc
View File

@ -483,6 +483,10 @@ void Player::ObstacleInteraction(Obstacle* entity)
void Player::LootInteraction(Loot* entity) void Player::LootInteraction(Loot* entity)
{ {
if (room->GetRoomMode() == kZombieMode &&
GetRace() == kZombieRace) {
return;
}
if (entity->pickuped || if (entity->pickuped ||
entity->count <= 0) { entity->count <= 0) {
return; return;

1
server/gameserver/room.cc
View File

@ -569,6 +569,7 @@ void Room::OnHumanDie(Human* hum)
if (GetRoomMode() == kZombieMode) { if (GetRoomMode() == kZombieMode) {
if (hum->GetRace() == kHumanRace) { if (hum->GetRace() == kHumanRace) {
RemoveRescue(hum); RemoveRescue(hum);
hum->DeadDrop();
} else if (hum->GetRace() == kZombieRace) { } else if (hum->GetRace() == kZombieRace) {
} else { } else {
abort(); abort();