tidy-fix automàtic (sense naming)

source/core/jail/jdraw8.cpp

@@ -42,18 +42,18 @@ void JD8_ClearScreen(Uint8 color) {
     memset(screen, color, 64000);
 }
 
-JD8_Surface JD8_NewSurface() {
+auto JD8_NewSurface() -> JD8_Surface {
     return new Uint8[64000]{};
 }
 
 // Helper intern: deriva el basename d'una ruta per a buscar al Cache.
-static std::string jd8_basename(const char* file) {
+static auto jd8_basename(const char* file) -> std::string {
     std::string s = file;
     auto pos = s.find_last_of("/\\");
     return pos == std::string::npos ? s : s.substr(pos + 1);
 }
 
-JD8_Surface JD8_LoadSurface(const char* file) {
+auto JD8_LoadSurface(const char* file) -> JD8_Surface {
     // Prova primer el Resource::Cache. Si l'asset és precarregat, copiem
     // els 64KB des del cache (microsegons) i ens estalviem la decodificació
     // GIF. Mantenim el contracte de la funció: el caller rep un buffer
@@ -70,7 +70,8 @@ JD8_Surface JD8_LoadSurface(const char* file) {
     }
 
     auto buffer = ResourceHelper::loadFile(file);
-    unsigned short w, h;
+    unsigned short w;
+    unsigned short h;
     Uint8* pixels = LoadGif(buffer.data(), &w, &h);
     if (pixels == nullptr) {
         printf("Unable to load bitmap: %s\n", SDL_GetError());
@@ -82,11 +83,11 @@ JD8_Surface JD8_LoadSurface(const char* file) {
     return image;
 }
 
-JD8_Palette JD8_LoadPalette(const char* file) {
+auto JD8_LoadPalette(const char* file) -> JD8_Palette {
     // Sempre retorna un buffer de 256 colors reservat amb `new Color[256]`
     // — el caller és responsable d'alliberar-lo amb `delete[]` (o lliurar-ne
     // l'ownership a `JD8_SetScreenPalette`).
-    JD8_Palette palette = new Color[256];
+    auto palette = new Color[256];
 
     if (Resource::Cache::get() != nullptr) {
         try {
@@ -106,7 +107,9 @@ JD8_Palette JD8_LoadPalette(const char* file) {
 }
 
 void JD8_SetScreenPalette(JD8_Palette palette) {
-    if (main_palette == palette) return;
+    if (main_palette == palette) {
+        return;
+    }
     delete[] main_palette;
     main_palette = palette;
 }
@@ -126,9 +129,15 @@ void JD8_FillRect(int x, int y, int w, int h, Uint8 color) {
         h += y;
         y = 0;
     }
-    if (x + w > 320) w = 320 - x;
-    if (y + h > 200) h = 200 - y;
-    if (w <= 0 || h <= 0) return;
+    if (x + w > 320) {
+        w = 320 - x;
+    }
+    if (y + h > 200) {
+        h = 200 - y;
+    }
+    if (w <= 0 || h <= 0) {
+        return;
+    }
     for (int row = y; row < y + h; ++row) {
         memset(&screen[x + (row * 320)], color, w);
     }
@@ -158,47 +167,55 @@ void JD8_BlitToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw
     }
 }
 
-void JD8_BlitCK(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey) {
+void JD8_BlitCK(int x, int y, const JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey) {
     int src_pointer = sx + (sy * 320);
     int dst_pointer = x + (y * 320);
     for (int j = 0; j < sh; j++) {
         for (int i = 0; i < sw; i++) {
-            if (surface[src_pointer + i] != colorkey) screen[dst_pointer + i] = surface[src_pointer + i];
+            if (surface[src_pointer + i] != colorkey) {
+                screen[dst_pointer + i] = surface[src_pointer + i];
+            }
         }
         src_pointer += 320;
         dst_pointer += 320;
     }
 }
 
-void JD8_BlitCKCut(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey) {
+void JD8_BlitCKCut(int x, int y, const JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey) {
     int src_pointer = sx + (sy * 320);
     int dst_pointer = x + (y * 320);
     for (int j = 0; j < sh; j++) {
         for (int i = 0; i < sw; i++) {
-            if (surface[src_pointer + i] != colorkey && (x + i >= 0) && (y + j >= 0) && (x + i < 320) && (y + j < 200)) screen[dst_pointer + i] = surface[src_pointer + i];
+            if (surface[src_pointer + i] != colorkey && (x + i >= 0) && (y + j >= 0) && (x + i < 320) && (y + j < 200)) {
+                screen[dst_pointer + i] = surface[src_pointer + i];
+            }
         }
         src_pointer += 320;
         dst_pointer += 320;
     }
 }
 
-void JD8_BlitCKScroll(int y, JD8_Surface surface, int sx, int sy, int sh, Uint8 colorkey) {
+void JD8_BlitCKScroll(int y, const JD8_Surface surface, int sx, int sy, int sh, Uint8 colorkey) {
     int dst_pointer = y * 320;
     for (int j = sy; j < sy + sh; j++) {
         for (int i = 0; i < 320; i++) {
             int x = (i + sx) % 320;
-            if (surface[x + j * 320] != colorkey) screen[dst_pointer] = surface[x + j * 320];
+            if (surface[x + (j * 320)] != colorkey) {
+                screen[dst_pointer] = surface[x + (j * 320)];
+            }
             dst_pointer++;
         }
     }
 }
 
-void JD8_BlitCKToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest, Uint8 colorkey) {
+void JD8_BlitCKToSurface(int x, int y, const JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest, Uint8 colorkey) {
     int src_pointer = sx + (sy * 320);
     int dst_pointer = x + (y * 320);
     for (int j = 0; j < sh; j++) {
         for (int i = 0; i < sw; i++) {
-            if (surface[src_pointer + i] != colorkey) dest[dst_pointer + i] = surface[src_pointer + i];
+            if (surface[src_pointer + i] != colorkey) {
+                dest[dst_pointer + i] = surface[src_pointer + i];
+            }
         }
         src_pointer += 320;
         dst_pointer += 320;
@@ -218,15 +235,15 @@ void JD8_Flip() {
     }
 }
 
-Uint32* JD8_GetFramebuffer() {
+auto JD8_GetFramebuffer() -> Uint32* {
     return pixel_data;
 }
 
-void JD8_FreeSurface(JD8_Surface surface) {
+void JD8_FreeSurface(const JD8_Surface surface) {
     delete[] surface;
 }
 
-Uint8 JD8_GetPixel(JD8_Surface surface, int x, int y) {
+auto JD8_GetPixel(JD8_Surface surface, int x, int y) -> Uint8 {
     return surface[x + (y * 320)];
 }
 
@@ -292,12 +309,14 @@ void JD8_FadeStartToPal(JD8_Palette pal) {
     fade_step = 0;
 }
 
-bool JD8_FadeIsActive() {
+auto JD8_FadeIsActive() -> bool {
     return fade_type != FadeType::None;
 }
 
-bool JD8_FadeTickStep() {
-    if (fade_type == FadeType::None) return true;
+auto JD8_FadeTickStep() -> bool {
+    if (fade_type == FadeType::None) {
+        return true;
+    }
 
     apply_fade_step();
     fade_step++;

source/core/jail/jdraw8.hpp

@@ -16,11 +16,11 @@ void JD8_Quit();
 
 void JD8_ClearScreen(Uint8 color);
 
-JD8_Surface JD8_NewSurface();
+auto JD8_NewSurface() -> JD8_Surface;
 
-JD8_Surface JD8_LoadSurface(const char* file);
+auto JD8_LoadSurface(const char* file) -> JD8_Surface;
 
-JD8_Palette JD8_LoadPalette(const char* file);
+auto JD8_LoadPalette(const char* file) -> JD8_Palette;
 
 void JD8_SetScreenPalette(JD8_Palette palette);
 
@@ -36,13 +36,13 @@ void JD8_Blit(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh)
 
 void JD8_BlitToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest);
 
-void JD8_BlitCK(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey);
+void JD8_BlitCK(int x, int y, const JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey);
 
-void JD8_BlitCKCut(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey);
+void JD8_BlitCKCut(int x, int y, const JD8_Surface surface, int sx, int sy, int sw, int sh, Uint8 colorkey);
 
-void JD8_BlitCKScroll(int y, JD8_Surface surface, int sx, int sy, int sh, Uint8 colorkey);
+void JD8_BlitCKScroll(int y, const JD8_Surface surface, int sx, int sy, int sh, Uint8 colorkey);
 
-void JD8_BlitCKToSurface(int x, int y, JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest, Uint8 colorkey);
+void JD8_BlitCKToSurface(int x, int y, const JD8_Surface surface, int sx, int sy, int sw, int sh, JD8_Surface dest, Uint8 colorkey);
 
 // Converteix la pantalla indexada a ARGB. El Director crida aquesta
 // funció al final de cada tick i després llegeix el framebuffer via
@@ -51,11 +51,11 @@ void JD8_Flip();
 
 // Accés al framebuffer ARGB de 320x200 actualitzat per l'última crida a
 // JD8_Flip(). Propietat de jdraw8 — el caller no ha de lliberar-lo.
-Uint32* JD8_GetFramebuffer();
+auto JD8_GetFramebuffer() -> Uint32*;
 
-void JD8_FreeSurface(JD8_Surface surface);
+void JD8_FreeSurface(const JD8_Surface surface);
 
-Uint8 JD8_GetPixel(JD8_Surface surface, int x, int y);
+auto JD8_GetPixel(JD8_Surface surface, int x, int y) -> Uint8;
 
 void JD8_PutPixel(JD8_Surface surface, int x, int y, Uint8 pixel);
 
@@ -70,8 +70,8 @@ void JD8_SetPaletteColor(Uint8 index, Uint8 r, Uint8 g, Uint8 b);
 // L'embolcall `scenes::PaletteFade` ho fa més idiomàtic per a escenes.
 void JD8_FadeStartOut();
 void JD8_FadeStartToPal(JD8_Palette pal);
-bool JD8_FadeTickStep();
-bool JD8_FadeIsActive();
+auto JD8_FadeTickStep() -> bool;
+auto JD8_FadeIsActive() -> bool;
 
 // JD_Font JD_LoadFont( char *file, int width, int height);
 

source/core/jail/jfile.cpp

@@ -27,12 +27,16 @@ namespace {
         config.clear();
         const std::string config_file = config_folder + "/config.txt";
         std::ifstream fi(config_file);
-        if (!fi.is_open()) return;
+        if (!fi.is_open()) {
+            return;
+        }
 
         std::string line;
         while (std::getline(fi, line)) {
             const auto eq = line.find('=');
-            if (eq == std::string::npos) continue;
+            if (eq == std::string::npos) {
+                continue;
+            }
             config.push_back({line.substr(0, eq), line.substr(eq + 1)});
         }
     }
@@ -40,7 +44,9 @@ namespace {
     void save_config_values() {
         const std::string config_file = config_folder + "/config.txt";
         std::ofstream fo(config_file);
-        if (!fo.is_open()) return;
+        if (!fo.is_open()) {
+            return;
+        }
         for (const auto& pair : config) {
             fo << pair.key << '=' << pair.value << '\n';
         }
@@ -52,7 +58,7 @@ void file_setresourcefolder(const char* str) {
     resource_folder = str;
 }
 
-const char* file_getresourcefolder() {
+auto file_getresourcefolder() -> const char* {
     return resource_folder.c_str();
 }
 
@@ -76,9 +82,13 @@ void file_setconfigfolder(const char* foldername) {
     // arranque dins del navegador. La config no persistirà entre recàrregues
     // (MEMFS és volàtil); caldria IDBFS si volguéssem persistència a web.
     struct passwd* pw = getpwuid(getuid());
-    const char* homedir = (pw && pw->pw_dir && pw->pw_dir[0]) ? pw->pw_dir : nullptr;
-    if (!homedir || !homedir[0]) homedir = getenv("HOME");
-    if (!homedir || !homedir[0]) homedir = "/tmp";
+    const char* homedir = ((pw != nullptr) && (pw->pw_dir != nullptr) && (pw->pw_dir[0] != 0)) ? pw->pw_dir : nullptr;
+    if ((homedir == nullptr) || (homedir[0] == 0)) {
+        homedir = getenv("HOME");
+    }
+    if ((homedir == nullptr) || (homedir[0] == 0)) {
+        homedir = "/tmp";
+    }
     config_folder = std::string(homedir) + "/.config/" + foldername;
 #endif
 
@@ -92,14 +102,16 @@ void file_setconfigfolder(const char* foldername) {
     // volàtil al navegador de totes formes: ignorem l'error i continuem.
 }
 
-const char* file_getconfigfolder() {
+auto file_getconfigfolder() -> const char* {
     thread_local std::string folder;
     folder = config_folder + "/";
     return folder.c_str();
 }
 
-const char* file_getconfigvalue(const char* key) {
-    if (config.empty()) load_config_values();
+auto file_getconfigvalue(const char* key) -> const char* {
+    if (config.empty()) {
+        load_config_values();
+    }
     for (const auto& pair : config) {
         if (pair.key == key) {
             thread_local std::string value_cache;
@@ -111,7 +123,9 @@ const char* file_getconfigvalue(const char* key) {
 }
 
 void file_setconfigvalue(const char* key, const char* value) {
-    if (config.empty()) load_config_values();
+    if (config.empty()) {
+        load_config_values();
+    }
     for (auto& pair : config) {
         if (pair.key == key) {
             pair.value = value;

source/core/jail/jfile.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
 void file_setconfigfolder(const char* foldername);
-const char* file_getconfigfolder();
+auto file_getconfigfolder() -> const char*;
 
 void file_setresourcefolder(const char* str);
-const char* file_getresourcefolder();
+auto file_getresourcefolder() -> const char*;
 
-const char* file_getconfigvalue(const char* key);
+auto file_getconfigvalue(const char* key) -> const char*;
 void file_setconfigvalue(const char* key, const char* value);

source/core/jail/jgame.cpp

@@ -24,7 +24,7 @@ void JG_QuitSignal() {
     quitting = true;
 }
 
-bool JG_Quitting() {
+auto JG_Quitting() -> bool {
     return quitting;
 }
 
@@ -32,7 +32,7 @@ void JG_SetUpdateTicks(Uint32 milliseconds) {
     update_ticks = milliseconds;
 }
 
-bool JG_ShouldUpdate() {
+auto JG_ShouldUpdate() -> bool {
     const Uint32 now = SDL_GetTicks();
     if (now - update_time > update_ticks) {
         update_time = now;
@@ -45,11 +45,11 @@ bool JG_ShouldUpdate() {
     return false;
 }
 
-Uint32 JG_GetCycleCounter() {
+auto JG_GetCycleCounter() -> Uint32 {
     return cycle_counter;
 }
 
-Uint32 JG_GetDeltaMs() {
+auto JG_GetDeltaMs() -> Uint32 {
     const Uint32 now = SDL_GetTicks();
     const Uint32 delta = now - last_delta_time;
     last_delta_time = now;

source/core/jail/jgame.hpp

@@ -7,14 +7,14 @@ void JG_Finalize();
 
 void JG_QuitSignal();
 
-bool JG_Quitting();
+auto JG_Quitting() -> bool;
 
 void JG_SetUpdateTicks(Uint32 milliseconds);
 
-bool JG_ShouldUpdate();
+auto JG_ShouldUpdate() -> bool;
 
-Uint32 JG_GetCycleCounter();
+auto JG_GetCycleCounter() -> Uint32;
 
 // Temps transcorregut (en ms) des de l'última crida a JG_GetDeltaMs.
 // Helper per a la migració progressiva a time-based (Fase 4+).
-Uint32 JG_GetDeltaMs();
+auto JG_GetDeltaMs() -> Uint32;

source/core/jail/jinput.cpp

@@ -1,5 +1,6 @@
 #include "core/jail/jinput.hpp"
 
+#include <algorithm>
 #include <cstring>
 
 #include "core/system/director.hpp"
@@ -19,7 +20,7 @@ namespace {
     // Temps restant en mil·lisegons durant el qual JI_KeyPressed/JI_AnyKey
     // retornen false. Utilitzat per a evitar que pulsacions fortuïtes
     // saltin cinemàtiques al començament.
-    float wait_ms = 0.0f;
+    float wait_ms = 0.0F;
 
     // Per a calcular el delta entre crides a JI_Update sense que els callers
     // hagen de passar-lo explícitament. Es reinicia a la primera crida.
@@ -29,7 +30,7 @@ namespace {
 
     Uint8 virtual_keystates[JI_VSRC_COUNT][SDL_SCANCODE_COUNT] = {{0}};
 
-    Uint8 scancode_to_ascii(Uint8 scancode) {
+    auto scancode_to_ascii(Uint8 scancode) -> Uint8 {
         if (scancode >= SDL_SCANCODE_A && scancode <= SDL_SCANCODE_Z) {
             return static_cast<Uint8>('a' + (scancode - SDL_SCANCODE_A));
         }
@@ -47,8 +48,12 @@ void JI_SetInputBlocked(bool blocked) {
 }
 
 void JI_SetVirtualKey(int scancode, int source, bool pressed) {
-    if (scancode < 0 || scancode >= SDL_SCANCODE_COUNT) return;
-    if (source < 0 || source >= JI_VSRC_COUNT) return;
+    if (scancode < 0 || scancode >= SDL_SCANCODE_COUNT) {
+        return;
+    }
+    if (source < 0 || source >= JI_VSRC_COUNT) {
+        return;
+    }
     virtual_keystates[source][scancode] = pressed ? 1 : 0;
 }
 
@@ -64,49 +69,67 @@ void JI_Update() {
     // El director ha processat tots els events. Ací només refresquem
     // el snapshot del teclat i consumim el flag de tecla polsada.
     if (keystates == nullptr) {
-        keystates = SDL_GetKeyboardState(NULL);
+        keystates = SDL_GetKeyboardState(nullptr);
     }
 
     const Uint64 now = SDL_GetTicks();
-    if (last_update_tick == 0) last_update_tick = now;
-    const float delta_ms = static_cast<float>(now - last_update_tick);
+    if (last_update_tick == 0) {
+        last_update_tick = now;
+    }
+    const auto delta_ms = static_cast<float>(now - last_update_tick);
     last_update_tick = now;
 
-    if (wait_ms > 0.0f) {
+    if (wait_ms > 0.0F) {
         wait_ms -= delta_ms;
-        if (wait_ms < 0.0f) wait_ms = 0.0f;
+        wait_ms = std::max(wait_ms, 0.0f);
     }
 
     // Consumim el flag de "alguna tecla no-GUI polsada" del director
     key_pressed = Director::get()->consumeKeyPressed();
 }
 
-bool JI_KeyPressed(int key) {
-    if (wait_ms > 0.0f || keystates == nullptr) return false;
+auto JI_KeyPressed(int key) -> bool {
+    if (wait_ms > 0.0F || keystates == nullptr) {
+        return false;
+    }
     // Input bloquejat (p.ex. menú flotant obert)
-    if (input_blocked) return false;
+    if (input_blocked) {
+        return false;
+    }
     // ESC bloquejada pel Director (primera pulsació mostra notificació)
-    if (key == SDL_SCANCODE_ESCAPE && Director::get()->isEscBlocked()) return false;
-    if (key < 0 || key >= SDL_SCANCODE_COUNT) return false;
-    if (keystates[key] != 0) return true;
-    for (int src = 0; src < JI_VSRC_COUNT; src++) {
-        if (virtual_keystates[src][key] != 0) return true;
+    if (key == SDL_SCANCODE_ESCAPE && Director::get()->isEscBlocked()) {
+        return false;
+    }
+    if (key < 0 || key >= SDL_SCANCODE_COUNT) {
+        return false;
+    }
+    if (static_cast<int>(keystates[key]) != 0) {
+        return true;
+    }
+    for (auto& virtual_keystate : virtual_keystates) {
+        if (virtual_keystate[key] != 0) {
+            return true;
+        }
     }
     return false;
 }
 
-bool JI_CheatActivated(const char* cheat_code) {
+auto JI_CheatActivated(const char* cheat_code) -> bool {
     const size_t len = std::strlen(cheat_code);
-    if (len > sizeof(cheat)) return false;
+    if (len > sizeof(cheat)) {
+        return false;
+    }
     // Compara contra els últims `len` caràcters del buffer. El buffer té
     // mida fixa 5 i acumula sempre el darrer tecle a la posició 4.
     const size_t offset = sizeof(cheat) - len;
     for (size_t i = 0; i < len; i++) {
-        if (cheat[offset + i] != static_cast<Uint8>(cheat_code[i])) return false;
+        if (cheat[offset + i] != static_cast<Uint8>(cheat_code[i])) {
+            return false;
+        }
     }
     return true;
 }
 
-bool JI_AnyKey() {
-    return wait_ms > 0.0f ? false : key_pressed;
+auto JI_AnyKey() -> bool {
+    return wait_ms > 0.0F ? false : key_pressed;
 }

source/core/jail/jinput.hpp

@@ -12,14 +12,14 @@ void JI_SetInputBlocked(bool blocked);
 enum JI_VirtualSource {
     JI_VSRC_GAMEPAD = 0,
     JI_VSRC_REMAP = 1,
-    JI_VSRC_COUNT
+    JI_VSRC_COUNT = 2
 };
 void JI_SetVirtualKey(int scancode, int source, bool pressed);
 
 void JI_Update();
 
-bool JI_KeyPressed(int key);
+auto JI_KeyPressed(int key) -> bool;
 
-bool JI_CheatActivated(const char* cheat_code);
+auto JI_CheatActivated(const char* cheat_code) -> bool;
 
-bool JI_AnyKey();
+auto JI_AnyKey() -> bool;