forked from jaildesigner-jailgames/jaildoctors_dilemma
linter
This commit is contained in:
@@ -29,9 +29,9 @@ Title::Title()
|
||||
marquee_text_(Resource::get()->getText("gauntlet")),
|
||||
first_active_letter_(0),
|
||||
last_active_letter_(0),
|
||||
state_time_(0.0f),
|
||||
fade_accumulator_(0.0f),
|
||||
current_delta_(0.0f) {
|
||||
state_time_(0.0F),
|
||||
fade_accumulator_(0.0F),
|
||||
current_delta_(0.0F) {
|
||||
// Inicializa variables
|
||||
state_ = SceneManager::options == SceneManager::Options::TITLE_WITH_LOADING_SCREEN ? TitleState::SHOW_LOADING_SCREEN : TitleState::SHOW_MENU;
|
||||
SceneManager::current = SceneManager::Scene::TITLE;
|
||||
@@ -75,7 +75,7 @@ void Title::initMarquee() {
|
||||
void Title::checkEvents() {
|
||||
SDL_Event event;
|
||||
while (SDL_PollEvent(&event)) {
|
||||
globalEvents::check(event);
|
||||
GlobalEvents::check(event);
|
||||
|
||||
// Solo se comprueban estas teclas si no está activo el menu de logros
|
||||
if (event.type == SDL_EVENT_KEY_DOWN) {
|
||||
@@ -116,19 +116,19 @@ void Title::checkInput() {
|
||||
}
|
||||
}
|
||||
|
||||
globalInputs::check();
|
||||
GlobalInputs::check();
|
||||
}
|
||||
|
||||
// Actualiza la marquesina
|
||||
void Title::updateMarquee(float delta_time) {
|
||||
const float displacement = MARQUEE_SPEED * delta_time;
|
||||
const float DISPLACEMENT = MARQUEE_SPEED * delta_time;
|
||||
|
||||
// Solo procesar letras en rango activo + 1 para poder activar la siguiente
|
||||
for (int i = first_active_letter_; i <= last_active_letter_ + 1 && i < (int)letters_.size(); ++i) {
|
||||
auto& letter = letters_[i];
|
||||
|
||||
if (letter.enabled) {
|
||||
letter.x -= displacement;
|
||||
letter.x -= DISPLACEMENT;
|
||||
|
||||
// Desactivar si sale de pantalla
|
||||
if (letter.x < MARQUEE_EXIT_X) {
|
||||
@@ -196,7 +196,7 @@ void Title::updateState(float delta_time) {
|
||||
case TitleState::FADE_LOADING_SCREEN:
|
||||
fade_accumulator_ += delta_time;
|
||||
if (fade_accumulator_ >= FADE_STEP_INTERVAL) {
|
||||
fade_accumulator_ = 0.0f;
|
||||
fade_accumulator_ = 0.0F;
|
||||
if (loading_screen_surface_->fadeSubPalette()) {
|
||||
transitionToState(TitleState::SHOW_MENU);
|
||||
}
|
||||
@@ -222,8 +222,8 @@ void Title::updateState(float delta_time) {
|
||||
// Transiciona a un nuevo estado
|
||||
void Title::transitionToState(TitleState new_state) {
|
||||
state_ = new_state;
|
||||
state_time_ = 0.0f;
|
||||
fade_accumulator_ = 0.0f;
|
||||
state_time_ = 0.0F;
|
||||
fade_accumulator_ = 0.0F;
|
||||
}
|
||||
|
||||
// Dibuja en pantalla
|
||||
@@ -272,12 +272,12 @@ void Title::run() {
|
||||
// Desplaza la lista de logros
|
||||
void Title::moveCheevosList(int direction, float delta_time) {
|
||||
// Calcula el desplazamiento basado en tiempo
|
||||
const float displacement = CHEEVOS_SCROLL_SPEED * delta_time;
|
||||
const float DISPLACEMENT = CHEEVOS_SCROLL_SPEED * delta_time;
|
||||
|
||||
// Modifica la posición de la ventana de vista
|
||||
cheevos_surface_view_.y = direction == 0
|
||||
? cheevos_surface_view_.y - displacement
|
||||
: cheevos_surface_view_.y + displacement;
|
||||
? cheevos_surface_view_.y - DISPLACEMENT
|
||||
: cheevos_surface_view_.y + DISPLACEMENT;
|
||||
|
||||
// Ajusta los limites
|
||||
const float BOTTOM = cheevos_surface_->getHeight() - cheevos_surface_view_.h;
|
||||
|
||||
Reference in New Issue
Block a user