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 2022-12-25 13:58:20 +08:00
parent 7c2c7edc67
commit 947ba92d2e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/mt/SafeArea.h
View File

@ -11,6 +11,7 @@ namespace mt
"id") "id")
public: public:
static const SafeArea* GetByType(int type) {};
}; };
} }

10
server/gameserver/room.cc
View File

@ -1424,8 +1424,7 @@ void Room::UpdateGasMoving()
void Room::UpdateGasJump() void Room::UpdateGasJump()
{ {
//1111
#if 0
glm::vec3 len_vec = plane.dir * glm::vec3 len_vec = plane.dir *
((GetFrameNo() - GetGasData().gas_start_frameno)*airline_->plane_speed() / SERVER_FRAME_RATE); ((GetFrameNo() - GetGasData().gas_start_frameno)*airline_->plane_speed() / SERVER_FRAME_RATE);
plane.curr_pos = plane.start_point + len_vec; plane.curr_pos = plane.start_point + len_vec;
@ -1442,7 +1441,7 @@ void Room::UpdateGasJump()
} }
return true; return true;
}); });
const mt::SafeArea* first_safearea = mt::SafeArea::GetByIdByType const mt::SafeArea* first_safearea = mt::SafeArea::GetByType
(map_meta_->RandSafeArea()); (map_meta_->RandSafeArea());
gas_data_.SetGasMode(GasWaiting); gas_data_.SetGasMode(GasWaiting);
gas_data_.old_area_meta = first_safearea; gas_data_.old_area_meta = first_safearea;
@ -1461,8 +1460,8 @@ void Room::UpdateGasJump()
#endif #endif
gas_data_.pos_old_bk = gas_data_.pos_old; gas_data_.pos_old_bk = gas_data_.pos_old;
{ {
if (gas_data_.pos_list && !gas_data_.pos_list->poses.empty()) { if (gas_data_.pos_list && !gas_data_.pos_list->_poses.empty()) {
gas_data_.pos_old = gas_data_.pos_list->poses[0]; gas_data_.pos_old = gas_data_.pos_list->_poses[0];
gas_data_.pos_old_bk = gas_data_.pos_old; gas_data_.pos_old_bk = gas_data_.pos_old;
} }
bool gen_ok = GenSmallCircle(); bool gen_ok = GenSmallCircle();
@ -1483,7 +1482,6 @@ void Room::UpdateGasJump()
InitAirRaid(); InitAirRaid();
} }
} }
#endif
} }
bool Room::GenSmallCircle() bool Room::GenSmallCircle()