revert a previous commit
This commit is contained in:
parent
7edf1bf0fd
commit
cdda33f786
|
|
@ -9,7 +9,6 @@
|
|||
#include <imgui-SFML.h>
|
||||
#include <imgui.h>
|
||||
|
||||
|
||||
struct Ball
|
||||
{
|
||||
Ball(sf::Vector2f position_in, sf::Vector2f vel_in);
|
||||
|
|
@ -17,8 +16,8 @@ struct Ball
|
|||
sf::Vector2f pos;
|
||||
sf::Vector2f velocity;
|
||||
sf::Vector2f previousPos{};
|
||||
bool alive{};
|
||||
bool collided{};
|
||||
bool alive{true};
|
||||
bool collided{false};
|
||||
};
|
||||
|
||||
struct Brick
|
||||
|
|
@ -26,7 +25,7 @@ struct Brick
|
|||
Brick(sf::Vector2f position_in);
|
||||
|
||||
sf::Vector2f pos;
|
||||
bool alive{};
|
||||
bool alive{true};
|
||||
};
|
||||
|
||||
struct Player
|
||||
|
|
@ -37,10 +36,10 @@ struct Player
|
|||
sf::Vector2f pos{};
|
||||
sf::Vector2f previousPos{};
|
||||
int score{};
|
||||
int lives{};
|
||||
int mult{};
|
||||
bool left{};
|
||||
bool right{};
|
||||
int lives{3};
|
||||
int mult{1};
|
||||
bool left{false};
|
||||
bool right{false};
|
||||
};
|
||||
|
||||
class Game
|
||||
|
|
|
|||
|
|
@ -14,21 +14,14 @@
|
|||
Ball::Ball(sf::Vector2f position_in, sf::Vector2f vel_in)
|
||||
: pos(position_in)
|
||||
, velocity(vel_in)
|
||||
, alive(true)
|
||||
, collided(false)
|
||||
{ }
|
||||
|
||||
Brick::Brick(sf::Vector2f position_in)
|
||||
: pos(position_in)
|
||||
, alive(true)
|
||||
{ }
|
||||
|
||||
Player::Player(sf::Vector2f position_in)
|
||||
: pos(position_in)
|
||||
, lives(3)
|
||||
, mult(1)
|
||||
, left(false)
|
||||
, right{false}
|
||||
{ }
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue