arreglats els includes en linux, falta vore que ha passat amb windows/macos

2025-07-18 18:23:29 +02:00
parent 14e2e4bb74
commit b88019bf58
98 changed files with 528 additions and 478 deletions
--- a/source/sections/credits.cpp
+++ b/source/sections/credits.cpp
@@ -1,22 +1,22 @@
 // IWYU pragma: no_include <bits/std_abs.h>
 #include "credits.h"
-#include <SDL3/SDL.h>        // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h>        // Para SDL_PollEvent, SDL_Event
-#include <SDL3/SDL.h>        // Para SDL_PixelFormat
-#include <SDL3/SDL.h>        // Para SDL_GetTicks
-#include <algorithm>         // Para max, min, clamp
-#include <array>             // Para array
-#include <stdexcept>         // Para runtime_error
-#include <string>            // Para basic_string, string
-#include <vector>            // Para vector
+
+#include <SDL3/SDL.h> // Para SDL_RenderFillRect, SDL_RenderTexture
+#include <algorithm>  // Para max, min, clamp
+#include <array>      // Para array
+#include <cmath>      // Para abs
+#include <stdexcept>  // Para runtime_error
+#include <string>     // Para basic_string, string
+#include <vector>     // Para vector
+
+#include "audio.h"           // Para Audio
 #include "balloon_manager.h" // Para BalloonManager
 #include "fade.h"            // Para Fade, FadeType, FadeMode
 #include "global_events.h"   // Para check
-#include "global_inputs.h"   // Para check, update
+#include "global_inputs.h"   // Para check
 #include "input.h"           // Para Input, INPUT_ALLOW_REPEAT
-#include "audio.h"           // Para JA_GetMusicState, JA_SetMusicVolume
 #include "lang.h"            // Para getText
-#include "param.h"           // Para Param, ParamGame, param
+#include "param.h"           // Para Param, param, ParamGame, ParamFade
 #include "player.h"          // Para Player, PlayerState
 #include "resource.h"        // Para Resource
 #include "screen.h"          // Para Screen
@@ -25,9 +25,8 @@
 #include "text.h"            // Para Text, TEXT_CENTER, TEXT_SHADOW
 #include "texture.h"         // Para Texture
 #include "tiled_bg.h"        // Para TiledBG, TiledBGMode
-#include "utils.h"           // Para Color, Zone, shdw_txt_color, no_color
-#include "ui/service_menu.h"
-#include "input.h"
+#include "ui/service_menu.h" // Para ServiceMenu
+#include "utils.h"           // Para Color, Zone, SHADOW_TEXT_COLOR, NO_TEXT...

 // Textos
 constexpr const char TEXT_COPYRIGHT[] = "@2020,2025 JailDesigner";
--- a/source/sections/credits.h
+++ b/source/sections/credits.h
@@ -1,14 +1,12 @@
 #pragma once

-#include <SDL3/SDL.h>
-#include <SDL3/SDL.h>
-#include <SDL3/SDL.h>
-#include <memory>
-#include <vector>
+#include <SDL3/SDL.h> // Para SDL_FRect, Uint32, SDL_Texture, Uint64
+#include <memory>     // Para unique_ptr, shared_ptr
+#include <vector>     // Para vector

-#include "options.h"
-#include "param.h"
-#include "utils.h"
+#include "options.h" // Para AudioOptions, MusicOptions, audio
+#include "param.h"   // Para Param, ParamGame, param
+#include "utils.h"   // Para Zone, Color

 // Declaraciones adelantadas
 class BalloonManager;
--- a/source/sections/game.cpp
+++ b/source/sections/game.cpp
@@ -1,41 +1,38 @@
 #include "game.h"
