diff --git a/source/director.cpp b/source/director.cpp index b4af0c2..395e26b 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -70,7 +70,7 @@ void Director::initOptions() options.windowSizePrevious = 0; } -// Inicializa las variables del juego +// Inicializa las variables y crea los objetos del juego void Director::initGame() { // Variables @@ -88,7 +88,7 @@ void Director::initGame() map = new Map(renderer, asset->get("volcano.map"), asset); } -// Limpia las variables del juego +// Destruye los objetos del juego void Director::quitGame() { // Player diff --git a/source/director.h b/source/director.h index f78c1ee..10704b2 100644 --- a/source/director.h +++ b/source/director.h @@ -72,10 +72,10 @@ private: // Inicializa las variables de las opciones void initOptions(); - // Inicializa las variables del juego + // Inicializa las variables y crea los objetos del juego void initGame(); - // Limpia las variables del juego + // Destruye los objetos del juego void quitGame(); // Arranca SDL y crea la ventana diff --git a/source/player.cpp b/source/player.cpp index 94e01a7..2738422 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -4,17 +4,41 @@ // Constructor Player::Player(SDL_Renderer *renderer, Asset *asset) { + this->asset = asset; + texture = new LTexture(); loadTextureFromFile(texture, asset->get("player.png"), renderer); - sprite = new AnimatedSprite(); - sprite->setTexture(texture); - sprite->setRenderer(renderer); + sprite = new AnimatedSprite(texture, renderer); + rect = {0, 0, 16, 24}; sprite->setSpriteClip(rect); - this->asset = asset; - - init(); + // Inicializa todas las variables + can_jump = false; + enabled = false; + jump_pressed_before = false; + jump_pressed_now = false; + for (Uint8 i = 0; i < 6; i++) + key[i] = false; + standing = false; + was_on_background = false; + + coins = 0; + cooldown = 0; + jumpforce = 0; + respawn_x = 0; + respawn_y = 0; + speed_x = 0; + speed_y = 0; + + sound_coin = 0; + sound_death = 0; + sound_jump = 0; + + active_animation = 0; + direction = 0; + lifes = 0; + respawn_direction = 0; } // Destructor @@ -28,43 +52,6 @@ Player::~Player() sprite = nullptr; } -// Inicializa todas las variables -void Player::init() -{ - rect = {0, 0, 16, 24}; - - can_jump = false; - enabled = false; - jump_pressed_before = false; - jump_pressed_now = false; - for (Uint8 i = 0; i < 6; i++) - key[i] = false; - standing = false; - was_on_background = false; - - coins = 0; - cooldown = 0; - jumpforce = 0; - respawn_x = 0; - respawn_y = 0; - speed_x = 0; - speed_y = 0; - - sound_coin = 0; - sound_death = 0; - sound_jump = 0; - - active_animation = 0; - direction = 0; - lifes = 0; - respawn_direction = 0; -} - -// Resetea ciertas variables -void Player::reset() -{ -} - // Actualiza todas las variables void Player::update() { diff --git a/source/player.h b/source/player.h index fcf109b..e18599c 100644 --- a/source/player.h +++ b/source/player.h @@ -44,12 +44,6 @@ public: // Destructor ~Player(); - // Inicializa todas las variables - void init(); - - // Resetea ciertas variables - void reset(); - // Actualiza todas las variables void update();