Pasaeta de "include-what-you-use" per arreglar els includes

Renombrats alguns fitxers per consistencia

go.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+SECONDS=0
+make linux_debug
+duration=$SECONDS
+echo "$((duration / 60)) minutes and $((duration % 60)) seconds elapsed."

source/animated_sprite.cpp

@@ -1,7 +1,8 @@
-#include "animatedsprite.h"
+#include "animated_sprite.h"
-#include <fstream>
+#include <fstream>    // for basic_ostream, operator<<, basic_istream, basic...
-#include <iostream>
+#include <iostream>   // for cout
-#include <sstream>
+#include <sstream>    // for basic_stringstream
+#include "texture.h"  // for Texture
 
 // Carga la animación desde un fichero
 animatedSprite_t loadAnimationFromFile(Texture *texture, std::string filePath, bool verbose)

source/animated_sprite.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>    // for SDL_Rect
-#include "movingsprite.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint8
-#include <string>
+#include <string>             // for string, basic_string
-#include <vector>
+#include <vector>             // for vector
+#include "moving_sprite.h"     // for MovingSprite
+class Texture;
 
 struct animation_t
 {

source/asset.cpp

@@ -1,5 +1,8 @@
 #include "asset.h"
-#include <iostream>
+#include <SDL2/SDL_rwops.h>   // for SDL_RWFromFile, SDL_RWclose, SDL_RWops
+#include <SDL2/SDL_stdinc.h>  // for SDL_max
+#include <stddef.h>           // for size_t
+#include <iostream>           // for basic_ostream, operator<<, cout, endl
 
 // [SINGLETON] Hay que definir las variables estáticas, desde el .h sólo la hemos declarado
 Asset *Asset::asset = nullptr;

source/asset.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <string>  // for string, basic_string
-#include <string>
+#include <vector>  // for vector
-#include <vector>
 
 enum assetType
 {

source/background.cpp

@@ -1,5 +1,13 @@
 #include "background.h"
-#include "param.h"
+#include <SDL2/SDL_blendmode.h>  // for SDL_BLENDMODE_BLEND
+#include <SDL2/SDL_pixels.h>     // for SDL_PIXELFORMAT_RGBA8888
+#include <algorithm>             // for max, min
+#include <string>                // for basic_string
+#include "asset.h"               // for Asset
+#include "moving_sprite.h"        // for MovingSprite
+#include "param.h"               // for param
+#include "sprite.h"              // for Sprite
+#include "texture.h"             // for Texture
 
 // Constructor
 Background::Background(SDL_Renderer *renderer)

source/background.h

@@ -1,9 +1,12 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>    // for SDL_Rect
-#include "asset.h"
+#include <SDL2/SDL_render.h>  // for SDL_Renderer, SDL_Texture
-#include "movingsprite.h"
+#include "utils.h"            // for color_t
-#include "utils.h"
+class Asset;
+class MovingSprite;
+class Sprite;
+class Texture;
 
 /*
     Esta clase es la encargada de dibujar el fondo que aparece durante la sección

source/balloon.cpp

@@ -1,5 +1,11 @@
 #include "balloon.h"
-#include "param.h"
+#include <bits/std_abs.h>    // for abs
+#include <math.h>            // for abs
+#include "animated_sprite.h"  // for AnimatedSprite
+#include "moving_sprite.h"    // for MovingSprite
+#include "param.h"           // for param
+#include "sprite.h"          // for Sprite
+#include "texture.h"         // for Texture
 
 // Constructor
 Balloon::Balloon(float x, float y, Uint8 kind, float velx, float speed, Uint16 creationtimer, Texture *texture, std::vector<std::string> *animation)

source/balloon.h

@@ -1,10 +1,11 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_stdinc.h>  // for Uint8, Uint16, Uint32
-#include "animatedsprite.h"
+#include <string>             // for string
-#include "utils.h"
+#include <vector>             // for vector
-#include <sstream>
+#include "utils.h"            // for circle_t
-#include <vector>
+class AnimatedSprite;
+class Texture;
 
 // Cantidad de elementos del vector con los valores de la deformación del globo al rebotar
 #define MAX_BOUNCE 10

source/bullet.cpp

@@ -1,5 +1,7 @@
 #include "bullet.h"
-#include "param.h"
+#include "param.h"   // for param
+#include "sprite.h"  // for Sprite
+class Texture;
 
 // Constructor
 Bullet::Bullet(int x, int y, int kind, bool poweredUp, int owner, SDL_Rect *playArea, Texture *texture)

source/bullet.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>    // for SDL_Rect
-#include "sprite.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint8
-#include "utils.h"
+#include "utils.h"            // for circle_t
+class Sprite;
+class Texture;
 
 // Tipos de bala
 #define BULLET_UP 1

source/dbgtxt.cpp

@@ -1,9 +1,12 @@
 #include "dbgtxt.h"
+#include <SDL2/SDL_rect.h>     // for SDL_Rect
+#include <SDL2/SDL_rwops.h>    // for SDL_RWFromMem
+#include <SDL2/SDL_surface.h>  // for SDL_LoadBMP_RW
 
 namespace
 {
-    SDL_Texture *dbg_tex = NULL;
+    SDL_Texture *dbg_tex = nullptr;
-    SDL_Renderer *dbg_ren = NULL;
+    SDL_Renderer *dbg_ren = nullptr;
 }
 
 void dbg_init(SDL_Renderer *renderer)

source/dbgtxt.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_render.h>  // for SDL_Renderer
+#include <SDL2/SDL_stdinc.h>  // for Uint8
 
 void dbg_init(SDL_Renderer *renderer);
 void dbg_print(int x, int y, const char *text, Uint8 r, Uint8 g, Uint8 b);

source/define_buttons.cpp

@@ -1,7 +1,10 @@
 #include "define_buttons.h"
-#include "param.h"
+#include "lang.h"     // for getText
-#include "options.h"
+#include "options.h"  // for options
-#include "section.h"
+#include "param.h"    // for param
+#include "section.h"  // for name, name_e, options, options_e
+#include "text.h"     // for Text
+#include "utils.h"    // for op_controller_t, options_t, param_t, paramGame_t
 
 // Constructor
 DefineButtons::DefineButtons(Text *text)

source/define_buttons.h

@@ -1,9 +1,11 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_events.h>          // for SDL_ControllerButtonEvent
-#include "input.h"
+#include <SDL2/SDL_gamecontroller.h>  // for SDL_GameControllerButton
-#include "text.h"
+#include <string>                     // for string, basic_string
-#include "lang.h"
+#include <vector>                     // for vector
+#include "input.h"                    // for inputs_e
+class Text;
 
 struct db_button_t
 {

source/director.cpp

@@ -1,17 +1,38 @@
 #include "director.h"
-#include "utils.h"
+#include <SDL2/SDL.h>				 // for SDL_Init, SDL_Quit, SDL_INIT_EV...
-#include "options.h"
+#include <SDL2/SDL_audio.h>			 // for AUDIO_S16
-#include "section.h"
+#include <SDL2/SDL_blendmode.h>		 // for SDL_BLENDMODE_BLEND
-#include <iostream>
+#include <SDL2/SDL_error.h>			 // for SDL_GetError
-#include <fstream>
+#include <SDL2/SDL_gamecontroller.h> // for SDL_CONTROLLER_BUTTON_B, SDL_CO...
-#include <string>
+#include <SDL2/SDL_hints.h>			 // for SDL_SetHint, SDL_HINT_RENDER_DR...
-#include <sys/stat.h>
+#include <SDL2/SDL_scancode.h>		 // for SDL_SCANCODE_DOWN, SDL_SCANCODE_E
-#include <unistd.h>
+#include <SDL2/SDL_stdinc.h>		 // for Uint32
-#include "dbgtxt.h"
+#include <SDL2/SDL_timer.h>			 // for SDL_GetTicks
-
+#include <errno.h>					 // for errno, EACCES, EEXIST, ENAMETOO...
-#ifndef _WIN32
+#include <pwd.h>					 // for getpwuid, passwd
-#include <pwd.h>
+#include <stdio.h>					 // for printf, perror, size_t
-#endif
+#include <string.h>					 // for strcmp
+#include <sys/stat.h>				 // for stat, mkdir, S_IRWXU
+#include <unistd.h>					 // for getuid
+#include <cstdlib>					 // for exit, EXIT_FAILURE, rand, srand
+#include <iostream>					 // for basic_ostream, operator<<, cout
+#include <string>					 // for basic_string, operator+, allocator
+#include "asset.h"					 // for Asset, assetType
+#include "dbgtxt.h"					 // for dbg_init
+#include "game.h"					 // for Game, GAME_MODE_DEMO_OFF, GAME_...
+#include "hiscore_table.h"			 // for HiScoreTable
+#include "input.h"					 // for inputs_e, Input
+#include "instructions.h"			 // for Instructions
+#include "intro.h"					 // for Intro
+#include "jail_audio.h"				 // for JA_DeleteMusic, JA_DeleteSound
+#include "logo.h"					 // for Logo
+#include "manage_hiscore_table.h"	 // for ManageHiScoreTable
+#include "options.h"				 // for options, loadOptionsFile, saveO...
+#include "param.h"					 // for param, loadParamsFromFile
+#include "screen.h"					 // for Screen
+#include "section.h"				 // for name_e, name, options, options_e
+#include "title.h"					 // for Title
+#include "utils.h"					 // for music_file_t, sound_file_t, opt...
 
 // Constructor
 Director::Director(int argc, char *argv[])

source/director.h

@@ -1,22 +1,20 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_render.h>  // for SDL_Renderer
-#include "asset.h"
+#include <SDL2/SDL_video.h>   // for SDL_Window
-#include "input.h"
+#include <string>             // for string, basic_string
-#include "jail_audio.h"
+#include <vector>             // for vector
-#include "screen.h"
+#include "lang.h"             // for lang_e
-#include "text.h"
+#include "utils.h"            // for music_file_t, sound_file_t
-#include "utils.h"
+class Asset;
-#include "fade.h"
+class Game;
-#include "game.h"
+class HiScoreTable;
-#include "intro.h"
+class Input;
-#include "item.h"
+class Instructions;
-#include "lang.h"
+class Intro;
-#include "logo.h"
+class Logo;
-#include "player.h"
+class Screen;
-#include "title.h"
+class Title;
-#include "param.h"
-#include "manage_hiscore_table.h"
 
 // Textos
 #define WINDOW_CAPTION "Coffee Crisis Arcade Edition"

source/enemy_formations.cpp

@@ -1,5 +1,7 @@
 #include "enemy_formations.h"
-#include "param.h"
+#include "balloon.h"  // for BALLOON_VELX_NEGATIVE, BALLOON_VELX_POSITIVE
+#include "param.h"    // for param
+#include "utils.h"    // for paramGame_t, param_t, zone_t, BLOCK
 
 // Constructor
 EnemyFormations::EnemyFormations()

source/enemy_formations.h

@@ -1,9 +1,5 @@
 #pragma once
 
-#include <SDL2/SDL.h>
-#include "utils.h"
-#include "balloon.h"
-
 #define NUMBER_OF_ENEMY_FORMATIONS 100
 #define MAX_NUMBER_OF_ENEMIES_IN_A_FORMATION 50
 

source/enter_name.cpp

@@ -1,4 +1,5 @@
 #include "enter_name.h"
+#include <algorithm>  // for max, min
 
 // Constructor
 EnterName::EnterName(std::string *name)

source/explosions.cpp

@@ -1,4 +1,6 @@
 #include "explosions.h"
+#include "animated_sprite.h"  // for AnimatedSprite
+class Texture;
 
 // Constructor
 Explosions::Explosions()

source/explosions.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <string>  // for string
-#include "texture.h"
+#include <vector>  // for vector
-#include "animatedsprite.h"
+class AnimatedSprite;
-#include <vector>
+class Texture;
 
 struct explosion_texture_t
 {

source/fade.cpp

@@ -1,6 +1,10 @@
 #include "fade.h"
-#include "param.h"
+#include <SDL2/SDL_blendmode.h>  // for SDL_BLENDMODE_BLEND, SDL_BLENDMODE_NONE
-#include <iostream>
+#include <SDL2/SDL_pixels.h>     // for SDL_PIXELFORMAT_RGBA8888
+#include <stdlib.h>              // for rand
+#include <algorithm>             // for min, max
+#include "param.h"               // for param
+#include "utils.h"               // for param_t, paramGame_t, paramFade_t
 
 // Constructor
 Fade::Fade(SDL_Renderer *renderer)

source/fade.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>    // for SDL_Rect
-#include "texture.h"
+#include <SDL2/SDL_render.h>  // for SDL_Renderer, SDL_Texture
-#include "utils.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint8, Uint16
+#include <vector>             // for vector
 
 // Tipos de fundido
 #define FADE_FULLSCREEN 0

source/game.cpp

@@ -1,7 +1,36 @@
 #include "game.h"
-#include "param.h"
+#include <SDL2/SDL_blendmode.h>    // for SDL_BLENDMODE_BLEND
-#include "options.h"
+#include <SDL2/SDL_keycode.h>      // for SDLK_1, SDLK_2, SDLK_3, SDLK_h
-#include <fstream>
+#include <SDL2/SDL_pixels.h>       // for SDL_PIXELFORMAT_RGBA8888
+#include <SDL2/SDL_rwops.h>        // for SDL_RWFromFile, SDL_RWclose, SDL_R...
+#include <SDL2/SDL_timer.h>        // for SDL_GetTicks
+#include <SDL2/SDL_video.h>        // for SDL_WINDOWEVENT_FOCUS_GAINED, SDL_...
+#include <stdlib.h>                // for rand
+#include <algorithm>               // for min
+#include <fstream>                 // for basic_ifstream
+#include <iostream>                // for char_traits, basic_istream, ifstream
+#include "asset.h"                 // for Asset
+#include "background.h"            // for Background
+#include "balloon.h"               // for Balloon, BALLOON_SPEED_1, BALLOON_...
+#include "bullet.h"                // for Bullet, BULLET_LEFT, BULLET_RIGHT
+#include "enemy_formations.h"      // for stage_t, EnemyFormations, enemyIni...
+#include "explosions.h"            // for Explosions
+#include "fade.h"                  // for Fade, FADE_RANDOM_SQUARE, FADE_VEN...
+#include "input.h"                 // for inputs_e, Input, INPUT_DO_NOT_ALLO...
+#include "item.h"                  // for Item, ITEM_COFFEE_MACHINE, ITEM_CLOCK
+#include "jail_audio.h"            // for JA_PlaySound, JA_DeleteSound, JA_L...
+#include "lang.h"                  // for getText
+#include "manage_hiscore_table.h"  // for ManageHiScoreTable
+#include "options.h"               // for options
+#include "param.h"                 // for param
+#include "player.h"                // for Player, PLAYER_STATUS_PLAYING, PLA...
+#include "scoreboard.h"            // for Scoreboard, scoreboard_modes_e
+#include "screen.h"                // for Screen
+#include "smart_sprite.h"           // for SmartSprite
+#include "text.h"                  // for Text, TXT_CENTER
+#include "texture.h"               // for Texture
+struct JA_Music_t;
+struct JA_Sound_t;
 
 #define GAME_OVER_COUNTER 350
 

source/game.h

@@ -1,28 +1,29 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_events.h>  // for SDL_Event
-#include "balloon.h"
+#include <SDL2/SDL_render.h>  // for SDL_Renderer, SDL_Texture
-#include "bullet.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint32
-#include "asset.h"
+#include <string>             // for string
-#include "input.h"
+#include <vector>             // for vector
-#include "jail_audio.h"
+#include "section.h"          // for options_e
-#include "movingsprite.h"
+#include "utils.h"            // for demoKeys_t, color_t, hiScoreEntry_t
-#include "screen.h"
+class Asset;
-#include "smartsprite.h"
+class Background;
-#include "sprite.h"
+class Balloon;
-#include "text.h"
+class Bullet;
-#include "utils.h"
+class EnemyFormations;
-#include "fade.h"
+class Explosions;
-#include "item.h"
+class Fade;
-#include "player.h"
+class Input;
-#include "scoreboard.h"
+class Item;
-#include "background.h"
+class Player;
-#include "lang.h"
+class Scoreboard;
-#include "manage_hiscore_table.h"
+class Screen;
-#include "explosions.h"
+class SmartSprite;
-#include "enemy_formations.h"
+class Text;
-#include "section.h"
+class Texture;
-#include <iostream>
+struct JA_Music_t;
+struct JA_Sound_t;
 
 #define GAME_MODE_DEMO_OFF false
 #define GAME_MODE_DEMO_ON true

source/game_logo.cpp

@@ -1,5 +1,15 @@
 #include "game_logo.h"
-#include "param.h"
+#include <algorithm>         // for max
+#include <string>            // for basic_string
+#include "animated_sprite.h"  // for AnimatedSprite
+#include "asset.h"           // for Asset
+#include "jail_audio.h"      // for JA_DeleteSound, JA_LoadSound, JA_PlaySound
+#include "param.h"           // for param
+#include "screen.h"          // for Screen
+#include "smart_sprite.h"     // for SmartSprite
+#include "sprite.h"          // for Sprite
+#include "texture.h"         // for Texture
+#include "utils.h"           // for param_t, paramGame_t, paramTitle_t
 
 // Constructor
 GameLogo::GameLogo(int x, int y)

source/game_logo.h

@@ -1,10 +1,13 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_render.h>  // for SDL_Renderer
-#include "asset.h"
+class AnimatedSprite;
-#include "screen.h"
+class Asset;
-#include "smartsprite.h"
+class Screen;
-#include "jail_audio.h"
+class SmartSprite;
+class Sprite;
+class Texture;
+struct JA_Sound_t;
 
 // Clase GameLogo
 class GameLogo

source/global_inputs.cpp

@@ -1,9 +1,12 @@
 #include "global_inputs.h"
-#include "section.h"
+#include <string>        // for basic_string, operator+
-#include "screen.h"
+#include "input.h"       // for Input, inputs_e, INPUT_DO_NOT_ALLOW_REPEAT
-#include "input.h"
+#include "jail_audio.h"  // for JA_EnableMusic, JA_EnableSound
-#include "lang.h"
+#include "lang.h"        // for getText
-#include "options.h"
+#include "options.h"     // for options
+#include "screen.h"      // for Screen
+#include "section.h"     // for options_e, name, name_e, options
+#include "utils.h"       // for op_audio_t, options_t, op_music_t, boolToOnOff
 
 // Termina
 void quit(section::options_e code)

source/hiscore_table.cpp

@@ -1,8 +1,22 @@
-#include <iostream>
-#include "global_inputs.h"
 #include "hiscore_table.h"
-#include "options.h"
+#include <SDL2/SDL_blendmode.h>  // for SDL_BLENDMODE_BLEND
-#include "param.h"
+#include <SDL2/SDL_pixels.h>     // for SDL_PIXELFORMAT_RGBA8888
+#include <SDL2/SDL_timer.h>      // for SDL_GetTicks
+#include <SDL2/SDL_video.h>      // for SDL_WINDOWEVENT_SIZE_CHANGED
+#include <algorithm>             // for max
+#include <vector>                // for vector
+#include "asset.h"               // for Asset
+#include "background.h"          // for Background
+#include "fade.h"                // for Fade, FADE_IN, FADE_OUT, FADE_RANDOM...
+#include "global_inputs.h"       // for checkGlobalInputs
+#include "input.h"               // for Input
+#include "jail_audio.h"          // for JA_GetMusicState, JA_Music_state
+#include "lang.h"                // for getText
+#include "options.h"             // for options
+#include "param.h"               // for param
+#include "screen.h"              // for Screen
+#include "text.h"                // for Text, TXT_CENTER, TXT_SHADOW, TXT_COLOR
+#include "utils.h"               // for param_t, paramGame_t, hiScoreEntry_t
 
 // Constructor
 HiScoreTable::HiScoreTable(JA_Music_t *music)

source/hiscore_table.h

@@ -1,17 +1,18 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_events.h>  // for SDL_Event
-#include "asset.h"
+#include <SDL2/SDL_rect.h>    // for SDL_Rect
-#include "input.h"
+#include <SDL2/SDL_render.h>  // for SDL_Renderer, SDL_Texture
-#include "jail_audio.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint16, Uint32
-#include "screen.h"
+#include <string>             // for string
-#include "sprite.h"
+#include "section.h"          // for options_e
-#include "text.h"
+class Asset;
-#include "utils.h"
+class Background;
-#include "lang.h"
+class Fade;
-#include "fade.h"
+class Input;
-#include "background.h"
+class Screen;
-#include "section.h"
+class Text;
+struct JA_Music_t;
 
 /*
 	Esta clase gestiona un estado del programa. Se encarga de mostrar la tabla con las puntuaciones

source/input.cpp

@@ -1,5 +1,9 @@
 #include "input.h"
-#include <iostream>
+#include <SDL2/SDL.h>           // for SDL_INIT_GAMECONTROLLER, SDL_InitSubS...
+#include <SDL2/SDL_error.h>     // for SDL_GetError
+#include <SDL2/SDL_events.h>    // for SDL_ENABLE
+#include <SDL2/SDL_keyboard.h>  // for SDL_GetKeyboardState
+#include <iostream>             // for basic_ostream, operator<<, cout, basi...
 
 // [SINGLETON] Hay que definir las variables estáticas, desde el .h sólo la hemos declarado
 Input *Input::input = nullptr;

source/input.h

@@ -1,8 +1,11 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_gamecontroller.h>  // for SDL_GameControllerButton, SDL_G...
-#include <string>
+#include <SDL2/SDL_joystick.h>        // for SDL_Joystick
-#include <vector>
+#include <SDL2/SDL_scancode.h>        // for SDL_Scancode
+#include <SDL2/SDL_stdinc.h>          // for Uint8
+#include <string>                     // for string, basic_string
+#include <vector>                     // for vector
 
 /*
 connectedControllers es un vector donde estan todos los mandos encontrados [0 .. n]

source/instructions.cpp

@@ -1,8 +1,25 @@
 #include "instructions.h"
-#include "param.h"
+#include <SDL2/SDL_blendmode.h>  // for SDL_BLENDMODE_BLEND
-#include "options.h"
+#include <SDL2/SDL_pixels.h>     // for SDL_PIXELFORMAT_RGBA8888
-#include "global_inputs.h"
+#include <SDL2/SDL_timer.h>      // for SDL_GetTicks
-#include <iostream>
+#include <SDL2/SDL_video.h>      // for SDL_WINDOWEVENT_SIZE_CHANGED
+#include <algorithm>             // for max
+#include <string>                // for basic_string
+#include "asset.h"               // for Asset
+#include "fade.h"                // for Fade, FADE_FULLSCREEN, FADE_IN
+#include "global_inputs.h"       // for checkGlobalInputs
+#include "input.h"               // for Input
+#include "jail_audio.h"          // for JA_GetMusicState, JA_Music_state
+#include "lang.h"                // for getText
+#include "param.h"               // for param
+#include "screen.h"              // for Screen
+#include "section.h"             // for name, name_e, options, options_e
+#include "sprite.h"              // for Sprite
+#include "text.h"                // for Text, TXT_CENTER, TXT_COLOR, TXT_SHADOW
+#include "texture.h"             // for Texture
+#include "tiled_bg.h"             // for Tiledbg, TILED_MODE_STATIC
+#include "utils.h"               // for param_t, paramGame_t, color_t, shdwT...
+struct JA_Music_t;
 
 // Constructor
 Instructions::Instructions(JA_Music_t *music)

source/instructions.h

@@ -1,17 +1,19 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_events.h>  // for SDL_Event
-#include "asset.h"
+#include <SDL2/SDL_rect.h>    // for SDL_Point, SDL_Rect
-#include "input.h"
+#include <SDL2/SDL_render.h>  // for SDL_Texture, SDL_Renderer
-#include "jail_audio.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint32
-#include "screen.h"
+#include <vector>             // for vector
-#include "sprite.h"
+class Asset;
-#include "text.h"
+class Fade;
-#include "utils.h"
+class Input;
-#include "lang.h"
+class Screen;
-#include "tiledbg.h"
+class Sprite;
-#include "fade.h"
+class Text;
-#include "section.h"
+class Texture;
+class Tiledbg;
+struct JA_Music_t;
 
 /*
 	Esta clase gestiona un estado del programa. Se encarga de poner en pantalla

source/intro.cpp

@@ -1,7 +1,22 @@
-#include "global_inputs.h"
 #include "intro.h"
-#include "options.h"
+#include <SDL2/SDL_render.h>  // for SDL_Renderer
-#include "param.h"
+#include <SDL2/SDL_timer.h>   // for SDL_GetTicks
+#include <SDL2/SDL_video.h>   // for SDL_WINDOWEVENT_SIZE_CHANGED
+#include <string>             // for basic_string
+#include "asset.h"            // for Asset
+#include "global_inputs.h"    // for checkGlobalInputs
+#include "input.h"            // for Input
+#include "jail_audio.h"       // for JA_StopMusic, JA_PlayMusic
+#include "lang.h"             // for getText
+#include "param.h"            // for param
+#include "screen.h"           // for Screen
+#include "section.h"          // for name, name_e, options, options_e
+#include "smart_sprite.h"      // for SmartSprite
+#include "text.h"             // for Text
+#include "texture.h"          // for Texture
+#include "utils.h"            // for paramGame_t, param_t, zone_t, BLOCK
+#include "writer.h"           // for Writer
+struct JA_Music_t;
 
 // Constructor
 Intro::Intro(JA_Music_t *music)

source/intro.h

@@ -1,16 +1,16 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_events.h>  // for SDL_Event
-#include "asset.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint32, Uint8
-#include "input.h"
+#include <vector>             // for vector
-#include "jail_audio.h"
+class Asset;
-#include "screen.h"
+class Input;
-#include "smartsprite.h"
+class Screen;
-#include "utils.h"
+class SmartSprite;
-#include "writer.h"
+class Text;
-#include "lang.h"
+class Texture;
-#include <vector>
+class Writer;
-#include "section.h"
+struct JA_Music_t;
 
 /*
 	Esta clase gestiona un estado del programa. Se encarga de mostrar la secuencia

source/item.cpp

@@ -1,5 +1,8 @@
 #include "item.h"
-#include "param.h"
+#include <stdlib.h>          // for rand
+#include "animated_sprite.h"  // for AnimatedSprite
+#include "param.h"           // for param
+class Texture;
 
 // Constructor
 Item::Item(int kind, float x, float y, SDL_Rect *playArea, Texture *texture, std::vector<std::string> *animation)

source/item.h

@@ -1,8 +1,12 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>    // for SDL_Rect
-#include "animatedsprite.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint16
-#include "utils.h"
+#include <string>             // for string
+#include <vector>             // for vector
+#include "utils.h"            // for circle_t
+class AnimatedSprite;
+class Texture;
 
 // Tipos de objetos
 #define ITEM_POINTS_1_DISK 1

source/jail_audio.cpp

@@ -1,8 +1,10 @@
 #ifndef JA_USESDLMIXER
+
 #include "jail_audio.h"
-#include "stb_vorbis.c"
+#include <stdint.h>      // for uint8_t
-#include <SDL2/SDL.h>
+#include <stdio.h>       // for NULL, fseek, fclose, fopen, fread, ftell, FILE
-#include <stdio.h>
+#include <stdlib.h>      // for free, malloc
+#include "stb_vorbis.c"  // for stb_vorbis_decode_memory
 
 #define JA_MAX_SIMULTANEOUS_CHANNELS 5
 

source/jail_audio.h

@@ -1,12 +1,13 @@
 #pragma once
-#include <SDL2/SDL.h>
+
+#include <SDL2/SDL_audio.h>   // for SDL_AudioFormat
+#include <SDL2/SDL_stdinc.h>  // for Uint32, Uint8
+struct JA_Music_t;  // lines 5-5
+struct JA_Sound_t;  // lines 6-6
 
 enum JA_Channel_state { JA_CHANNEL_INVALID, JA_CHANNEL_FREE, JA_CHANNEL_PLAYING, JA_CHANNEL_PAUSED, JA_SOUND_DISABLED };
 enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MUSIC_STOPPED, JA_MUSIC_DISABLED };
 
-struct JA_Sound_t;
-struct JA_Music_t;
-
 void JA_Init(const int freq, const SDL_AudioFormat format, const int channels);
 void JA_Quit();
 

source/jail_shader.cpp

@@ -1,7 +1,10 @@
 #ifndef NO_SHADERS
-#include "jshader.h"
 
-#include <iostream>
+#include "jail_shader.h"
+#include <SDL2/SDL_rect.h>    // for SDL_Point
+#include <stdlib.h>           // for NULL, free, malloc, exit
+#include <string.h>           // for strncmp
+#include <iostream>           // for basic_ostream, char_traits, operator<<
 
 #ifdef __APPLE__
 #include "CoreFoundation/CoreFoundation.h"
@@ -14,7 +17,6 @@
 #endif //!ESSENTIAL_GL_PRACTICES_SUPPORT_GL3
 #else
 #include <SDL2/SDL_opengl.h>
-#include <SDL2/SDL_opengl_glext.h>
 #endif
 
 namespace shader

source/jail_shader.h

@@ -2,7 +2,8 @@
 
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_render.h>  // for SDL_Texture
+#include <SDL2/SDL_video.h>   // for SDL_Window
 
 // TIPS:
 // =======================================================================

source/lang.cpp

@@ -1,6 +1,6 @@
 #include "lang.h"
-#include <iostream>
+#include <fstream>  // for basic_ifstream, basic_istream, ifstream
-#include <fstream>
+#include <vector>   // for vector
 
 namespace lang
 { 

source/lang.h

@@ -1,8 +1,6 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <string>  // for string
-#include <string>
-#include <vector>
 
 namespace lang
 {

source/logo.cpp

@@ -1,8 +1,17 @@
 #include "logo.h"
-#include "param.h"
+#include <SDL2/SDL_render.h>  // for SDL_Renderer
-#include "options.h"
+#include <SDL2/SDL_timer.h>   // for SDL_GetTicks
-#include "global_inputs.h"
+#include <SDL2/SDL_video.h>   // for SDL_WINDOWEVENT_SIZE_CHANGED
-#include <iostream>
+#include <string>             // for basic_string
+#include "asset.h"            // for Asset
+#include "global_inputs.h"    // for checkGlobalInputs
+#include "input.h"            // for Input
+#include "jail_audio.h"       // for JA_StopMusic
+#include "param.h"            // for param
+#include "screen.h"           // for Screen
+#include "section.h"          // for name, name_e, options, options_e
+#include "sprite.h"           // for Sprite
+#include "texture.h"          // for Texture
 
 // Constructor
 Logo::Logo()

source/logo.h

@@ -1,15 +1,15 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_events.h>  // for SDL_Event
-#include <vector>
+#include <SDL2/SDL_rect.h>    // for SDL_Point
-#include "asset.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint32
-#include "input.h"
+#include <vector>             // for vector
-#include "jail_audio.h"
+#include "utils.h"            // for color_t
-#include "lang.h"
+class Asset;
-#include "screen.h"
+class Input;
-#include "section.h"
+class Screen;
-#include "sprite.h"
+class Sprite;
-#include "utils.h"
+class Texture;
 
 /*
 	Esta clase gestiona un estado del programa. Se encarga de dibujar por pantalla el

source/main.cpp

@@ -7,8 +7,9 @@ Actualizando a la versión "Arcade Edition" en 08/05/2024
 
 */
 
-#include "director.h"
+#include <iostream>    // for basic_ostream, char_traits, operator<<, cout
-#include <stdio.h>
+#include <string>      // for basic_string, operator<<, string
+#include "director.h"  // for Director
 
 int main(int argc, char *argv[])
 {

source/manage_hiscore_table.cpp

@@ -1,5 +1,10 @@
 #include "manage_hiscore_table.h"
-#include <iostream>
+#include <SDL2/SDL_error.h>  // for SDL_GetError
+#include <SDL2/SDL_rwops.h>  // for SDL_RWread, SDL_RWwrite, SDL_RWFromFile
+#include <stdlib.h>          // for free, malloc
+#include <algorithm>         // for sort
+#include <iostream>          // for basic_ostream, char_traits, operator<<
+#include "utils.h"           // for hiScoreEntry_t
 
 // Constructor
 ManageHiScoreTable::ManageHiScoreTable(std::vector<hiScoreEntry_t> *table)

source/manage_hiscore_table.h

@@ -1,7 +1,8 @@
 #pragma once
 
-#include <algorithm>
+#include <string>  // for string
-#include "utils.h"
+#include <vector>  // for vector
+struct hiScoreEntry_t;
 
 /*
     Esta clase sirve para añadir elementos hiScoreEntry_r a un vector (tabla), de manera

source/moving_sprite.cpp

@@ -1,4 +1,5 @@
-#include "movingsprite.h"
+#include "moving_sprite.h"
+#include "texture.h"  // for Texture
 
 // Constructor
 MovingSprite::MovingSprite(float x, float y, int w, int h, float velx, float vely, float accelx, float accely, Texture *texture)

source/moving_sprite.h

@@ -1,7 +1,10 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>    // for SDL_Rect, SDL_Point
-#include "sprite.h"
+#include <SDL2/SDL_render.h>  // for SDL_RendererFlip
+#include <SDL2/SDL_stdinc.h>  // for Uint16
+#include "sprite.h"           // for Sprite
+class Texture;
 
 // Clase MovingSprite. Añade posicion y velocidad en punto flotante
 class MovingSprite : public Sprite

source/notify.cpp

@@ -1,8 +1,12 @@
 #include "notify.h"
-#include "options.h"
+#include <SDL2/SDL_blendmode.h>  // for SDL_BLENDMODE_BLEND
-#include <string>
+#include <SDL2/SDL_pixels.h>     // for SDL_PIXELFORMAT_RGBA8888
-#include <stdio.h>
+#include <string>                // for basic_string, char_traits, string
-#include <iostream>
+#include "jail_audio.h"          // for JA_DeleteSound, JA_LoadSound, JA_Pla...
+#include "options.h"             // for options
+#include "sprite.h"              // for Sprite
+#include "text.h"                // for Text
+#include "texture.h"             // for Texture
 
 // Constructor
 Notify::Notify(SDL_Renderer *renderer, std::string iconFile, std::string bitmapFile, std::string textFile, std::string soundFile)

source/notify.h

@@ -1,12 +1,14 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>    // for SDL_Rect
-#include "jail_audio.h"
+#include <SDL2/SDL_render.h>  // for SDL_Renderer
-#include "sprite.h"
+#include <string>             // for basic_string, string
-#include "text.h"
+#include <vector>             // for vector
-#include "texture.h"
+#include "utils.h"            // for color_t
-#include "utils.h"
+class Sprite;
-#include <vector>
+class Text;
+class Texture;
+struct JA_Sound_t;
 
 #ifndef NOTIFY_H
 #define NOTIFY_H

source/options.cpp

@@ -1,8 +1,14 @@
 #include "options.h"
-#include "screen.h"
+#include <SDL2/SDL_gamecontroller.h>  // for SDL_GameControllerButton, SDL_C...
-#include "lang.h"
+#include <SDL2/SDL_video.h>           // for SDL_WINDOW_FULLSCREEN, SDL_WIND...
-#include <iostream>
+#include <algorithm>                  // for max, min
-#include <fstream>
+#include <fstream>                    // for char_traits, basic_ostream, ope...
+#include <iostream>                   // for cout
+#include <vector>                     // for vector
+#include "input.h"                    // for inputs_e, INPUT_USE_ANY, INPUT_...
+#include "lang.h"                     // for lang_e
+#include "screen.h"                   // for SCREEN_FILTER_NEAREST, SCREEN_V...
+#include "utils.h"                    // for op_controller_t, options_t, op_...
 
 // Variables
 options_t options;

source/options.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <string>  // for string
-#include "utils.h"
+struct options_t;
 
 // Variables
 extern options_t options;

source/param.cpp

@@ -1,6 +1,7 @@
 #include "param.h"
-#include <iostream>
+#include <fstream>   // for char_traits, basic_ostream, basic_ifstream, basi...
-#include <fstream>
+#include <iostream>  // for cout
+#include "utils.h"   // for param_t, paramGame_t, zone_t, paramBalloon_t
 
 param_t param;
 

source/param.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <string>  // for string
-#include "utils.h"
+struct param_t;
 
 extern param_t param;
 

source/player.cpp

@@ -1,5 +1,12 @@
 #include "player.h"
-#include "param.h"
+#include <SDL2/SDL_render.h>  // for SDL_FLIP_HORIZONTAL, SDL_FLIP_NONE, SDL...
+#include <SDL2/SDL_timer.h>   // for SDL_GetTicks
+#include <stdlib.h>           // for rand
+#include <algorithm>          // for max, min
+#include "animated_sprite.h"  // for AnimatedSprite
+#include "input.h"            // for inputs_e
+#include "param.h"            // for param
+#include "texture.h"          // for Texture
 
 // Constructor
 Player::Player(int id, float x, int y, SDL_Rect *playArea, std::vector<Texture *> texture, std::vector<std::vector<std::string> *> animations)

source/player.h

@@ -1,11 +1,12 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>    // for SDL_Rect
-#include "animatedsprite.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint32
-#include "asset.h"
+#include <string>             // for string, basic_string
-#include "input.h"
+#include <vector>             // for vector
-#include "texture.h"
+#include "utils.h"            // for circle_t
-#include "utils.h"
+class AnimatedSprite;
+class Texture;
 
 // Estados del jugador
 #define PLAYER_STATUS_WALKING_LEFT 0

source/scoreboard.cpp

@@ -1,5 +1,13 @@
 #include "scoreboard.h"
-#include <math.h>
+#include <SDL2/SDL_blendmode.h>  // for SDL_BLENDMODE_BLEND
+#include <SDL2/SDL_pixels.h>     // for SDL_PIXELFORMAT_RGBA8888
+#include <SDL2/SDL_timer.h>      // for SDL_GetTicks
+#include <math.h>                // for roundf
+#include "asset.h"               // for Asset
+#include "lang.h"                // for getText
+#include "sprite.h"              // for Sprite
+#include "text.h"                // for Text
+#include "texture.h"             // for Texture
 
 // Constructor
 Scoreboard::Scoreboard(SDL_Renderer *renderer)

source/scoreboard.h

@@ -1,12 +1,15 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>    // for SDL_Point, SDL_Rect
-#include "asset.h"
+#include <SDL2/SDL_render.h>  // for SDL_Renderer, SDL_Texture
-#include "screen.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint32
-#include "sprite.h"
+#include <string>             // for string, basic_string
-#include "text.h"
+#include <vector>             // for vector
-#include "utils.h"
+#include "utils.h"            // for color_t
-#include "lang.h"
+class Asset;
+class Sprite;
+class Text;
+class Texture;
 
 // Defines
 #define SCOREBOARD_LEFT_PANEL 0

source/screen.cpp

@@ -1,13 +1,21 @@
 #include "screen.h"
-#include "options.h"
+#include <SDL2/SDL_events.h>  // for SDL_DISABLE, SDL_ENABLE
-#include <string>
+#include <SDL2/SDL_mouse.h>   // for SDL_ShowCursor
-#include <iostream>
+#include <SDL2/SDL_pixels.h>  // for SDL_PIXELFORMAT_RGBA8888
-#include <fstream>
+#include <SDL2/SDL_timer.h>   // for SDL_GetTicks
-#include <streambuf>
+#include <algorithm>          // for max, min
+#include <fstream>            // for basic_ifstream, ifstream
+#include <iterator>           // for istreambuf_iterator, operator!=
+#include <string>             // for basic_string, operator+, to_string, cha...
+#include "asset.h"            // for Asset
+#include "dbgtxt.h"           // for dbg_print
+#include "input.h"            // for Input, inputs_e, INPUT_DO_NOT_ALLOW_REPEAT
+#include "notify.h"           // for Notify
+#include "options.h"          // for options
+
 #ifndef NO_SHADERS
-#include "jshader.h"
+#include "jail_shader.h"      // for init, render
 #endif
-#include "dbgtxt.h"
 
 // [SINGLETON] Hay que definir las variables estáticas, desde el .h sólo la hemos declarado
 Screen *Screen::screen = nullptr;

source/screen.h

@@ -1,11 +1,15 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_blendmode.h>  // for SDL_BlendMode
-#include <vector>
+#include <SDL2/SDL_rect.h>       // for SDL_Rect
-#include "asset.h"
+#include <SDL2/SDL_render.h>     // for SDL_Renderer, SDL_Texture
-#include "input.h"
+#include <SDL2/SDL_stdinc.h>     // for Uint32
-#include "notify.h"
+#include <SDL2/SDL_video.h>      // for SDL_Window
-#include "utils.h"
+#include <string>                // for basic_string, string
+#include "utils.h"               // for color_t
+class Asset;
+class Input;
+class Notify;
 
 #define SCREEN_FILTER_NEAREST 0
 #define SCREEN_FILTER_LINEAL 1

source/section.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <SDL2/SDL.h>
-
 namespace section
 {
     // Secciones del programa

source/smart_sprite.cpp

@@ -1,4 +1,6 @@
-#include "smartsprite.h"
+#include "smart_sprite.h"
+#include "moving_sprite.h"  // for MovingSprite
+class Texture;
 
 // Constructor
 SmartSprite::SmartSprite(Texture *texture)

source/smart_sprite.h

@@ -1,9 +1,7 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include "animated_sprite.h"  // for AnimatedSprite
-#include "animatedsprite.h"
+class Texture;
-#include "utils.h"
-#include <vector>
 
 // Clase SmartSprite
 class SmartSprite : public AnimatedSprite

source/sprite.cpp

@@ -1,4 +1,5 @@
 #include "sprite.h"
+#include "texture.h"  // for Texture
 
 // Constructor
 Sprite::Sprite(int x, int y, int w, int h, Texture *texture)

source/sprite.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>  // for SDL_Rect, SDL_Point
-#include "texture.h"
+class Texture;
 
 // Clase sprite
 class Sprite

source/text.cpp

@@ -1,7 +1,9 @@
-
 #include "text.h"
-#include <iostream>
+#include <fstream>    // for char_traits, basic_ostream, basic_ifstream, ope...
-#include <fstream>
+#include <iostream>   // for cout
+#include "sprite.h"   // for Sprite
+#include "texture.h"  // for Texture
+#include "utils.h"    // for color_t
 
 // Llena una estructuta textFile_t desde un fichero
 textFile_t LoadTextFile(std::string file, bool verbose)

source/text.h

@@ -1,7 +1,11 @@
 #pragma once
 
-#include "sprite.h"
+#include <SDL2/SDL_render.h>  // for SDL_Renderer
+#include <SDL2/SDL_stdinc.h>  // for Uint8
+#include <string>             // for string
 #include "utils.h"
+class Sprite;  // lines 6-6
+class Texture;  // lines 7-7
 
 #define TXT_COLOR 1
 #define TXT_SHADOW 2

source/texture.cpp

@@ -1,12 +1,17 @@
 
 #include "texture.h"
+#include <SDL2/SDL_error.h>	  // for SDL_GetError
+#include <SDL2/SDL_surface.h> // for SDL_CreateRGBSurfaceWithFormatFrom
+#include <fcntl.h>			  // for SEEK_END, SEEK_SET
+#include <stdio.h>			  // for fseek, fclose, fopen, fread, ftell, NULL
+#include <stdlib.h>			  // for malloc, free, exit
+#include <iostream>			  // for basic_ostream, operator<<, cout, endl
+#include "gif.c"			  // for LoadGif, LoadPalette
 #define STB_IMAGE_IMPLEMENTATION
-#include "stb_image.h"
+#include "stb_image.h" // for stbi_failure_reason, stbi_image_free
-#include "gif.c"
-#include <iostream>
 
 // Constructor
-Texture::Texture(SDL_Renderer *renderer, std::string path, bool verbose)
+Texture::Texture(SDL_Renderer *renderer, std::string path)
 {
 	// Copia punteros
 	this->renderer = renderer;
@@ -29,7 +34,7 @@ Texture::Texture(SDL_Renderer *renderer, std::string path, bool verbose)
 		// .png
 		if (extension == "png")
 		{
-			loadFromFile(path, verbose);
+			loadFromFile(path);
 		}
 
 		// .gif
@@ -53,7 +58,7 @@ Texture::~Texture()
 }
 
 // Carga una imagen desde un fichero
-bool Texture::loadFromFile(std::string path, bool verbose)
+bool Texture::loadFromFile(std::string path)
 {
 	const std::string filename = path.substr(path.find_last_of("\\/") + 1);
 	int req_format = STBI_rgb_alpha;
@@ -61,15 +66,16 @@ bool Texture::loadFromFile(std::string path, bool verbose)
 	unsigned char *data = stbi_load(path.c_str(), &width, &height, &orig_format, req_format);
 	if (data == nullptr)
 	{
-		SDL_Log("Loading image failed: %s", stbi_failure_reason());
+#ifdef VERBOSE
+		std::cout << "Loading image failed: " << stbi_failure_reason() << std::endl;
+#endif
 		exit(1);
 	}
 	else
 	{
-		if (verbose)
+#ifdef VERBOSE
-		{
+		std::cout << "Image loaded: " << filename.c_str() << std::endl;
-			std::cout << "Image loaded: " << filename.c_str() << std::endl;
+#endif
-		}
 	}
 
 	int depth, pitch;
@@ -97,10 +103,9 @@ bool Texture::loadFromFile(std::string path, bool verbose)
 	SDL_Surface *loadedSurface = SDL_CreateRGBSurfaceWithFormatFrom((void *)data, width, height, depth, pitch, pixel_format);
 	if (loadedSurface == nullptr)
 	{
-		if (verbose)
+#ifdef VERBOSE
-		{
+		std::cout << "Unable to load image " << path.c_str() << std::endl;
-			std::cout << "Unable to load image " << path.c_str() << std::endl;
+#endif
-		}
 	}
 	else
 	{
@@ -108,10 +113,9 @@ bool Texture::loadFromFile(std::string path, bool verbose)
 		newTexture = SDL_CreateTextureFromSurface(renderer, loadedSurface);
 		if (newTexture == nullptr)
 		{
-			if (verbose)
+#ifdef VERBOSE
-			{
+			std::cout << "Unable to create texture from " << path.c_str() << "! SDL Error: " << SDL_GetError() << std::endl;
-				std::cout << "Unable to create texture from " << path.c_str() << "! SDL Error: " << SDL_GetError() << std::endl;
+#endif
-			}
 		}
 		else
 		{
@@ -227,7 +231,7 @@ int Texture::getHeight()
 // Recarga la textura
 bool Texture::reLoad()
 {
-	return loadFromFile(path, renderer);
+	return loadFromFile(path);
 }
 
 // Obtiene la textura

source/texture.h

@@ -1,9 +1,12 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_blendmode.h>  // for SDL_BlendMode
-#include <stdio.h>
+#include <SDL2/SDL_pixels.h>     // for SDL_PIXELFORMAT_RGBA8888, SDL_PixelF...
-#include <string>
+#include <SDL2/SDL_rect.h>       // for SDL_Point, SDL_Rect
-#include <vector>
+#include <SDL2/SDL_render.h>     // for SDL_Renderer, SDL_FLIP_NONE, SDL_TEX...
+#include <SDL2/SDL_stdinc.h>     // for Uint8, Uint32, Uint16
+#include <string>                // for string, basic_string
+#include <vector>                // for vector
 
 // Definiciones de tipos
 struct surface_s
@@ -46,13 +49,13 @@ private:
 
 public:
     // Constructor
-    Texture(SDL_Renderer *renderer, std::string path = "", bool verbose = false);
+    Texture(SDL_Renderer *renderer, std::string path = "");
 
     // Destructor
     ~Texture();
 
     // Carga una imagen desde un fichero
-    bool loadFromFile(std::string path, bool verbose = false);
+    bool loadFromFile(std::string path);
 
     // Crea una textura en blanco
     bool createBlank(int width, int height, SDL_PixelFormatEnum format = SDL_PIXELFORMAT_RGBA8888, SDL_TextureAccess = SDL_TEXTUREACCESS_STREAMING);

source/tiled_bg.cpp

@@ -1,6 +1,10 @@
-#include "screen.h"
+#include "tiled_bg.h"
-#include "sprite.h"
+#include <SDL2/SDL_pixels.h>  // for SDL_PIXELFORMAT_RGBA8888
-#include "tiledbg.h"
+#include <SDL2/SDL_stdinc.h>  // for SDL_sinf
+#include <stdlib.h>           // for rand
+#include "screen.h"           // for Screen
+#include "sprite.h"           // for Sprite
+#include "texture.h"          // for Texture
 
 // Constructor
 Tiledbg::Tiledbg(std::string texturePath, SDL_Rect pos, int mode)

source/tiled_bg.h

@@ -1,6 +1,8 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_rect.h>    // for SDL_Rect
+#include <SDL2/SDL_render.h>  // for SDL_Renderer, SDL_Texture
+#include <string>             // for string, basic_string
 
 // Modos de funcionamiento para el tileado de fondo
 #define TILED_MODE_CIRCLE 0

source/title.cpp

@@ -1,7 +1,26 @@
-#include "global_inputs.h"
-#include "options.h"
-#include "param.h"
 #include "title.h"
+#include <SDL2/SDL_keycode.h>  // for SDLK_1, SDLK_2, SDLK_3
+#include <SDL2/SDL_render.h>   // for SDL_Renderer
+#include <SDL2/SDL_timer.h>    // for SDL_GetTicks
+#include <string>              // for allocator, basic_string, char_traits
+#include <vector>              // for vector
+#include "asset.h"             // for Asset
+#include "define_buttons.h"    // for DefineButtons
+#include "fade.h"              // for Fade, FADE_RANDOM_SQUARE
+#include "game_logo.h"         // for GameLogo
+#include "global_inputs.h"     // for checkGlobalInputs
+#include "input.h"             // for Input, inputs_e, INPUT_DO_NOT_ALLOW_RE...
+#include "jail_audio.h"        // for JA_GetMusicState, JA_Music_state, JA_P...
+#include "lang.h"              // for getText
+#include "options.h"           // for options
+#include "param.h"             // for param
+#include "screen.h"            // for Screen
+#include "section.h"           // for options_e, options, name_e, name
+#include "sprite.h"            // for Sprite
+#include "text.h"              // for Text, TXT_CENTER, TXT_SHADOW
+#include "texture.h"           // for Texture
+#include "tiled_bg.h"          // for Tiledbg, TILED_MODE_RANDOM
+struct JA_Music_t;
 
 // Constructor
 Title::Title(JA_Music_t *music)

source/title.h

@@ -1,25 +1,19 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_events.h>  // for SDL_Event
-#include "asset.h"
+#include <SDL2/SDL_stdinc.h>  // for Uint32
-#include "define_buttons.h"
+#include "utils.h"            // for section_t
-#include "fade.h"
+class Asset;
-#include "game.h"
+class DefineButtons;
-#include "game_logo.h"
+class Fade;
-#include "hiscore_table.h"
+class GameLogo;
-#include "input.h"
+class Input;
-#include "instructions.h"
+class Screen;
-#include "item.h"
+class Sprite;
-#include "jail_audio.h"
+class Text;
-#include "lang.h"
+class Texture;
-#include "movingsprite.h"
+class Tiledbg;
-#include "screen.h"
+struct JA_Music_t;
-#include "section.h"
-#include "smartsprite.h"
-#include "sprite.h"
-#include "text.h"
-#include "tiledbg.h"
-#include "utils.h"
 
 // Textos
 #define TEXT_COPYRIGHT "@2020,2024 JailDesigner"

source/utils.cpp

@@ -1,5 +1,7 @@
 #include "utils.h"
-#include <math.h>
+#include <stdlib.h>  // for free, malloc
+struct JA_Music_t;
+struct JA_Sound_t;
 
 // Colores
 const color_t bgColor = {0x27, 0x27, 0x36};

source/utils.h

@@ -1,10 +1,15 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_gamecontroller.h>  // for SDL_GameControllerButton
-#include <string>
+#include <SDL2/SDL_rect.h>            // for SDL_Rect, SDL_Point
-#include <vector>
+#include <SDL2/SDL_render.h>          // for SDL_Renderer
-#include "input.h"
+#include <SDL2/SDL_stdinc.h>          // for Uint8, Uint32
-#include "jail_audio.h"
+#include <stdint.h>                   // for int32_t
+#include <string>                     // for string, basic_string
+#include <vector>                     // for vector
+#include "input.h"                    // for inputs_e
+struct JA_Music_t;
+struct JA_Sound_t;
 
 // Dificultad del juego
 #define DIFFICULTY_EASY 0

source/writer.cpp

@@ -1,4 +1,5 @@
 #include "writer.h"
+#include "text.h"  // for Text
 
 // Constructor
 Writer::Writer(Text *text)

source/writer.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include <SDL2/SDL.h>
+#include <string>  // for string, basic_string
-#include "sprite.h"
+class Text;
-#include "text.h"
 
 // Clase Writer. Pinta texto en pantalla letra a letra a partir de una cadena y un bitmap
 class Writer

todo.txt

@@ -1,16 +0,0 @@
-[] Cargar todos los graficos al inicio
-[x] Independizar el pintado del fondo del juego
-[] Cambiar la resolución a 320x240
-[] Permitir entrar al segundo jugador en caliente
-[] Arreglar la pantalla de titulo
-[] Hacer el marcador transparente
-[] Valorar la opcion de que write devuelva texturas con el texto en lugar de pintar letra a letra
-[] Arreglar los anclajes en la pantalla de game over
-[] Al poner pausa, que se sigan moviendo las nubes
-[] Revisar la clase Fade
-[x] Quitar los static de title / crear clase para el logo de coffee crisis
-[] Añadir mini logo a pantalla de titulo
-[] Estandarizar tipografias, dejar solo una (o dos)
-[] Crear objeto encargado de los mensajes en pantalla (en vez de ser la clase game)
-[] ABSOLUTAMENTE TODO ha de estar en un fichero de texto y en una variable PARAMETROS: fisicas, tamaños de zona de juego, formaciones enemigas...
-[] Añadir notificaciones para el cambio de tamaño de ventana, shaders, filtro, mute, etc...