JailDoctor/jdd_opendingux
1
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Issues Pull Requests Projects Releases Wiki Activity

Trabajando en el marcador

Browse Source
This commit is contained in:
Sergio
2022-08-31 22:40:22 +02:00
parent 0087815ced
commit 62e9a2ad2a
7 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/game.cpp
View File

@@ -15,9 +15,9 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input)
this->input = input;
// Crea los objetos
scoreboard = new ScoreBoard(renderer, asset);
scoreboard = new ScoreBoard(renderer, asset, &playerLives, &itemsPicked);
itemTracker = new ItemTracker();
room = new Room(asset->get(currentRoom), renderer, asset, itemTracker);
room = new Room(asset->get(currentRoom), renderer, asset, itemTracker,&itemsPicked);
player = new Player(spawnPoint, asset->get("player01.png"), asset->get("player01.ani"), renderer, asset, input, room);
eventHandler = new SDL_Event();
text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer);
@@ -27,6 +27,8 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input)
// Inicializa variables
ticks = 0;
ticksSpeed = 15;
playerLives = 9;
itemsPicked = 0;
section.name = SECTION_PROG_GAME;
section.subsection = SUBSECTION_GAME_PLAY;
@@ -239,7 +241,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, asset, itemTracker);
room = new Room(asset->get(file), renderer, asset, itemTracker, &itemsPicked);
success = true;
}
@@ -381,11 +383,13 @@ void Game::checkPlayerAndItems()
// Mata al jugador
void Game::killPlayer()
{
playerLives--;
// Destruye la habitacion y el jugador
delete room;
delete player;
// Crea la nueva habitación y el nuevo jugador
room = new Room(asset->get(currentRoom), renderer, asset, itemTracker);
room = new Room(asset->get(currentRoom), renderer, asset, itemTracker, &itemsPicked);
player = new Player(spawnPoint, asset->get("player01.png"), asset->get("player01.ani"), renderer, asset, input, room);
}