jaildesigner-jailgames/coffee_crisis_arcade_edition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 13 Wiki Activity

Mes recomanacions de cppcheck

Browse Source
This commit is contained in:
Sergio
2024-10-13 19:26:27 +02:00
parent 46540ad7c3
commit babf02226c
22 changed files with 291 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
source/scoreboard.cpp
View File

@@ -34,13 +34,21 @@ Scoreboard *Scoreboard::get()
// Constructor
Scoreboard::Scoreboard(SDL_Renderer *renderer)
: renderer_(renderer)
: renderer_(renderer),
game_power_meter_texture_(std::make_shared<Texture>(renderer, Asset::get()->get("game_power_meter.png"))),
power_meter_sprite_(std::make_unique<Sprite>(game_power_meter_texture_)),
text_scoreboard_(std::make_unique<Text>(Asset::get()->get("8bithud.png"), Asset::get()->get("8bithud.txt"), renderer)),
stage_(1),
hi_score_(0),
power_(0),
hi_score_name_(std::string()),
color_({0, 0, 0}),
rect_({0, 0, 320, 40}),
ticks_(SDL_GetTicks()),
counter_(0)
{
// Inicializa punteros
game_power_meter_texture_ = nullptr;
power_meter_sprite_ = nullptr;
text_scoreboard_ = nullptr;
// Inicializa variables
for (int i = 0; i < SCOREBOARD_MAX_PANELS; ++i)
{
@@ -51,25 +59,14 @@ Scoreboard::Scoreboard(SDL_Renderer *renderer)
mult_[i] = 0;
continue_counter_[i] = 0;
}
stage_ = 1;
hi_score_ = 0;
power_ = 0;
hi_score_name_.clear();
color_ = {0, 0, 0};
rect_ = {0, 0, 320, 40};
panel_[SCOREBOARD_LEFT_PANEL].mode = ScoreboardMode::SCORE;
panel_[SCOREBOARD_RIGHT_PANEL].mode = ScoreboardMode::SCORE;
panel_[SCOREBOARD_CENTER_PANEL].mode = ScoreboardMode::STAGE_INFO;
ticks_ = SDL_GetTicks();
counter_ = 0;
// Recalcula las anclas de los elementos
recalculateAnchors();
// Crea objetos
game_power_meter_texture_ = std::make_shared<Texture>(renderer_, Asset::get()->get("game_power_meter.png"));
power_meter_sprite_ = std::make_unique<Sprite>(slot4_2_.x - 20, slot4_2_.y, 40, 7, game_power_meter_texture_);
text_scoreboard_ = std::make_unique<Text>(Asset::get()->get("8bithud.png"), Asset::get()->get("8bithud.txt"), renderer_);
power_meter_sprite_->setPos({slot4_2_.x - 20, slot4_2_.y, 40, 7});
// Crea la textura de fondo
background_ = nullptr;
@@ -130,13 +127,13 @@ void Scoreboard::render()
}
// Establece el valor de la variable
void Scoreboard::setName(int panel_, std::string name_)
void Scoreboard::setName(int panel_, const std::string &name_)
{
this->name_[panel_] = name_;
}
// Establece el valor de la variable
void Scoreboard::setRecordName(int panel_, std::string record_name_)
void Scoreboard::setRecordName(int panel_, const std::string &record_name_)
{
this->record_name_[panel_] = record_name_;
}
@@ -184,7 +181,7 @@ void Scoreboard::setPower(float power_)
}
// Establece el valor de la variable
void Scoreboard::setHiScoreName(std::string name_)
void Scoreboard::setHiScoreName(const std::string &name_)
{
hi_score_name_ = name_;
}
@@ -323,7 +320,7 @@ void Scoreboard::fillPanelTextures()
// ENTER NAME
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText(106));
SDL_Rect rect_ = {enter_name_pos_.x, enter_name_pos_.y, 5, 7};
SDL_Rect rect = {enter_name_pos_.x, enter_name_pos_.y, 5, 7};
SDL_SetRenderDrawColor(renderer_, 0xFF, 0xFF, 0xEB, 255);
for (int j = 0; j < (int)record_name_[i].size(); ++j)
{
@@ -331,16 +328,16 @@ void Scoreboard::fillPanelTextures()
{ // La letra seleccionada se pinta de forma intermitente
if (counter_ % 3 > 0)
{
SDL_RenderDrawLine(renderer_, rect_.x, rect_.y + rect_.h, rect_.x + rect_.w, rect_.y + rect_.h);
text_scoreboard_->write(rect_.x, rect_.y, record_name_[i].substr(j, 1));
SDL_RenderDrawLine(renderer_, rect.x, rect.y + rect.h, rect.x + rect.w, rect.y + rect.h);
text_scoreboard_->write(rect.x, rect.y, record_name_[i].substr(j, 1));
}
}
else
{
SDL_RenderDrawLine(renderer_, rect_.x, rect_.y + rect_.h, rect_.x + rect_.w, rect_.y + rect_.h);
text_scoreboard_->write(rect_.x, rect_.y, record_name_[i].substr(j, 1));
SDL_RenderDrawLine(renderer_, rect.x, rect.y + rect.h, rect.x + rect.w, rect.y + rect.h);
text_scoreboard_->write(rect.x, rect.y, record_name_[i].substr(j, 1));
}
rect_.x += 7;
rect.x += 7;
}
break;
}