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

1

Browse Source
This commit is contained in:
aozhiwei 2019-03-26 15:33:54 +08:00
parent 24c8d74094
commit c5cdc0a954
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/bullet.cc
View File

@ -27,7 +27,7 @@ void Bullet::Initialize()
void Bullet::Update(int delta_time) void Bullet::Update(int delta_time)
{ {
movement->Update(delta_time); movement->Update(delta_time);
pos = pos + dir; pos = pos + dir * gun_meta->i->bullet_speed();
std::vector<Entity*> objects; std::vector<Entity*> objects;
int detection_flags = 0; int detection_flags = 0;
{ {

4
server/gameserver/player.cc
View File

@ -177,7 +177,7 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
} }
shot_start = msg.shot_start(); shot_start = msg.shot_start();
shot_hold = msg.shot_hold(); shot_hold = msg.shot_hold();
if (shot_hold) { if (!shot_hold) {
series_shot_frames = 0; series_shot_frames = 0;
} }
} }
@ -225,6 +225,8 @@ void Player::MakeUpdateMsg()
for (auto& obj_uniid : room->frame_data.deleted_objects) { for (auto& obj_uniid : room->frame_data.deleted_objects) {
update_msg->add_del_objids(obj_uniid); update_msg->add_del_objids(obj_uniid);
} }
*update_msg->mutable_shots() = room->frame_data.shots;
*update_msg->mutable_bullets() = room->frame_data.bullets;
for (auto& itr : new_objects) { for (auto& itr : new_objects) {
itr->FillMFObjectFull(update_msg->add_full_objects()); itr->FillMFObjectFull(update_msg->add_full_objects());
#if 0 #if 0