Singletonejant

Borrat menu.cpp que no estava gastantse...mmm.. desde mai
This commit is contained in:
2025-02-22 18:27:23 +01:00
parent e361d295c1
commit fc01676df2
38 changed files with 440 additions and 1751 deletions

View File

@@ -12,10 +12,16 @@
#include "text.h" // Para Text, TXT_CENTER, TXT_COLOR
#include "utils.h" // Para color_t, stringToColor, options_t, secti...
#include "options.h"
class Debug;
#include "debug.h"
// Constructor
Demo::Demo(Resource *resource, Debug *debug)
Demo::Demo()
: screen(Screen::get()),
renderer(Screen::get()->getRenderer()),
resource(Resource::get()),
asset(Asset::get()),
input(Input::get()),
debug(Debug::get())
{
// Inicia algunas variables
board.iniClock = SDL_GetTicks();
@@ -31,18 +37,10 @@ Demo::Demo(Resource *resource, Debug *debug)
roomIndex = 0;
currentRoom = rooms[roomIndex];
// Copia los punteros
this->resource = resource;
this->screen = Screen::get();
this->renderer = Screen::get()->getRenderer();
this->asset = Asset::get();
this->input = Input::get();
this->debug = debug;
// Crea los objetos
itemTracker = new ItemTracker();
scoreboard = new ScoreBoard(renderer, resource, asset, &board);
room = new Room(resource->getRoom(currentRoom), renderer, screen, asset, itemTracker, &board.items, false, debug);
scoreboard = new Scoreboard(&board);
room = new Room(resource->getRoom(currentRoom), itemTracker, &board.items, false);
eventHandler = new SDL_Event();
text = new Text(resource->getOffset("smb2.txt"), resource->getTexture("smb2.png"), renderer);
@@ -162,8 +160,7 @@ void Demo::update()
screen->updateFX();
checkRoomChange();
// Actualiza las notificaciones
screen->updateNotifier();
screen->update();
}
}
@@ -242,7 +239,7 @@ bool Demo::changeRoom(std::string file)
room = nullptr;
// Crea un objeto habitación nuevo a partir del fichero
room = new Room(resource->getRoom(file), renderer, screen, asset, itemTracker, &board.items, false, debug);
room = new Room(resource->getRoom(file), itemTracker, &board.items, false);
// Pone el color del marcador en función del color del borde de la habitación
setScoreBoardColor();