neteja final tidy/cppcheck: const*, static, renames de constants
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
#include "core/rendering/text.h" // for Text, TXT_CENTER, TXT_COLOR, TXT_SHADOW
|
||||
#include "core/rendering/texture.h" // for Texture
|
||||
#include "core/resources/resource.h"
|
||||
#include "game/defaults.hpp" // for shdwTxtColor, GAMECANVAS_CENTER_X, GAME...
|
||||
#include "game/defaults.hpp" // for GAMECANVAS_CENTER_X, GAME...
|
||||
#include "utils/utils.h" // for Color, Section
|
||||
|
||||
// Constructor
|
||||
@@ -113,25 +113,25 @@ void Instructions::render() {
|
||||
|
||||
// Pinta en el backbuffer el texto y los sprites
|
||||
SDL_SetRenderTarget(renderer_, backbuffer_);
|
||||
SDL_SetRenderDrawColor(renderer_, bgColor.r, bgColor.g, bgColor.b, 255);
|
||||
SDL_SetRenderDrawColor(renderer_, BG_COLOR.r, BG_COLOR.g, BG_COLOR.b, 255);
|
||||
SDL_RenderClear(renderer_);
|
||||
|
||||
// Escribe el texto
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 8, Lang::get()->getText(11), 1, ORANGE_COLOR, 1, shdwTxtColor);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 24, Lang::get()->getText(12), 1, noColor, 1, shdwTxtColor);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 34, Lang::get()->getText(13), 1, noColor, 1, shdwTxtColor);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 48, Lang::get()->getText(14), 1, noColor, 1, shdwTxtColor);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 58, Lang::get()->getText(15), 1, noColor, 1, shdwTxtColor);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 75, Lang::get()->getText(16), 1, ORANGE_COLOR, 1, shdwTxtColor);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 8, Lang::get()->getText(11), 1, ORANGE_COLOR, 1, SHADOW_COLOR);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 24, Lang::get()->getText(12), 1, NO_COLOR, 1, SHADOW_COLOR);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 34, Lang::get()->getText(13), 1, NO_COLOR, 1, SHADOW_COLOR);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 48, Lang::get()->getText(14), 1, NO_COLOR, 1, SHADOW_COLOR);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 58, Lang::get()->getText(15), 1, NO_COLOR, 1, SHADOW_COLOR);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, 75, Lang::get()->getText(16), 1, ORANGE_COLOR, 1, SHADOW_COLOR);
|
||||
|
||||
text_->writeShadowed(84, 92, Lang::get()->getText(17), shdwTxtColor);
|
||||
text_->writeShadowed(84, 108, Lang::get()->getText(18), shdwTxtColor);
|
||||
text_->writeShadowed(84, 124, Lang::get()->getText(19), shdwTxtColor);
|
||||
text_->writeShadowed(84, 140, Lang::get()->getText(20), shdwTxtColor);
|
||||
text_->writeShadowed(84, 156, Lang::get()->getText(21), shdwTxtColor);
|
||||
text_->writeShadowed(84, 92, Lang::get()->getText(17), SHADOW_COLOR);
|
||||
text_->writeShadowed(84, 108, Lang::get()->getText(18), SHADOW_COLOR);
|
||||
text_->writeShadowed(84, 124, Lang::get()->getText(19), SHADOW_COLOR);
|
||||
text_->writeShadowed(84, 140, Lang::get()->getText(20), SHADOW_COLOR);
|
||||
text_->writeShadowed(84, 156, Lang::get()->getText(21), SHADOW_COLOR);
|
||||
|
||||
if ((mode_ == Mode::MANUAL) && (counter_ % 50 > 14)) {
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, GAMECANVAS_HEIGHT - 12, Lang::get()->getText(22), 1, ORANGE_COLOR, 1, shdwTxtColor);
|
||||
text_->writeDX(TXT_CENTER | TXT_COLOR | TXT_SHADOW, GAMECANVAS_CENTER_X, GAMECANVAS_HEIGHT - 12, Lang::get()->getText(22), 1, ORANGE_COLOR, 1, SHADOW_COLOR);
|
||||
}
|
||||
|
||||
// Disquito
|
||||
@@ -176,7 +176,7 @@ void Instructions::render() {
|
||||
Screen::get()->start();
|
||||
|
||||
// Limpia la pantalla
|
||||
Screen::get()->clean(bgColor);
|
||||
Screen::get()->clean(BG_COLOR);
|
||||
|
||||
// Establece la ventana del backbuffer
|
||||
if (mode_ == Mode::AUTO) {
|
||||
|
||||
Reference in New Issue
Block a user