-#include <SDL3/SDL.h>			  // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h>			  // Para SDL_EventType, SDL_Event, SDL_Poll...
-#include <SDL3/SDL.h>			  // Para SDLK_1, SDLK_2, SDLK_3, SDLK_4
-#include <SDL3/SDL.h>			  // Para SDL_PixelFormat
-#include <SDL3/SDL.h>			  // Para SDL_GetTicks
-#include <stdlib.h>				  // Para rand, size_t
-#include <algorithm>			  // Para find_if, clamp, min
-#include <functional>			  // Para function
-#include <iterator>				  // Para distance, size
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_SetRenderTarget
+#include <stdlib.h>	  // Para rand, size_t
+#include <algorithm>  // Para find_if, clamp, find, min
+#include <functional> // Para function
+#include <iterator>	  // Para distance, size
+
 #include "asset.h"				  // Para Asset
+#include "audio.h"				  // Para Audio
 #include "background.h"			  // Para Background
 #include "balloon.h"			  // Para Balloon, BALLOON_SPEED
 #include "balloon_manager.h"	  // Para BalloonManager
 #include "bullet.h"				  // Para Bullet, BulletType, BulletMoveStatus
 #include "fade.h"				  // Para Fade, FadeType, FadeMode
 #include "global_events.h"		  // Para check
-#include "global_inputs.h"		  // Para check, update
+#include "global_inputs.h"		  // Para check
 #include "input.h"				  // Para InputAction, Input, INPUT_DO_NOT_A...
 #include "item.h"				  // Para Item, ItemType
-#include "audio.h"				  // Para Audio
 #include "lang.h"				  // Para getText
-#include "manage_hiscore_table.h" // Para ManageHiScoreTable, HiScoreEntry
+#include "manage_hiscore_table.h" // Para HiScoreEntry, ManageHiScoreTable
 #include "notifier.h"			  // Para Notifier
-#include "param.h"				  // Para Param, param, ParamGame, ParamFade
+#include "param.h"				  // Para Param, param, ParamGame, ParamScor...
 #include "path_sprite.h"		  // Para Path, PathSprite, createPath, Path...
 #include "player.h"				  // Para Player, PlayerState
 #include "resource.h"			  // Para Resource
 #include "scoreboard.h"			  // Para Scoreboard, ScoreboardMode, SCOREB...
 #include "screen.h"				  // Para Screen
 #include "section.h"			  // Para Name, name, AttractMode, Options
-#include "ui/service_menu.h"	  // Para ServiceMenu
 #include "smart_sprite.h"		  // Para SmartSprite
 #include "stage.h"				  // Para number, get, Stage, total_power
 #include "tabe.h"				  // Para Tabe, TabeState
 #include "text.h"				  // Para Text
 #include "texture.h"			  // Para Texture
-#include "lang.h"
+#include "ui/service_menu.h"	  // Para ServiceMenu

 // Constructor
 Game::Game(int player_id, int current_stage, bool demo)
@@ -252,11 +249,6 @@ void Game::renderPlayers()
 		if (!player->isWaiting())
 		{
 			player->render();
-#ifdef DEBUG
-			// SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
-			// const Circle c = player->getCollider();
-			// DrawCircle(renderer, c.x, c.y, c.r);
-#endif
 		}
 	}
 }
--- a/source/sections/game.h
+++ b/source/sections/game.h
@@ -1,22 +1,18 @@
 #pragma once

-#include <SDL3/SDL.h>			  // Para SDL_Event
-#include <SDL3/SDL.h>			  // Para SDL_Renderer, SDL_Texture
-#include <SDL3/SDL.h>			  // Para Uint64, Uint8
-#include <memory>				  // Para shared_ptr, unique_ptr
-#include <string>				  // Para string
-#include <vector>				  // Para vector
+#include <SDL3/SDL.h> // Para SDL_Event, SDL_Renderer, SDL_Texture, Uint64, Uint8
+#include <memory>	  // Para shared_ptr, unique_ptr
+#include <string>	  // Para string
+#include <vector>	  // Para vector
+
 #include "manage_hiscore_table.h" // Para HiScoreEntry
