fix: arreglades les cridades a lang::getText("[SCOREBOARD] X")
This commit is contained in:
@@ -1727,12 +1727,12 @@ void Game::initPlayers(int player_id)
|
|||||||
const int y = param.game.play_area.rect.h - 30;
|
const int y = param.game.play_area.rect.h - 30;
|
||||||
players_.emplace_back(std::make_unique<Player>(1, param.game.play_area.first_quarter_x - 15, y, demo_.enabled, param.game.play_area.rect, player_textures_[0], player_animations_));
|
players_.emplace_back(std::make_unique<Player>(1, param.game.play_area.first_quarter_x - 15, y, demo_.enabled, param.game.play_area.rect, player_textures_[0], player_animations_));
|
||||||
players_.back()->setScoreBoardPanel(SCOREBOARD_LEFT_PANEL);
|
players_.back()->setScoreBoardPanel(SCOREBOARD_LEFT_PANEL);
|
||||||
players_.back()->setName(lang::getText("SCOREBOARD_1"));
|
players_.back()->setName(lang::getText("[SCOREBOARD] 1"));
|
||||||
players_.back()->setController(getController(players_.back()->getId()));
|
players_.back()->setController(getController(players_.back()->getId()));
|
||||||
|
|
||||||
players_.emplace_back(std::make_unique<Player>(2, param.game.play_area.third_quarter_x - 15, y, demo_.enabled, param.game.play_area.rect, player_textures_[1], player_animations_));
|
players_.emplace_back(std::make_unique<Player>(2, param.game.play_area.third_quarter_x - 15, y, demo_.enabled, param.game.play_area.rect, player_textures_[1], player_animations_));
|
||||||
players_.back()->setScoreBoardPanel(SCOREBOARD_RIGHT_PANEL);
|
players_.back()->setScoreBoardPanel(SCOREBOARD_RIGHT_PANEL);
|
||||||
players_.back()->setName(lang::getText("SCOREBOARD_2"));
|
players_.back()->setName(lang::getText("[SCOREBOARD] 2"));
|
||||||
players_.back()->setController(getController(players_.back()->getId()));
|
players_.back()->setController(getController(players_.back()->getId()));
|
||||||
|
|
||||||
// Activa el jugador que coincide con el "player_id"
|
// Activa el jugador que coincide con el "player_id"
|
||||||
|
|||||||
@@ -139,17 +139,10 @@ void Scoreboard::setPos(SDL_FRect rect)
|
|||||||
{
|
{
|
||||||
rect_ = rect;
|
rect_ = rect;
|
||||||
|
|
||||||
// Recalcula las anclas de los elementos
|
recalculateAnchors(); // Recalcula las anclas de los elementos
|
||||||
recalculateAnchors();
|
createBackgroundTexture(); // Crea la textura de fondo
|
||||||
|
createPanelTextures(); // Crea las texturas de los paneles
|
||||||
// Crea la textura de fondo
|
fillBackgroundTexture(); // Rellena la textura de fondo
|
||||||
createBackgroundTexture();
|
|
||||||
|
|
||||||
// Crea las texturas de los paneles
|
|
||||||
createPanelTextures();
|
|
||||||
|
|
||||||
// Rellena la textura de fondo
|
|
||||||
fillBackgroundTexture();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Rellena los diferentes paneles del marcador
|
// Rellena los diferentes paneles del marcador
|
||||||
@@ -177,7 +170,7 @@ void Scoreboard::fillPanelTextures()
|
|||||||
text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i]));
|
text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i]));
|
||||||
|
|
||||||
// MULT
|
// MULT
|
||||||
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("SCOREBOARD_3"));
|
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("[SCOREBOARD] 3"));
|
||||||
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, "x" + std::to_string(mult_[i]).substr(0, 3));
|
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, "x" + std::to_string(mult_[i]).substr(0, 3));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -185,13 +178,13 @@ void Scoreboard::fillPanelTextures()
|
|||||||
case ScoreboardMode::DEMO:
|
case ScoreboardMode::DEMO:
|
||||||
{
|
{
|
||||||
// DEMO MODE
|
// DEMO MODE
|
||||||
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("SCOREBOARD_6"));
|
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("[SCOREBOARD] 6"));
|
||||||
|
|
||||||
// PRESS START TO PLAY
|
// PRESS START TO PLAY
|
||||||
if (time_counter_ % 10 < 8)
|
if (time_counter_ % 10 < 8)
|
||||||
{
|
{
|
||||||
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("SCOREBOARD_8"));
|
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("[SCOREBOARD] 8"));
|
||||||
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, lang::getText("SCOREBOARD_9"));
|
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, lang::getText("[SCOREBOARD] 9"));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -199,13 +192,13 @@ void Scoreboard::fillPanelTextures()
|
|||||||
case ScoreboardMode::WAITING:
|
case ScoreboardMode::WAITING:
|
||||||
{
|
{
|
||||||
// GAME OVER
|
// GAME OVER
|
||||||
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("SCOREBOARD_7"));
|
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("[SCOREBOARD] 7"));
|
||||||
|
|
||||||
// PRESS START TO PLAY
|
// PRESS START TO PLAY
|
||||||
if (time_counter_ % 10 < 8)
|
if (time_counter_ % 10 < 8)
|
||||||
{
|
{
|
||||||
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("SCOREBOARD_8"));
|
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("[SCOREBOARD] 8"));
|
||||||
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, lang::getText("SCOREBOARD_9"));
|
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, lang::getText("[SCOREBOARD] 9"));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -213,13 +206,13 @@ void Scoreboard::fillPanelTextures()
|
|||||||
case ScoreboardMode::GAME_OVER:
|
case ScoreboardMode::GAME_OVER:
|
||||||
{
|
{
|
||||||
// GAME OVER
|
// GAME OVER
|
||||||
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("SCOREBOARD_7"));
|
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("[SCOREBOARD] 7"));
|
||||||
|
|
||||||
// PLEASE WAIT
|
// PLEASE WAIT
|
||||||
if (time_counter_ % 10 < 8)
|
if (time_counter_ % 10 < 8)
|
||||||
{
|
{
|
||||||
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("SCOREBOARD_12"));
|
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("[SCOREBOARD] 12"));
|
||||||
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, lang::getText("SCOREBOARD_13"));
|
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, lang::getText("[SCOREBOARD] 13"));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -227,7 +220,7 @@ void Scoreboard::fillPanelTextures()
|
|||||||
case ScoreboardMode::STAGE_INFO:
|
case ScoreboardMode::STAGE_INFO:
|
||||||
{
|
{
|
||||||
// STAGE
|
// STAGE
|
||||||
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y, lang::getText("SCOREBOARD_5") + std::to_string(stage_));
|
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y, lang::getText("[SCOREBOARD] 5") + std::to_string(stage_));
|
||||||
|
|
||||||
// POWERMETER
|
// POWERMETER
|
||||||
power_meter_sprite_->setSpriteClip(0, 0, 40, 7);
|
power_meter_sprite_->setSpriteClip(0, 0, 40, 7);
|
||||||
@@ -236,7 +229,7 @@ void Scoreboard::fillPanelTextures()
|
|||||||
power_meter_sprite_->render();
|
power_meter_sprite_->render();
|
||||||
|
|
||||||
// HI-SCORE
|
// HI-SCORE
|
||||||
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("SCOREBOARD_4"));
|
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("[SCOREBOARD] 4"));
|
||||||
const std::string name = hi_score_name_ == "" ? "" : hi_score_name_ + " - ";
|
const std::string name = hi_score_name_ == "" ? "" : hi_score_name_ + " - ";
|
||||||
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, name + updateScoreText(hi_score_));
|
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, name + updateScoreText(hi_score_));
|
||||||
break;
|
break;
|
||||||
@@ -249,7 +242,7 @@ void Scoreboard::fillPanelTextures()
|
|||||||
text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i]));
|
text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i]));
|
||||||
|
|
||||||
// CONTINUE
|
// CONTINUE
|
||||||
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("SCOREBOARD_10"));
|
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("[SCOREBOARD] 10"));
|
||||||
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, std::to_string(continue_counter_[i]));
|
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y, std::to_string(continue_counter_[i]));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -262,7 +255,7 @@ void Scoreboard::fillPanelTextures()
|
|||||||
|
|
||||||
// ENTER NAME
|
// ENTER NAME
|
||||||
{
|
{
|
||||||
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("SCOREBOARD_11"));
|
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("[SCOREBOARD] 11"));
|
||||||
SDL_FRect rect = {enter_name_pos_.x, enter_name_pos_.y, 5.0f, 7.0f};
|
SDL_FRect rect = {enter_name_pos_.x, enter_name_pos_.y, 5.0f, 7.0f};
|
||||||
|
|
||||||
// Recorre todos los slots de letras del nombre
|
// Recorre todos los slots de letras del nombre
|
||||||
@@ -298,7 +291,7 @@ void Scoreboard::fillPanelTextures()
|
|||||||
text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i]));
|
text_scoreboard_->writeCentered(slot4_2_.x, slot4_2_.y, updateScoreText(score_[i]));
|
||||||
|
|
||||||
// NAME
|
// NAME
|
||||||
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("SCOREBOARD_11"));
|
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y, lang::getText("[SCOREBOARD] 11"));
|
||||||
/* TEXTO CENTRADO */
|
/* TEXTO CENTRADO */
|
||||||
// text_scoreboard_->writeDX(TEXT_CENTER | TEXT_COLOR, slot4_4_.x, slot4_4_.y, record_name_[i], 1, getColorLikeKnightRider(name_colors_, loop_counter_ / 5));
|
// text_scoreboard_->writeDX(TEXT_CENTER | TEXT_COLOR, slot4_4_.x, slot4_4_.y, record_name_[i], 1, getColorLikeKnightRider(name_colors_, loop_counter_ / 5));
|
||||||
|
|
||||||
@@ -309,12 +302,12 @@ void Scoreboard::fillPanelTextures()
|
|||||||
case ScoreboardMode::GAME_COMPLETED:
|
case ScoreboardMode::GAME_COMPLETED:
|
||||||
{
|
{
|
||||||
// GAME OVER
|
// GAME OVER
|
||||||
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("SCOREBOARD_7"));
|
text_scoreboard_->writeCentered(slot4_1_.x, slot4_1_.y + 4, lang::getText("[SCOREBOARD] 7"));
|
||||||
|
|
||||||
// SCORE
|
// SCORE
|
||||||
if (time_counter_ % 10 < 8)
|
if (time_counter_ % 10 < 8)
|
||||||
{
|
{
|
||||||
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("SCOREBOARD_14"));
|
text_scoreboard_->writeCentered(slot4_3_.x, slot4_3_.y - 2, lang::getText("[SCOREBOARD] 14"));
|
||||||
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, updateScoreText(score_[i]));
|
text_scoreboard_->writeCentered(slot4_4_.x, slot4_4_.y - 2, updateScoreText(score_[i]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user