X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplatform.cpp;h=4151cc541c7ba67aa9f763711ac65800c5c69092;hb=75acd4b141f45e851a492f089aa9ad24a9552409;hp=c6a2da656213c2e57abca593fa32ca98f0f256f5;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git diff --git a/src/object/platform.cpp b/src/object/platform.cpp index c6a2da656..4151cc541 100644 --- a/src/object/platform.cpp +++ b/src/object/platform.cpp @@ -36,9 +36,9 @@ #include "sector.hpp" Platform::Platform(const lisp::Lisp& reader) - : MovingSprite(reader, Vector(0,0), LAYER_OBJECTS, COLGROUP_STATIC), - speed(Vector(0,0)), - automatic(false), player_contact(false), last_player_contact(false) + : MovingSprite(reader, Vector(0,0), LAYER_OBJECTS, COLGROUP_STATIC), + speed(Vector(0,0)), + automatic(false), player_contact(false), last_player_contact(false) { bool running = true; reader.get("name", name); @@ -54,9 +54,9 @@ Platform::Platform(const lisp::Lisp& reader) } Platform::Platform(const Platform& other) - : MovingSprite(other), ScriptInterface(other), - speed(other.speed), - automatic(other.automatic), player_contact(false), last_player_contact(false) + : MovingSprite(other), ScriptInterface(other), + speed(other.speed), + automatic(other.automatic), player_contact(false), last_player_contact(false) { name = other.name; path.reset(new Path(*other.path)); @@ -85,13 +85,13 @@ Platform::update(float elapsed_time) Player* player = 0; std::vector players = Sector::current()->get_players(); for (std::vector::iterator playerIter = players.begin(); playerIter != players.end(); ++playerIter) { - player = *playerIter; + player = *playerIter; } if (player) { - int nearest_node_id = path->get_nearest_node_no(player->get_bbox().p2); - if (nearest_node_id != -1) { - goto_node(nearest_node_id); - } + int nearest_node_id = path->get_nearest_node_no(player->get_bbox().p2); + if (nearest_node_id != -1) { + goto_node(nearest_node_id); + } } } @@ -101,7 +101,7 @@ Platform::update(float elapsed_time) // Travel to node farthest from current position int farthest_node_id = path->get_farthest_node_no(get_pos()); if (farthest_node_id != -1) { - goto_node(farthest_node_id); + goto_node(farthest_node_id); } }