-#include "options.h"			  // Para GameOptions, Options, options
+#include "options.h"			  // Para SettingsOptions, settings, DifficultyCode (ptr only)
 #include "player.h"				  // Para Player
 #include "utils.h"				  // Para Demo

-class Audio;
-class Asset;
 class Background;
 class Balloon;
 class BalloonManager;
-class Tabe;
 class Bullet;
 class Fade;
 class Input;
@@ -25,6 +21,7 @@ class PathSprite;
 class Scoreboard;
 class Screen;
 class SmartSprite;
+class Tabe;
 class Texture;
 enum class BulletType : Uint8;
 enum class ItemType;
--- a/source/sections/hiscore_table.cpp
+++ b/source/sections/hiscore_table.cpp
@@ -1,21 +1,20 @@
 #include "hiscore_table.h"
-#include <SDL3/SDL.h>			  // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h>			  // Para SDL_PollEvent, SDL_Event
-#include <SDL3/SDL.h>			  // Para SDL_PixelFormat
-#include <SDL3/SDL.h>			  // Para SDL_SetRenderTarget, SDL_CreateTex...
-#include <SDL3/SDL.h>			  // Para SDL_GetTicks
-#include <stdlib.h>				  // Para rand, size_t
-#include <algorithm>			  // Para max
-#include <functional>			  // Para function
-#include <vector>				  // Para vector
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_SetRenderTarget
+#include <stdlib.h>	  // Para rand, size_t
+#include <algorithm>  // Para max
+#include <functional> // Para function
+#include <vector>	  // Para vector
+
+#include "audio.h"				  // Para Audio
 #include "background.h"			  // Para Background
 #include "fade.h"				  // Para Fade, FadeMode, FadeType
 #include "global_events.h"		  // Para check
-#include "global_inputs.h"		  // Para check, update
-#include "audio.h"				  // Para JA_GetMusicState, JA_Music_state
+#include "global_inputs.h"		  // Para check
+#include "input.h"				  // Para Input
 #include "lang.h"				  // Para getText
 #include "manage_hiscore_table.h" // Para HiScoreEntry
-#include "options.h"			  // Para GameOptions, Options, options
+#include "options.h"			  // Para SettingsOptions, settings
 #include "param.h"				  // Para Param, param, ParamGame, ParamFade
 #include "path_sprite.h"		  // Para PathSprite, Path, PathType
 #include "resource.h"			  // Para Resource
@@ -24,8 +23,7 @@
 #include "sprite.h"				  // Para Sprite
 #include "text.h"				  // Para Text, TEXT_SHADOW, TEXT_COLOR
 #include "texture.h"			  // Para Texture
-#include "utils.h"				  // Para Color, easeOutQuint, fade_color, Zone
-#include "input.h"
+#include "utils.h"				  // Para Color, easeOutQuint, NO_TEXT_COLOR

 // Constructor
 HiScoreTable::HiScoreTable()
--- a/source/sections/hiscore_table.h
+++ b/source/sections/hiscore_table.h
@@ -1,12 +1,11 @@
 #pragma once

-#include <SDL3/SDL.h> // Para SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_Renderer, SDL_Texture
-#include <SDL3/SDL.h> // Para Uint16, Uint32, Uint8
+#include <SDL3/SDL.h> // Para Uint16, SDL_FRect, SDL_Renderer, SDL_Texture, Uint64, Uint8
 #include <memory>	  // Para unique_ptr, shared_ptr
 #include <string>	  // Para string
 #include <vector>	  // Para vector
-#include "utils.h"
+
+#include "utils.h" // Para Color

 class Background;
 class Fade;
--- a/source/sections/instructions.cpp
+++ b/source/sections/instructions.cpp
@@ -1,26 +1,26 @@
 #include "instructions.h"
