|
@@ -17,6 +17,7 @@
|
|
|
#include "mine.h"
|
|
|
#include "common_tool.h"
|
|
|
#include "ant.h"
|
|
|
+#include "area.h"
|
|
|
|
|
|
extern config_file config;
|
|
|
|
|
@@ -63,8 +64,8 @@ void card_location_base::on_message(zloop<task*> * loop,const message_locinfo&lo
|
|
|
else
|
|
|
{
|
|
|
auto area_tool=get_area_tool();
|
|
|
- area_tool->set(*site_ptr);
|
|
|
- area_tool->on_point(std::shared_from_this(),point(1,1));
|
|
|
+ area_tool->set(site_ptr);
|
|
|
+ area_tool->on_point(shared_from_this(),point(1,1));
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -79,7 +80,9 @@ void card_location_base::upt_card_pos(YA::_CARD_POS_&cp, point &pt)
|
|
|
pt=_p;
|
|
|
}
|
|
|
else
|
|
|
- _p=pt;
|
|
|
+ {
|
|
|
+ _p=pt;
|
|
|
+ }
|
|
|
cp.x = tool_other::round(_p.x,3);
|
|
|
cp.y = tool_other::round(_p.y,3);
|
|
|
//cp.z = pt.z;
|