server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-04-01 15:14:03 +08:00
parent f5da282ce0
commit 40982c8c35
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/airdrop.cc
View File

@ -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); const mt::MapThing* thing_meta = mt::MapThing::GetById(box_id);
if (thing_meta && thing_meta->type() == 2) { if (thing_meta && thing_meta->type() == 2) {
glm::vec3 box_pos; glm::vec3 box_pos;
#if 0 room_->frame_event.AddAirDrop(appear_time, box_id, box_pos);
frame_event.AddAirDrop(appear_time, box_id, final_box_pos);
#endif
room_->xtimer.SetTimeoutEx room_->xtimer.SetTimeoutEx
(SERVER_FRAME_RATE * appear_time / 1000.f, (SERVER_FRAME_RATE * appear_time / 1000.f,
[this, box_pos, airdrop_id, box_id] [this, box_pos, airdrop_id, box_id]

2
server/gameserver/frameevent.cc
View File

@ -13,7 +13,7 @@
#include "mt/Equip.h" #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(); cs::MFAirDrop* airdrop = room->frame_event_data->airdrops_.Add();
airdrop->set_appear_time(appear_time); airdrop->set_appear_time(appear_time);

2
server/gameserver/frameevent.h
View File

@ -13,7 +13,7 @@ struct FrameEvent
public: public:
Room* room = nullptr; 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 AddAirRaid(int appear_time, const glm::vec3& raid_pos, float raid_rad);
void AddEmote(CreatureWeakPtr& sender, int emote_id); void AddEmote(CreatureWeakPtr& sender, int emote_id);
void AddShot(CreatureWeakPtr& sender); void AddShot(CreatureWeakPtr& sender);

2
server/gameserver/roomobstacle.cc
View File

@ -468,7 +468,7 @@ void RoomObstacle::ActiveAirDrop()
} }
room->frame_event.AddAirDrop(delay_time, room->frame_event.AddAirDrop(delay_time,
appear_time, appear_time,
born_pos); born_pos.ToGlmVec3());
} }
}, },
&xtimer_attacher); &xtimer_attacher);