treball en curs: correccions de tidy
This commit is contained in:
@@ -9,57 +9,57 @@
|
||||
class AnimatedSprite;
|
||||
class Texture;
|
||||
|
||||
// Tipos de globo
|
||||
constexpr int BALLOON_1 = 1;
|
||||
constexpr int BALLOON_2 = 2;
|
||||
constexpr int BALLOON_3 = 3;
|
||||
constexpr int BALLOON_4 = 4;
|
||||
constexpr int HEXAGON_1 = 5;
|
||||
constexpr int HEXAGON_2 = 6;
|
||||
constexpr int HEXAGON_3 = 7;
|
||||
constexpr int HEXAGON_4 = 8;
|
||||
constexpr int POWER_BALL = 9;
|
||||
|
||||
// Puntos de globo
|
||||
constexpr int BALLOON_SCORE_1 = 50;
|
||||
constexpr int BALLOON_SCORE_2 = 100;
|
||||
constexpr int BALLOON_SCORE_3 = 200;
|
||||
constexpr int BALLOON_SCORE_4 = 400;
|
||||
|
||||
// Tamaños de globo
|
||||
constexpr int BALLOON_SIZE_1 = 1;
|
||||
constexpr int BALLOON_SIZE_2 = 2;
|
||||
constexpr int BALLOON_SIZE_3 = 3;
|
||||
constexpr int BALLOON_SIZE_4 = 4;
|
||||
|
||||
// Clases de globo
|
||||
constexpr int BALLOON_CLASS = 0;
|
||||
constexpr int HEXAGON_CLASS = 1;
|
||||
|
||||
// Velocidad del globo
|
||||
constexpr float BALLOON_VELX_POSITIVE = 0.7F;
|
||||
constexpr float BALLOON_VELX_NEGATIVE = -0.7F;
|
||||
|
||||
// Velocidades a las que se mueven los globos
|
||||
constexpr float BALLOON_SPEED_1 = 0.60F;
|
||||
constexpr float BALLOON_SPEED_2 = 0.70F;
|
||||
constexpr float BALLOON_SPEED_3 = 0.80F;
|
||||
constexpr float BALLOON_SPEED_4 = 0.90F;
|
||||
constexpr float BALLOON_SPEED_5 = 1.00F;
|
||||
|
||||
// Tamaño de los globos
|
||||
constexpr int BALLOON_WIDTH_1 = 8;
|
||||
constexpr int BALLOON_WIDTH_2 = 13;
|
||||
constexpr int BALLOON_WIDTH_3 = 21;
|
||||
constexpr int BALLOON_WIDTH_4 = 37;
|
||||
|
||||
// PowerBall
|
||||
constexpr int POWERBALL_SCREENPOWER_MINIMUM = 10;
|
||||
constexpr int POWERBALL_COUNTER = 8;
|
||||
|
||||
// Clase Balloon
|
||||
class Balloon {
|
||||
public:
|
||||
// Tipos de globo
|
||||
static constexpr int BALLOON_1 = 1;
|
||||
static constexpr int BALLOON_2 = 2;
|
||||
static constexpr int BALLOON_3 = 3;
|
||||
static constexpr int BALLOON_4 = 4;
|
||||
static constexpr int HEXAGON_1 = 5;
|
||||
static constexpr int HEXAGON_2 = 6;
|
||||
static constexpr int HEXAGON_3 = 7;
|
||||
static constexpr int HEXAGON_4 = 8;
|
||||
static constexpr int POWER_BALL = 9;
|
||||
|
||||
// Puntos de globo
|
||||
static constexpr int SCORE_1 = 50;
|
||||
static constexpr int SCORE_2 = 100;
|
||||
static constexpr int SCORE_3 = 200;
|
||||
static constexpr int SCORE_4 = 400;
|
||||
|
||||
// Tamaños de globo
|
||||
static constexpr int SIZE_1 = 1;
|
||||
static constexpr int SIZE_2 = 2;
|
||||
static constexpr int SIZE_3 = 3;
|
||||
static constexpr int SIZE_4 = 4;
|
||||
|
||||
// Clases de globo
|
||||
static constexpr int BALLOON_CLASS = 0;
|
||||
static constexpr int HEXAGON_CLASS = 1;
|
||||
|
||||
// Velocidad del globo
|
||||
static constexpr float VELX_POSITIVE = 0.7F;
|
||||
static constexpr float VELX_NEGATIVE = -0.7F;
|
||||
|
||||
// Velocidades a las que se mueven los globos
|
||||
static constexpr float SPEED_1 = 0.60F;
|
||||
static constexpr float SPEED_2 = 0.70F;
|
||||
static constexpr float SPEED_3 = 0.80F;
|
||||
static constexpr float SPEED_4 = 0.90F;
|
||||
static constexpr float SPEED_5 = 1.00F;
|
||||
|
||||
// Tamaño de los globos
|
||||
static constexpr int WIDTH_1 = 8;
|
||||
static constexpr int WIDTH_2 = 13;
|
||||
static constexpr int WIDTH_3 = 21;
|
||||
static constexpr int WIDTH_4 = 37;
|
||||
|
||||
// PowerBall
|
||||
static constexpr int POWERBALL_SCREENPOWER_MINIMUM = 10;
|
||||
static constexpr int POWERBALL_COUNTER = 8;
|
||||
|
||||
Balloon(float x, float y, Uint8 kind, float velx, float speed, Uint16 creationtimer, Texture *texture, std::vector<std::string> *animation, SDL_Renderer *renderer); // Constructor
|
||||
~Balloon(); // Destructor
|
||||
|
||||
|
||||
Reference in New Issue
Block a user