Progresos con las rampas

This commit is contained in:
2022-09-06 20:37:39 +02:00
parent 066a9ab811
commit 9af135100c
7 changed files with 89 additions and 38 deletions

View File

@@ -21,11 +21,10 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
// Crea los objetos
scoreboard = new ScoreBoard(renderer, asset, &playerLives, &itemsPicked, &clock);
itemTracker = new ItemTracker();
room = new Room(asset->get(currentRoom), renderer, screen, asset, itemTracker, &itemsPicked);
room = new Room(asset->get(currentRoom), renderer, screen, asset, itemTracker, &itemsPicked, debug);
player = new Player(spawnPoint, asset->get("player01.png"), asset->get("player01.ani"), renderer, asset, input, room, debug);
eventHandler = new SDL_Event();
text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer);
debugText = new Text(asset->get("debug.png"), asset->get("debug.txt"), renderer);
music = JA_LoadMusic(asset->get("game.ogg").c_str());
// Inicializa el resto de variables
@@ -51,25 +50,11 @@ Game::~Game()
// Libera la memoria de los objetos
delete scoreboard;
scoreboard = nullptr;
delete itemTracker;
itemTracker = nullptr;
delete room;
room = nullptr;
delete player;
player = nullptr;
delete eventHandler;
eventHandler = nullptr;
delete text;
text = nullptr;
delete debugText;
debugText = nullptr;
}
// Comprueba los eventos de la cola
@@ -273,7 +258,7 @@ bool Game::changeRoom(std::string file)
room = nullptr;
// Crea un objeto habitación nuevo a partir del fichero
room = new Room(asset->get(file), renderer, screen, asset, itemTracker, &itemsPicked);
room = new Room(asset->get(file), renderer, screen, asset, itemTracker, &itemsPicked, debug);
// Pasa la nueva habitación al jugador
player->setRoom(room);
@@ -331,7 +316,7 @@ void Game::killPlayer()
delete player;
// Crea la nueva habitación y el nuevo jugador
room = new Room(asset->get(currentRoom), renderer, screen, asset, itemTracker, &itemsPicked);
room = new Room(asset->get(currentRoom), renderer, screen, asset, itemTracker, &itemsPicked, debug);
player = new Player(spawnPoint, asset->get("player01.png"), asset->get("player01.ani"), renderer, asset, input, room, debug);
}