diff --git a/server/gameserver/airdrop.cc b/server/gameserver/airdrop.cc index 5259a472..e9bd5ca7 100644 --- a/server/gameserver/airdrop.cc +++ b/server/gameserver/airdrop.cc @@ -59,9 +59,7 @@ void AirDrop::Exec(int appear_time, int box_id, int airdrop_id) const mt::MapThing* thing_meta = mt::MapThing::GetById(box_id); if (thing_meta && thing_meta->type() == 2) { glm::vec3 box_pos; - #if 0 - frame_event.AddAirDrop(appear_time, box_id, final_box_pos); - #endif + room_->frame_event.AddAirDrop(appear_time, box_id, box_pos); room_->xtimer.SetTimeoutEx (SERVER_FRAME_RATE * appear_time / 1000.f, [this, box_pos, airdrop_id, box_id] diff --git a/server/gameserver/frameevent.cc b/server/gameserver/frameevent.cc index 436c1a54..cf304732 100644 --- a/server/gameserver/frameevent.cc +++ b/server/gameserver/frameevent.cc @@ -13,7 +13,7 @@ #include "mt/Equip.h" -void FrameEvent::AddAirDrop(int appear_time, int box_id, Position box_pos) +void FrameEvent::AddAirDrop(int appear_time, int box_id, const glm::vec3& box_pos) { cs::MFAirDrop* airdrop = room->frame_event_data->airdrops_.Add(); airdrop->set_appear_time(appear_time); diff --git a/server/gameserver/frameevent.h b/server/gameserver/frameevent.h index df4fb7b0..12bdb5a9 100644 --- a/server/gameserver/frameevent.h +++ b/server/gameserver/frameevent.h @@ -13,7 +13,7 @@ struct FrameEvent public: Room* room = nullptr; - void AddAirDrop(int appear_time, int box_id, Position box_pos); + void AddAirDrop(int appear_time, int box_id, const glm::vec3& box_pos); void AddAirRaid(int appear_time, const glm::vec3& raid_pos, float raid_rad); void AddEmote(CreatureWeakPtr& sender, int emote_id); void AddShot(CreatureWeakPtr& sender); diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc index 6fe925fd..a5c931b4 100644 --- a/server/gameserver/roomobstacle.cc +++ b/server/gameserver/roomobstacle.cc @@ -468,7 +468,7 @@ void RoomObstacle::ActiveAirDrop() } room->frame_event.AddAirDrop(delay_time, appear_time, - born_pos); + born_pos.ToGlmVec3()); } }, &xtimer_attacher);