Browse Source

把update放到cpp中

chensongchao 5 years ago
parent
commit
aaae5765dc
2 changed files with 19 additions and 16 deletions
  1. 18 6
      area.cpp
  2. 1 10
      area.h

+ 18 - 6
area.cpp

@@ -84,12 +84,24 @@ area::area(int id,int limit_count_person, int limit_time_person,double scale,int
      ,m_vehicle_show_count(0)
 	 ,m_frozen_count(0)
      ,m_is_work_area(0)
-    {
-		m_default_limit_person_count = limit_count_person;
-		m_area_business_list=area_business::get_instance_list(m_biz_type,id);
-		m_persons_thre_time = std::make_shared<area_persons_thre_time>();
-		m_persons_thre_time->set_default_person_count_limit(limit_count_person);
-    }
+{
+    m_default_limit_person_count = limit_count_person;
+    m_area_business_list=area_business::get_instance_list(m_biz_type,id);
+    m_persons_thre_time = std::make_shared<area_persons_thre_time>();
+    m_persons_thre_time->set_default_person_count_limit(limit_count_person);
+}
+
+void  area::update(int limit_count_person, int limit_time_person,double scale,int32_t mapid, int limit_count_vehicle, int limit_time_vehicle)
+{
+    m_limit_person_min=limit_time_person;
+    m_default_limit_person_count=limit_count_person;
+    m_persons_thre_time->set_default_person_count_limit(limit_count_person);
+    m_scale=scale;
+    m_mapid=mapid;
+    m_limit_vehicle_count=limit_count_vehicle;
+    m_limit_vehicle_min=limit_time_vehicle;
+}
+
 void area::clear()
 {
     EVENT_TYPE ev = is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;

+ 1 - 10
area.h

@@ -59,16 +59,7 @@ struct area
     virtual ~area()
     {}
     double get_speed(int vehicle_category_id) {return m_speed[vehicle_category_id];}
-    void  update(int limit_count_person, int limit_time_person,double scale,int32_t mapid, int limit_count_vehicle, int limit_time_vehicle)
-    {
-        m_limit_person_min=limit_time_person;
-        m_default_limit_person_count=limit_count_person;
-        m_persons_thre_time->set_default_person_count_limit(limit_count_person);
-        m_scale=scale;
-        m_mapid=mapid;
-        m_limit_vehicle_count=limit_count_vehicle;
-        m_limit_vehicle_min=limit_time_vehicle;
-    }
+    void  update(int limit_count_person, int limit_time_person,double scale,int32_t mapid, int limit_count_vehicle, int limit_time_vehicle);
 public:
 
 	void set_business_list(std::vector<area_business*>&&business_list)