diff --git a/Project/Player.cc b/Project/Player.cc index 740c77b4f797993f2d923256dbd53703f1e125ed..d7820bf5b47db3275783213bc8aef725f458a1e2 100644 --- a/Project/Player.cc +++ b/Project/Player.cc @@ -3,7 +3,7 @@ Player::Player(float width, float height, float x_pos, float y_pos, float velocity) :player_size{width, height}, player_pos{x_pos, y_pos}, player{player_size}, velocity{velocity}, velocity_y{velocity}, - jumping{false}, distance{}, on_ground{true}, spawn_y_pos{y_pos} + jumping{false}, falling{false}, distance{}, on_ground{true}, spawn_y_pos{y_pos} {} sf::Vector2f Player::get_location() const @@ -31,7 +31,8 @@ void Player::check_collision(Block & b, std::string const& type) if(player_pos.y >= b.get_pos().y+b.get_size().y-10) //Hoppar in i något { on_ground = false; - velocity_y = -velocity_y; + //velocity_y = -velocity_y; + velocity_y = -1 } else if(player_pos.y <= b.get_pos().y-40) //landar på något { @@ -90,7 +91,9 @@ void Player::move(sf::Time & _delta) } else if(player_pos.y < spawn_y_pos) { - velocity_y = -velocity_y; + velocity_y = 0; jumping = true; + //falling = true; + } } diff --git a/Project/Player.h b/Project/Player.h index 99202383d7372493c401d0ee697616e1d42de6b8..bf0b46eaab70b3e3144593719533306a1e320ce8 100644 --- a/Project/Player.h +++ b/Project/Player.h @@ -24,6 +24,7 @@ private: float velocity{}; float velocity_y{}; bool jumping{}; + bool falling{}; float distance{}; bool on_ground{}; const float spawn_y_pos{}; diff --git a/Project/Player.o b/Project/Player.o index 44addc951ec2f8a19cb4d49d44ffdc1349364763..3510df90dd7bc7f26ed56769e66164f6df66f01b 100644 Binary files a/Project/Player.o and b/Project/Player.o differ diff --git a/Project/game b/Project/game index 8f57b76fb0b6fdc7e699de29386f98f8cc32e6c8..7b8b4140f4a3d05be02f2edb7eb139b1da54d441 100755 Binary files a/Project/game and b/Project/game differ