X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplatform.cpp;h=258a5864e65529d9e3442b017845f0119f77ee4f;hb=HEAD;hp=7c38238b1315b3ad7f47b34fd1c73223c51938ed;hpb=0b73428a8a9e9563cb196e4b13167de3ec5f6b02;p=supertux.git diff --git a/src/object/platform.cpp b/src/object/platform.cpp index 7c38238b1..258a5864e 100644 --- a/src/object/platform.cpp +++ b/src/object/platform.cpp @@ -24,12 +24,12 @@ #include "util/reader.hpp" Platform::Platform(const Reader& reader) : - MovingSprite(reader, Vector(0,0), LAYER_OBJECTS, COLGROUP_STATIC), + MovingSprite(reader, Vector(0,0), LAYER_OBJECTS, COLGROUP_STATIC), path(), walker(), - speed(Vector(0,0)), - automatic(false), - player_contact(false), + speed(Vector(0,0)), + automatic(false), + player_contact(false), last_player_contact(false) { bool running = true; @@ -47,11 +47,11 @@ Platform::Platform(const Reader& reader) : /* Platform::Platform(const Platform& other) : - MovingSprite(other), - ScriptInterface(other), - speed(other.speed), - automatic(other.automatic), - player_contact(false), + MovingSprite(other), + ScriptInterface(other), + speed(other.speed), + automatic(other.automatic), + player_contact(false), last_player_contact(false) { name = other.name; @@ -79,7 +79,7 @@ Platform::update(float elapsed_time) // Travel to node nearest to nearest player // FIXME: does not really use nearest player - Player* player = 0; + Player* player = 0; std::vector players = Sector::current()->get_players(); for (std::vector::iterator playerIter = players.begin(); playerIter != players.end(); ++playerIter) { player = *playerIter; @@ -90,7 +90,7 @@ Platform::update(float elapsed_time) goto_node(nearest_node_id); } } - } + } if (player_contact && !last_player_contact && !walker->is_moving()) { // Player touched platform, didn't touch last frame and Platform is not moving @@ -99,7 +99,7 @@ Platform::update(float elapsed_time) int farthest_node_id = path->get_farthest_node_no(get_pos()); if (farthest_node_id != -1) { goto_node(farthest_node_id); - } + } } // Clear player_contact flag set by collision() method