-#include <SDL3/SDL.h>	   // Para SDL_BLENDMODE_BLEND
-#include <SDL3/SDL.h>	   // Para SDL_PollEvent, SDL_Event
-#include <SDL3/SDL.h>	   // Para SDL_PIXELFORMAT_RGBA8888
-#include <SDL3/SDL.h>	   // Para SDL_GetTicks
-#include <algorithm>	   // Para max
-#include <array>		   // Para array
-#include <utility>		   // Para move
-#include <vector>		   // Para vector
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_SetRenderTarget, SDL_Re...
+#include <algorithm>  // Para max
+#include <array>	  // Para array
+#include <string>	  // Para basic_string, string
+#include <utility>	  // Para move
+#include <vector>	  // Para vector
+
+#include "audio.h"		   // Para Audio
 #include "fade.h"		   // Para Fade, FadeMode, FadeType
 #include "global_events.h" // Para check
-#include "global_inputs.h" // Para check, update
-#include "audio.h"		   // Para JA_GetMusicState, JA_Music_state
+#include "global_inputs.h" // Para check
+#include "input.h"		   // Para Input
 #include "lang.h"		   // Para getText
-#include "param.h"		   // Para Param, param, ParamGame, ParamFade
+#include "param.h"		   // Para Param, param, ParamGame, ParamFade, Param...
 #include "resource.h"	   // Para Resource
 #include "screen.h"		   // Para Screen
 #include "section.h"	   // Para Name, name, Options, options
 #include "sprite.h"		   // Para Sprite
-#include "text.h"		   // Para Text, TEXT_CENTER, TEXT_COLOR, TEXT_...
+#include "text.h"		   // Para Text, TEXT_CENTER, TEXT_COLOR, TEXT_SHADOW
 #include "tiled_bg.h"	   // Para TiledBG, TiledBGMode
-#include "utils.h"		   // Para Color, shdw_txt_color, Zone, no_color
-#include "input.h"
+#include "utils.h"		   // Para Color, SHADOW_TEXT_COLOR, Zone, NO_TEXT_C...

 // Constructor
 Instructions::Instructions()
--- a/source/sections/instructions.h
+++ b/source/sections/instructions.h
@@ -1,8 +1,6 @@
 #pragma once

-#include <SDL3/SDL.h> // Para SDL_FPoint, SDL_FRect
-#include <SDL3/SDL.h> // Para SDL_Texture, SDL_Renderer
-#include <SDL3/SDL.h> // Para Uint32
+#include <SDL3/SDL.h> // Para SDL_Texture, Uint32, SDL_Renderer, SDL_FPoint, SDL_FRect, Uint64
 #include <memory>	  // Para unique_ptr, shared_ptr
 #include <vector>	  // Para vector

--- a/source/sections/intro.cpp
+++ b/source/sections/intro.cpp
@@ -1,31 +1,30 @@
 #include "intro.h"
-#include <SDL3/SDL.h>	   // Para SDL_BLENDMODE_BLEND, SDL_BLENDMODE_MOD
-#include <SDL3/SDL.h>	   // Para SDL_PollEvent, SDL_Event
-#include <SDL3/SDL.h>	   // Para SDL_PIXELFORMAT_RGBA8888
-#include <SDL3/SDL.h>	   // Para SDL_FRect
-#include <SDL3/SDL.h>	   // Para SDL_SetTextureBlendMode, SDL_GetRend...
-#include <SDL3/SDL.h>	   // Para SDL_GetTicks
-#include <array>		   // Para array
-#include <functional>	   // Para function
-#include <string>		   // Para basic_string, string
-#include <utility>		   // Para move
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_SetRenderDrawColor, SDL...
+#include <array>	  // Para array
+#include <functional> // Para function
+#include <iostream>	  // Para basic_ostream, basic_ostream::operator<<
+#include <string>	  // Para basic_string, char_traits, string
+#include <utility>	  // Para move
+
+#include "audio.h"		   // Para Audio
 #include "global_events.h" // Para check
