解决冲突

area.cpp

@@ -91,17 +91,6 @@ void area::on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<ca
 	}
 }
 
-void area::on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c)
-{
-	a->m_enter_time=tool_time::now_to_ms();
-	a->m_enter_point=*c;
-	for(const auto &i:m_area_business_list)
-	{
-		auto &x=a->get_business_data(i->area_business_type());
-		i->on_load_his(a,c,x);
-	}
-}
-
 void area::on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c)
 {
 	log_info("on_enter..%d  areaId:%d",c->m_id,m_id);

area.h

@@ -25,12 +25,10 @@ struct area
 {
     area(int id,int limit_count_person, int limit_time_person,double scale,int32_t mapid,int32_t type);
 
-    //服务器重启加载数据
-    virtual void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c);
   	virtual void on_hover(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c);
 	virtual	void on_enter(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c);
     virtual	void on_leave(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c);
-
+    //服务器重启加载数据
     virtual	void on_load_his(const std::shared_ptr<area_hover>&a,const std::shared_ptr<card_location_base>&c);
 
     virtual bool in_area(const std::shared_ptr<site>&s,const std::shared_ptr<card_location_base>&c, const point & p,int &);