This commit is contained in:
aozhiwei 2023-06-30 18:50:07 +08:00
parent 8c5fa57ef4
commit b77d8a3125

View File

@ -1304,6 +1304,7 @@ void Human::DeadDrop()
room->ScatterDrop(GetPos().ToGlmVec3(), id); room->ScatterDrop(GetPos().ToGlmVec3(), id);
} }
} }
#if 0
if (GetCurrWeapon() && if (GetCurrWeapon() &&
GetCurrWeapon()->weapon_idx == GUN_SLOT1) { GetCurrWeapon()->weapon_idx == GUN_SLOT1) {
int num = 1 + rand() % 2; int num = 1 + rand() % 2;
@ -1311,6 +1312,7 @@ void Human::DeadDrop()
room->CreateLoot(GetCurrWeapon()->meta->id(), GetPos().ToGlmVec3(), GetPos().ToGlmVec3(), 1, 1); room->CreateLoot(GetCurrWeapon()->meta->id(), GetPos().ToGlmVec3(), GetPos().ToGlmVec3(), 1, 1);
} }
} }
#endif
} }
} }
{ {
@ -3332,7 +3334,8 @@ void Human::InternalBeKill(int killer_id, const std::string& killer_name, int we
room->frame_event.AddDead(GetWeakPtrRef(), 0); room->frame_event.AddDead(GetWeakPtrRef(), 0);
} }
} else { } else {
if (room->GetGasData().old_area_meta->CanRevive()) { if (room->GetGasData().old_area_meta->CanRevive() &&
revive_count < mt::Param::s().revive_count) {
} else { } else {
real_dead = true; real_dead = true;
dead_frameno = room->GetFrameNo(); dead_frameno = room->GetFrameNo();