|
@@ -69,7 +69,7 @@ struct special_area:area
|
|
area::area(int id,int limit_count_person, int limit_time_person,double scale,int32_t mapid,int32_t type)
|
|
area::area(int id,int limit_count_person, int limit_time_person,double scale,int32_t mapid,int32_t type)
|
|
:m_id(id)
|
|
:m_id(id)
|
|
,m_area_type(type)
|
|
,m_area_type(type)
|
|
- ,m_limit_person_second(limit_time_person)
|
|
|
|
|
|
+ ,m_limit_person_min(limit_time_person)
|
|
,m_limit_person_count(limit_count_person)
|
|
,m_limit_person_count(limit_count_person)
|
|
,m_scale(scale)
|
|
,m_scale(scale)
|
|
,m_mapid(mapid)
|
|
,m_mapid(mapid)
|
|
@@ -429,7 +429,7 @@ void area_list::init_from_db(int id/*=-1*/)
|
|
if(-1 == id)
|
|
if(-1 == id)
|
|
{
|
|
{
|
|
std::shared_ptr<area> ap = create(area_type_id,area_id,over_count_person,over_time_person, scale,map_id,b_type);
|
|
std::shared_ptr<area> ap = create(area_type_id,area_id,over_count_person,over_time_person, scale,map_id,b_type);
|
|
- ap->m_limit_vehicle_second = over_time_vehicle;
|
|
|
|
|
|
+ ap->m_limit_vehicle_min = over_time_vehicle;
|
|
ap->m_limit_vehicle_count = over_count_vehicle;
|
|
ap->m_limit_vehicle_count = over_count_vehicle;
|
|
ap->m_speed=std::move(map_);
|
|
ap->m_speed=std::move(map_);
|
|
ap->m_is_work_area = is_work_area;
|
|
ap->m_is_work_area = is_work_area;
|