-#include "global_inputs.h" // Para check, update
-#include "audio.h"		   // Para JA_PlayMusic, JA_StopMusic
+#include "global_inputs.h" // Para check
+#include "input.h"		   // Para Input
 #include "lang.h"		   // Para getText
-#include "param.h"		   // Para Param, ParamGame, param
+#include "param.h"		   // Para Param, param, ParamGame, ParamIntro, Para...
 #include "path_sprite.h"   // Para PathSprite, PathType
 #include "resource.h"	   // Para Resource
 #include "screen.h"		   // Para Screen
 #include "section.h"	   // Para Name, name, Options, options
+#include "text.h"		   // Para Text
 #include "texture.h"	   // Para Texture
 #include "tiled_bg.h"	   // Para TiledBG, TiledBGMode
-#include "utils.h"		   // Para Color, Zone, easeOutQuint, BLOCK
+#include "utils.h"		   // Para Color, Zone, easeInOutExpo, easeInElastic
 #include "writer.h"		   // Para Writer
-#include "input.h"

 #ifdef DEBUG
-#include <iomanip> // Para std::hex, std::setw, std::setfill
+#include <iomanip> // Para operator<<, setfill, setw
 #endif

 // Constructor
--- a/source/sections/intro.h
+++ b/source/sections/intro.h
@@ -1,12 +1,14 @@
 #pragma once

-#include <SDL3/SDL.h>	 // Para Uint32, Uint8
-#include <memory>		 // Para unique_ptr
-#include <vector>		 // Para vector
+#include <SDL3/SDL.h> // Para Uint32, Uint64
+#include <memory>	  // Para unique_ptr
+#include <vector>	  // Para vector
+
+#include "param.h"		 // Para Param, ParamIntro, param
 #include "path_sprite.h" // Para PathSprite
 #include "tiled_bg.h"	 // Para TiledBG
+#include "utils.h"		 // Para Color
 #include "writer.h"		 // Para Writer
