code reorganized

This commit is contained in:
2021-02-26 17:51:46 +01:00
parent 190f1e9a47
commit 765b64c29c
31 changed files with 3111 additions and 2547 deletions

View File

@@ -6,6 +6,7 @@ Player::Player()
{
mSpriteLegs = new AnimatedSprite();
mSpriteBody = new AnimatedSprite();
mSpriteHead = new AnimatedSprite();
init(0, 0, nullptr, nullptr, nullptr);
}
@@ -17,6 +18,7 @@ Player::~Player()
mSpriteBody = nullptr;
delete mSpriteLegs;
delete mSpriteBody;
delete mSpriteHead;
}
// Iniciador
@@ -27,8 +29,9 @@ void Player::init(float x, int y, LTexture *textureLegs, LTexture *textureBody,
mStatusWalking = PLAYER_STATUS_WALKING_STOP;
mStatusFiring = PLAYER_STATUS_FIRING_NO;
mInvulnerable = false;
mInvulnerableTimer = PLAYER_INVULNERABLE_TIMER;
mInvulnerableCounter = PLAYER_INVULNERABLE_COUNTER;
mExtraHit = false;
mCoffees = 0;
// Establece la altura y el ancho del jugador
mWidth = 3 * BLOCK;
@@ -51,12 +54,8 @@ void Player::init(float x, int y, LTexture *textureLegs, LTexture *textureBody,
// Establece la velocidad base
mBaseSpeed = 1.5;
// Establece el numero inicial de vidas
mStartingLives = 3;
mLives = mStartingLives;
// Establece la puntuación inicial
mScore = 0;
mScore = 9500;
// Establece el multiplicador de puntos inicial
mScoreMultiplier = 1.0f;
@@ -331,7 +330,7 @@ void Player::render()
{
if (mInvulnerable)
{
if ((mInvulnerableTimer % 10) > 4)
if ((mInvulnerableCounter % 10) > 4)
{
mSpriteLegs->render();
mSpriteBody->render();
@@ -694,26 +693,26 @@ void Player::setInvulnerable(bool value)
// Obtiene el valor de la variable
bool Player::getInvulnerableTimer()
{
return mInvulnerableTimer;
return mInvulnerableCounter;
}
// Establece el valor de la variable
void Player::setInvulnerableTimer(Uint16 value)
{
mInvulnerableTimer = value;
mInvulnerableCounter = value;
}
// Actualiza el valor de la variable
void Player::updateInvulnerableTimer()
{
if (mInvulnerableTimer > 0)
if (mInvulnerableCounter > 0)
{
--mInvulnerableTimer;
--mInvulnerableCounter;
}
else
{
mInvulnerable = false;
mInvulnerableTimer = PLAYER_INVULNERABLE_TIMER;
mInvulnerableCounter = PLAYER_INVULNERABLE_COUNTER;
}
}
@@ -734,7 +733,7 @@ void Player::removeExtraHit()
{
mExtraHit = false;
mInvulnerable = true;
mInvulnerableTimer = PLAYER_INVULNERABLE_TIMER;
mInvulnerableCounter = PLAYER_INVULNERABLE_COUNTER;
}
// Obtiene el circulo de colisión