Singletonejant

Borrat menu.cpp que no estava gastantse...mmm.. desde mai

source/scoreboard.cpp

@@ -7,17 +7,17 @@
 #include "text.h"           // Para Text
 #include "texture.h"        // Para Texture
 #include "options.h"
+#include "screen.h"
+#include "asset.h"
 class Asset;
 
 // Constructor
-ScoreBoard::ScoreBoard(SDL_Renderer *renderer, Resource *resource, Asset *asset, board_t *board)
+Scoreboard::Scoreboard(board_t *board)
+    : renderer(Screen::get()->getRenderer()),
+      resource(Resource::get()),
+      asset(Asset::get()),
+      board(board)
 {
-    // Obten punteros a objetos
-    this->renderer = renderer;
-    this->resource = resource;
-    this->asset = asset;
-    this->board = board;
-
     // Reserva memoria para los objetos
     itemTexture = resource->getTexture("items.png");
     const std::string playerANI = options.cheat.altSkin ? "player2.ani" : "player.ani";
@@ -42,14 +42,14 @@ ScoreBoard::ScoreBoard(SDL_Renderer *renderer, Resource *resource, Asset *asset,
 }
 
 // Destructor
-ScoreBoard::~ScoreBoard()
+Scoreboard::~Scoreboard()
 {
     delete sprite;
     delete text;
 }
 
 // Pinta el objeto en pantalla
-void ScoreBoard::render()
+void Scoreboard::render()
 {
     // Anclas
     const int line1 = 19 * BLOCK;
@@ -96,7 +96,7 @@ void ScoreBoard::render()
 }
 
 // Actualiza las variables del objeto
-void ScoreBoard::update()
+void Scoreboard::update()
 {
     counter++;
     sprite->update();
@@ -111,7 +111,7 @@ void ScoreBoard::update()
 }
 
 // Obtiene el tiempo transcurrido de partida
-ScoreBoard::clock_t ScoreBoard::getTime()
+Scoreboard::clock_t Scoreboard::getTime()
 {
     const Uint32 timeElapsed = SDL_GetTicks() - board->iniClock - totalTimePaused;
 
@@ -125,7 +125,7 @@ ScoreBoard::clock_t ScoreBoard::getTime()
 }
 
 // Recarga la textura
-void ScoreBoard::reLoadTexture()
+void Scoreboard::reLoadTexture()
 {
     sprite->getTexture()->reLoad();
     // playerTexture->reLoad();
@@ -134,7 +134,7 @@ void ScoreBoard::reLoadTexture()
 }
 
 // Recarga la paleta
-void ScoreBoard::reLoadPalette()
+void Scoreboard::reLoadPalette()
 {
     // Reinicia el vector de colores
     const std::vector<std::string> vColors = {"blue", "magenta", "green", "cyan", "yellow", "white", "bright_blue", "bright_magenta", "bright_green", "bright_cyan", "bright_yellow", "bright_white"};
@@ -146,21 +146,21 @@ void ScoreBoard::reLoadPalette()
 }
 
 // Pone el marcador en modo pausa
-void ScoreBoard::pause()
+void Scoreboard::pause()
 {
     paused = true;
     timePaused = SDL_GetTicks();
 }
 
 // Quita el modo pausa del marcador
-void ScoreBoard::resume()
+void Scoreboard::resume()
 {
     paused = false;
     totalTimePaused += SDL_GetTicks() - timePaused;
 }
 
 // Actualiza el color de la cantidad de items recogidos
-void ScoreBoard::updateItemsColor()
+void Scoreboard::updateItemsColor()
 {
     if (!board->jailEnabled)
     {
@@ -178,7 +178,7 @@ void ScoreBoard::updateItemsColor()
 }
 
 // Devuelve la cantidad de minutos de juego transcurridos
-int ScoreBoard::getMinutes()
+int Scoreboard::getMinutes()
 {
     return getTime().minutes;
 }