- if(tile_attributes & Tile::WATER) {
- start_waiting();
- movement = Vector(0, 0);
+ if ((tile_attributes & Tile::WATER) && (physic.get_velocity_y() >= 0)) {
+
+ // initialize stop position if uninitialized
+ if (stop_y == 0) stop_y = get_pos().y + get_bbox().get_height();
+
+ // stop when we have reached the stop position
+ if (get_pos().y >= stop_y) {
+ if(!frozen)
+ start_waiting();
+ movement = Vector(0, 0);
+ }
+