Fix ScreenToMap and added NPC's death