jaildesigner-jailgames/jail_engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using namespace std en todos los ficheros

Browse Source
This commit is contained in:
Sergio
2023-05-23 17:40:12 +02:00
parent 5a5bbf7f73
commit c31bfc6cae
15 changed files with 218 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
units/screen.cpp
View File

@@ -5,7 +5,7 @@
// Constructor
Screen::Screen(SDL_Window *window, SDL_Renderer *renderer, options_t *options)
{
//std::cout << "Construido Screen" << std::endl;
//cout << "Construido Screen" << endl;
// Inicializa variables
this->window = window;
this->renderer = renderer;
@@ -26,7 +26,7 @@ Screen::Screen(SDL_Window *window, SDL_Renderer *renderer, options_t *options)
{
if (options->console)
{
std::cout << "TitleSurface could not be created!\nSDL Error: " << SDL_GetError() << std::endl;
cout << "TitleSurface could not be created!\nSDL Error: " << SDL_GetError() << endl;
}
}
SDL_SetTextureBlendMode(gameCanvas, SDL_BLENDMODE_BLEND);
@@ -38,7 +38,7 @@ Screen::Screen(SDL_Window *window, SDL_Renderer *renderer, options_t *options)
// Destructor
Screen::~Screen()
{
//std::cout << "Destruido Screen" << std::endl;
//cout << "Destruido Screen" << endl;
if (notify != nullptr)
{
delete notify;
@@ -195,7 +195,7 @@ void Screen::setWindowSize(int size)
void Screen::decWindowSize()
{
--options->screen.windowZoom;
options->screen.windowZoom = std::max(options->screen.windowZoom, 1);
options->screen.windowZoom = max(options->screen.windowZoom, 1);
setVideoMode(0);
}
@@ -203,7 +203,7 @@ void Screen::decWindowSize()
void Screen::incWindowSize()
{
++options->screen.windowZoom;
options->screen.windowZoom = std::min(options->screen.windowZoom, 4);
options->screen.windowZoom = min(options->screen.windowZoom, 4);
setVideoMode(0);
}
@@ -327,7 +327,7 @@ void Screen::iniSpectrumFade()
spectrumColor.clear();
// Inicializa el vector de colores
const std::vector<std::string> vColors = {"black", "blue", "red", "magenta", "green", "cyan", "yellow", "bright_white"};
const vector<string> vColors = {"black", "blue", "red", "magenta", "green", "cyan", "yellow", "bright_white"};
for (auto v : vColors)
{
spectrumColor.push_back(stringToColor(options->palette, v));
@@ -392,7 +392,7 @@ void Screen::updateNotifier()
}
// Muestra una notificación de texto por pantalla;
void Screen::showNotification(std::string text1, std::string text2, int icon)
void Screen::showNotification(string text1, string text2, int icon)
{
notify->showText(text1, text2, icon);
}