summaryrefslogtreecommitdiff
path: root/scene/2d
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-02-15 01:19:46 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-02-15 01:21:26 -0300
commit2185c018f6593e6d64b2beb62202d2291e2e008e (patch)
treeb6f57e0a20ff3d0432e6ac6eb809bc34ca8eefa0 /scene/2d
parent7ebb224ec1d81ccd62b77f21f01f5267220aee09 (diff)
begin new serialization framework
also got rid of STL dependency on triangulator
Diffstat (limited to 'scene/2d')
-rw-r--r--scene/2d/navigation_polygon.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/2d/navigation_polygon.cpp b/scene/2d/navigation_polygon.cpp
index 570a5b95b0..fc69ea8a0d 100644
--- a/scene/2d/navigation_polygon.cpp
+++ b/scene/2d/navigation_polygon.cpp
@@ -113,7 +113,7 @@ void NavigationPolygon::clear_outlines(){
}
void NavigationPolygon::make_polygons_from_outlines(){
- std::list<TriangulatorPoly> in_poly,out_poly;
+ List<TriangulatorPoly> in_poly,out_poly;
Vector2 outside_point(-1e10,-1e10);
@@ -194,9 +194,9 @@ void NavigationPolygon::make_polygons_from_outlines(){
vertices.resize(0);
Map<Vector2,int> points;
- for(std::list<TriangulatorPoly>::iterator I = out_poly.begin();I!=out_poly.end();I++) {
+ for(List<TriangulatorPoly>::Element*I = out_poly.front();I;I=I->next()) {
- TriangulatorPoly& tp = *I;
+ TriangulatorPoly& tp = I->get();
struct Polygon p;