diff --git a/server/gameserver/mt/SafeArea.h b/server/gameserver/mt/SafeArea.h index f25395de..f783b16c 100644 --- a/server/gameserver/mt/SafeArea.h +++ b/server/gameserver/mt/SafeArea.h @@ -11,6 +11,7 @@ namespace mt "id") public: + static const SafeArea* GetByType(int type) {}; }; } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 724e8506..56d082f7 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1424,8 +1424,7 @@ void Room::UpdateGasMoving() void Room::UpdateGasJump() { - //1111 - #if 0 + glm::vec3 len_vec = plane.dir * ((GetFrameNo() - GetGasData().gas_start_frameno)*airline_->plane_speed() / SERVER_FRAME_RATE); plane.curr_pos = plane.start_point + len_vec; @@ -1442,7 +1441,7 @@ void Room::UpdateGasJump() } return true; }); - const mt::SafeArea* first_safearea = mt::SafeArea::GetByIdByType + const mt::SafeArea* first_safearea = mt::SafeArea::GetByType (map_meta_->RandSafeArea()); gas_data_.SetGasMode(GasWaiting); gas_data_.old_area_meta = first_safearea; @@ -1461,8 +1460,8 @@ void Room::UpdateGasJump() #endif gas_data_.pos_old_bk = gas_data_.pos_old; { - if (gas_data_.pos_list && !gas_data_.pos_list->poses.empty()) { - gas_data_.pos_old = gas_data_.pos_list->poses[0]; + 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_bk = gas_data_.pos_old; } bool gen_ok = GenSmallCircle(); @@ -1483,7 +1482,6 @@ void Room::UpdateGasJump() InitAirRaid(); } } - #endif } bool Room::GenSmallCircle()