-#include "param.h"

 /*
 	Esta clase gestiona un estado del programa. Se encarga de mostrar la secuencia
--- a/source/sections/logo.cpp
+++ b/source/sections/logo.cpp
@@ -1,10 +1,13 @@
 #include "logo.h"
-#include <SDL3/SDL.h>	   // Para SDL_PollEvent, SDL_Event
-#include <SDL3/SDL.h>	   // Para SDL_GetTicks
-#include <utility>		   // Para move
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, SDL_PollEvent, SDL_Event
+#include <string>	  // Para basic_string
+#include <utility>	  // Para move
+
+#include "audio.h"		   // Para Audio
 #include "global_events.h" // Para check
-#include "global_inputs.h" // Para check, update
-#include "audio.h"		   // Para JA_FadeOutMusic, JA_PlaySound, JA_StopC...
+#include "global_inputs.h" // Para check
+#include "input.h"		   // Para Input
 #include "param.h"		   // Para Param, ParamGame, param
 #include "resource.h"	   // Para Resource
 #include "screen.h"		   // Para Screen
@@ -12,7 +15,6 @@
 #include "sprite.h"		   // Para Sprite
 #include "texture.h"	   // Para Texture
 #include "utils.h"		   // Para Color, Zone
-#include "input.h"

 // Constructor
 Logo::Logo()
--- a/source/sections/logo.h
+++ b/source/sections/logo.h
@@ -1,7 +1,6 @@
 #pragma once

-#include <SDL3/SDL.h> // Para SDL_FPoint
-#include <SDL3/SDL.h> // Para Uint64
+#include <SDL3/SDL.h> // Para SDL_FPoint, Uint64
 #include <memory>	  // Para shared_ptr, unique_ptr
 #include <vector>	  // Para vector

--- a/source/sections/title.cpp
+++ b/source/sections/title.cpp
@@ -1,34 +1,37 @@
 #include "title.h"
-#include <SDL3/SDL.h>		// Para SDL_PollEvent, SDL_Event, SDL_KEYDOWN
-#include <SDL3/SDL.h>		// Para SDLK_1, SDLK_2, SDLK_3, SDLK_4, SDLK_5
-#include <SDL3/SDL.h>		// Para SDL_GetTicks
-#include <stddef.h>			// Para size_t
-#include <string>			// Para char_traits, operator+, basic_string
-#include <vector>			// Para vector
-#include "define_buttons.h" // Para DefineButtons
-#include "fade.h"			// Para Fade, FadeType
-#include "game_logo.h"		// Para GameLogo
-#include "global_inputs.h"	// Para check, update
-#include "input.h"			// Para Input, InputAction, INPUT_DO_NOT_ALLOW_R...
-#include "audio.h"			// Para JA_GetMusicState, JA_FadeOutMusic, JA_...
-#include "lang.h"			// Para getText
-#include "global_events.h"	// Para handleEvent
-#include "notifier.h"		// Para Notifier
-#include "options.h"		// Para OptionsController, Options, options
-#include "param.h"			// Para Param, param, ParamGame, ParamTitle
-#include "player.h"			// Para Player, PlayerState
-#include "resource.h"		// Para Resource
-#include "screen.h"			// Para Screen
-#include "section.h"		// Para Options, Name, name, AttractMode, options
-#include "sprite.h"			// Para Sprite
-#include "text.h"			// Para TEXT_CENTER, TEXT_SHADOW, Text
-#include "texture.h"		// Para Texture
-#include "tiled_bg.h"		// Para TiledBG, TiledBGMode
-#include "utils.h"			// Para Color, Zone, fade_color, no_color, BLOCK
-#include "ui/service_menu.h"
+
+#include <SDL3/SDL.h> // Para SDL_GetTicks, Uint32, SDL_EventType
+#include <stddef.h>	  // Para size_t
+#include <algorithm>  // Para find_if
+#include <iostream>	  // Para basic_ostream, basic_ostream::operator<<
+#include <string>	  // Para basic_string, char_traits, operator+
+#include <vector>	  // Para vector
+
+#include "audio.h"			 // Para Audio
+#include "define_buttons.h"	 // Para DefineButtons
+#include "fade.h"			 // Para Fade, FadeType
+#include "game_logo.h"		 // Para GameLogo
+#include "global_events.h"	 // Para check
+#include "global_inputs.h"	 // Para check
+#include "input.h"			 // Para Input, INPUT_DO_NOT_ALLOW_REPEAT, Input...
+#include "lang.h"			 // Para getText
+#include "notifier.h"		 // Para Notifier
+#include "options.h"		 // Para GamepadOptions, controllers, getPlayerW...
+#include "param.h"			 // Para Param, param, ParamGame, ParamTitle
+#include "player.h"			 // Para Player, PlayerState
+#include "resource.h"		 // Para Resource
+#include "screen.h"			 // Para Screen
+#include "section.h"		 // Para Name, name, Options, options, AttractMode
+#include "sprite.h"			 // Para Sprite
+#include "text.h"			 // Para TEXT_CENTER, TEXT_SHADOW, Text
+#include "tiled_bg.h"		 // Para TiledBG, TiledBGMode
+#include "ui/service_menu.h" // Para ServiceMenu
+#include "utils.h"			 // Para Color, Zone, NO_TEXT_COLOR, TITLE_SHADO...
+
+class Texture;

 #ifdef DEBUG
-#include <iomanip> // Para std::hex, std::setw, std::setfill
+#include <iomanip> // Para operator<<, setfill, setw
 #endif

 // Constructor
--- a/source/sections/title.h
+++ b/source/sections/title.h
@@ -3,6 +3,7 @@
 #include <SDL3/SDL.h> // Para Uint32
 #include <memory>	  // Para unique_ptr, shared_ptr
 #include <vector>
+
 #include "section.h" // Para Options

 class DefineButtons;