Pasaeta de include-what-you-use abans que es desmadre tot
This commit is contained in:
@@ -6,15 +6,6 @@
|
||||
#include <vector> // for vector
|
||||
#include "lang.h" // for lang_e
|
||||
#include "utils.h" // for music_file_t, sound_file_t
|
||||
class Asset;
|
||||
class Game;
|
||||
class HiScoreTable;
|
||||
class Input;
|
||||
class Instructions;
|
||||
class Intro;
|
||||
class Logo;
|
||||
class Screen;
|
||||
class Title;
|
||||
|
||||
// Textos
|
||||
#define WINDOW_CAPTION "Coffee Crisis Arcade Edition"
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
#include "on_screen_help.h"
|
||||
#include "screen.h"
|
||||
#include "asset.h"
|
||||
#include "input.h"
|
||||
#include "sprite.h"
|
||||
#include "texture.h"
|
||||
#include "lang.h"
|
||||
#include "param.h"
|
||||
#include "dbgtxt.h"
|
||||
#include <memory> // Para std::unique_ptr
|
||||
#include "utils.h"
|
||||
#include <SDL2/SDL_blendmode.h> // for SDL_BLENDMODE_BLEND
|
||||
#include <SDL2/SDL_pixels.h> // for SDL_PIXELFORMAT_RGBA8888
|
||||
#include <memory> // for make_unique, unique_ptr
|
||||
#include <string> // for basic_string
|
||||
#include "asset.h" // for Asset
|
||||
#include "lang.h" // for getText
|
||||
#include "param.h" // for param
|
||||
#include "screen.h" // for Screen
|
||||
#include "sprite.h" // for Sprite
|
||||
#include "text.h" // for Text
|
||||
#include "texture.h" // for Texture
|
||||
#include "utils.h" // for easeInOutSine, paramGame_t, param_t
|
||||
|
||||
// [SINGLETON] Hay que definir las variables estáticas, desde el .h sólo la hemos declarado
|
||||
OnScreenHelp *OnScreenHelp::onScreenHelp = nullptr;
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <SDL2/SDL.h>
|
||||
#include "text.h"
|
||||
#include <vector>
|
||||
class Screen;
|
||||
class Asset;
|
||||
class Input;
|
||||
class Texture;
|
||||
class Sprite;
|
||||
#include <SDL2/SDL_rect.h> // for SDL_Rect
|
||||
#include <SDL2/SDL_render.h> // for SDL_Texture
|
||||
#include <vector> // for vector
|
||||
class Sprite; // lines 10-10
|
||||
class Text;
|
||||
|
||||
enum class OnScreenHelpStatus
|
||||
{
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
#include "options.h"
|
||||
#include <SDL2/SDL_gamecontroller.h> // for SDL_GameControllerButton, SDL_C...
|
||||
#include <SDL2/SDL_video.h> // for SDL_WINDOW_FULLSCREEN, SDL_WIND...
|
||||
#include <algorithm> // for max, min
|
||||
#include <fstream> // for char_traits, basic_ostream, ope...
|
||||
#include <fstream> // for basic_ostream, operator<<, basi...
|
||||
#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 screenFilter::NEAREST, SCREEN_V...
|
||||
#include "screen.h" // for screenVideoMode, screenFilter
|
||||
#include "utils.h" // for op_controller_t, options_t, op_...
|
||||
|
||||
// Variables
|
||||
options_t options;
|
||||
// Variables
|
||||
options_t options;
|
||||
|
||||
// Declaraciones
|
||||
bool setOptions(std::string var, std::string value);
|
||||
@@ -286,7 +285,7 @@ bool setOptions(std::string var, std::string value)
|
||||
// Opciones de video
|
||||
if (var == "video.mode")
|
||||
{
|
||||
//options.video.mode = value == std::to_string(static_cast<int>(screenVideoMode::WINDOW)) ? screenVideoMode::WINDOW : screenVideoMode::FULLSCREEN;
|
||||
// options.video.mode = value == std::to_string(static_cast<int>(screenVideoMode::WINDOW)) ? screenVideoMode::WINDOW : screenVideoMode::FULLSCREEN;
|
||||
options.video.mode = static_cast<screenVideoMode>(std::stoi(value));
|
||||
}
|
||||
|
||||
@@ -301,7 +300,7 @@ bool setOptions(std::string var, std::string value)
|
||||
|
||||
else if (var == "video.filter")
|
||||
{
|
||||
//options.video.filter = value == std::to_string(static_cast<int>(screenFilter::NEAREST)) ? screenFilter::NEAREST : screenFilter::LINEAL;
|
||||
// options.video.filter = value == std::to_string(static_cast<int>(screenFilter::NEAREST)) ? screenFilter::NEAREST : screenFilter::LINEAL;
|
||||
options.video.filter = static_cast<screenFilter>(std::stoi(value));
|
||||
}
|
||||
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
#include <SDL2/SDL_rect.h> // for SDL_Rect
|
||||
#include <SDL2/SDL_stdinc.h> // for Uint32
|
||||
#include <memory> // for unique_ptr
|
||||
#include <string> // for string, basic_string
|
||||
#include <vector> // for vector
|
||||
#include "animated_sprite.h" // for AnimatedSprite
|
||||
#include "enter_name.h" // for EnterName
|
||||
#include "utils.h" // for circle_t
|
||||
#include "enter_name.h"
|
||||
#include "scoreboard.h"
|
||||
#include <memory>
|
||||
class AnimatedSprite;
|
||||
class Texture;
|
||||
class Texture; // lines 12-12
|
||||
enum class scoreboardMode;
|
||||
|
||||
// Estados del jugador
|
||||
enum class playerStatus
|
||||
|
||||
@@ -3,14 +3,13 @@
|
||||
#include <SDL2/SDL_rect.h> // for SDL_Point, SDL_Rect
|
||||
#include <SDL2/SDL_render.h> // for SDL_Renderer, SDL_Texture
|
||||
#include <SDL2/SDL_stdinc.h> // for Uint32
|
||||
#include <memory> // for unique_ptr
|
||||
#include <string> // for string, basic_string
|
||||
#include <vector> // for vector
|
||||
#include "utils.h" // for color_t
|
||||
#include <memory>
|
||||
class Asset;
|
||||
class Sprite;
|
||||
class Text;
|
||||
class Texture;
|
||||
class Sprite; // lines 11-11
|
||||
class Text; // lines 12-12
|
||||
class Texture; // lines 13-13
|
||||
|
||||
// Defines
|
||||
constexpr int SCOREBOARD_LEFT_PANEL = 0;
|
||||
|
||||
@@ -7,14 +7,15 @@
|
||||
#include <fstream> // for basic_ifstream, ifstream
|
||||
#include <iterator> // for istreambuf_iterator, operator!=
|
||||
#include <string> // for basic_string, operator+, to_string, cha...
|
||||
#include <vector> // for vector
|
||||
#include "asset.h" // for Asset
|
||||
#include "dbgtxt.h" // for dbg_print
|
||||
#include "global_inputs.h" // for servicePressedCounter
|
||||
#include "input.h" // for Input, inputs_e, INPUT_DO_NOT_ALLOW_REPEAT
|
||||
#include "notify.h" // for Notify
|
||||
#include "on_screen_help.h" // for OnScreenHelp
|
||||
#include "options.h" // for options
|
||||
#include "param.h"
|
||||
#include "on_screen_help.h"
|
||||
#include "global_inputs.h"
|
||||
#include "param.h" // for param
|
||||
|
||||
#ifndef NO_SHADERS
|
||||
#include "jail_shader.h" // for init, render
|
||||
|
||||
Reference in New Issue
Block a user