games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

Reduced SDL includes

Browse Source
This commit is contained in:
Ivan Savenko
2023-01-18 16:54:53 +02:00
parent aae83af9f3
commit fc0f5a9fb3
12 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/CBitmapHandler.cpp
View File

@ -10,8 +10,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "../lib/filesystem/Filesystem.h" #include "../lib/filesystem/Filesystem.h"
#include "SDL.h" #include <SDL_image.h>
#include "SDL_image.h"
#include "CBitmapHandler.h" #include "CBitmapHandler.h"
#include "gui/SDL_Extensions.h" #include "gui/SDL_Extensions.h"
#include "../lib/vcmi_endian.h" #include "../lib/vcmi_endian.h"

1
client/CMT.cpp
View File

@ -56,6 +56,7 @@
#include "mainmenu/CPrologEpilogVideo.h" #include "mainmenu/CPrologEpilogVideo.h"
#include <vstd/StringUtils.h> #include <vstd/StringUtils.h>
#include <SDL.h>
#ifdef VCMI_WINDOWS #ifdef VCMI_WINDOWS
#include "SDL_syswm.h" #include "SDL_syswm.h"

2
client/CMusicHandler.cpp
View File

@ -9,7 +9,7 @@
*/ */
#include "StdInc.h" #include "StdInc.h"
#include <SDL_mixer.h> #include <SDL_mixer.h>
#include <SDL.h> #include <SDL_timer.h>
#include "CMusicHandler.h" #include "CMusicHandler.h"
#include "CGameInfo.h" #include "CGameInfo.h"

2
client/CPlayerInterface.cpp
View File

@ -63,7 +63,7 @@
#include "../lib/CPathfinder.h" #include "../lib/CPathfinder.h"
#include "../lib/RoadHandler.h" #include "../lib/RoadHandler.h"
#include "../lib/TerrainHandler.h" #include "../lib/TerrainHandler.h"
#include <SDL.h> #include <SDL_timer.h>
#include "CServerHandler.h" #include "CServerHandler.h"
// FIXME: only needed for CGameState::mutex // FIXME: only needed for CGameState::mutex
#include "../lib/CGameState.h" #include "../lib/CGameState.h"

1
client/CVideoHandler.cpp
View File

@ -8,7 +8,6 @@
* *
*/ */
#include "StdInc.h" #include "StdInc.h"
#include <SDL.h>
#include "CVideoHandler.h" #include "CVideoHandler.h"
#include "gui/CGuiHandler.h" #include "gui/CGuiHandler.h"

2
client/Client.cpp
View File

@ -10,8 +10,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "Client.h" #include "Client.h"
#include <SDL.h>
#include "CMusicHandler.h" #include "CMusicHandler.h"
#include "../lib/mapping/CCampaignHandler.h" #include "../lib/mapping/CCampaignHandler.h"
#include "../CCallback.h" #include "../CCallback.h"

2
client/gui/CGuiHandler.cpp
View File

@ -11,7 +11,7 @@
#include "CGuiHandler.h" #include "CGuiHandler.h"
#include "../lib/CondSh.h" #include "../lib/CondSh.h"
#include <SDL.h> #include <SDL_timer.h>
#include "CIntObject.h" #include "CIntObject.h"
#include "CursorHandler.h" #include "CursorHandler.h"

6
client/gui/CursorHandler.cpp
View File

@ -11,8 +11,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "CursorHandler.h" #include "CursorHandler.h"
#include <SDL.h>
#include "SDL_Extensions.h" #include "SDL_Extensions.h"
#include "CGuiHandler.h" #include "CGuiHandler.h"
#include "CAnimation.h" #include "CAnimation.h"
@ -345,7 +343,7 @@ void CursorSoftware::updateTexture()
if (!cursorSurface || Point(cursorSurface->w, cursorSurface->h) != cursorImage->dimensions()) if (!cursorSurface || Point(cursorSurface->w, cursorSurface->h) != cursorImage->dimensions())
createTexture(cursorImage->dimensions()); createTexture(cursorImage->dimensions());
CSDL_Ext::fillSurface(cursorSurface, Colors::TRANSPARENT); CSDL_Ext::fillSurface(cursorSurface, Colors::TRANSPARENCY);
cursorImage->draw(cursorSurface); cursorImage->draw(cursorSurface);
SDL_UpdateTexture(cursorTexture, NULL, cursorSurface->pixels, cursorSurface->pitch); SDL_UpdateTexture(cursorTexture, NULL, cursorSurface->pixels, cursorSurface->pitch);
@ -413,7 +411,7 @@ void CursorHardware::setImage(std::shared_ptr<IImage> image, const Point & pivot
{ {
auto cursorSurface = CSDL_Ext::newSurface(image->dimensions().x, image->dimensions().y); auto cursorSurface = CSDL_Ext::newSurface(image->dimensions().x, image->dimensions().y);
CSDL_Ext::fillSurface(cursorSurface, Colors::TRANSPARENT); CSDL_Ext::fillSurface(cursorSurface, Colors::TRANSPARENCY);
image->draw(cursorSurface); image->draw(cursorSurface);

2
client/gui/SDL_Extensions.cpp
View File

@ -39,7 +39,7 @@ const SDL_Color Colors::DEFAULT_KEY_COLOR = {0, 255, 255, SDL_ALPHA_OPAQUE};
const SDL_Color Colors::RED = {255, 0, 0, SDL_ALPHA_OPAQUE}; const SDL_Color Colors::RED = {255, 0, 0, SDL_ALPHA_OPAQUE};
const SDL_Color Colors::PURPLE = {255, 75, 125, SDL_ALPHA_OPAQUE}; const SDL_Color Colors::PURPLE = {255, 75, 125, SDL_ALPHA_OPAQUE};
const SDL_Color Colors::BLACK = {0, 0, 0, SDL_ALPHA_OPAQUE}; const SDL_Color Colors::BLACK = {0, 0, 0, SDL_ALPHA_OPAQUE};
const SDL_Color Colors::TRANSPARENT = {0, 0, 0, SDL_ALPHA_TRANSPARENT}; const SDL_Color Colors::TRANSPARENCY = {0, 0, 0, SDL_ALPHA_TRANSPARENT};
Rect CSDL_Ext::genRect(const int & hh, const int & ww, const int & xx, const int & yy) Rect CSDL_Ext::genRect(const int & hh, const int & ww, const int & xx, const int & yy)
{ {

2
client/gui/SDL_Extensions.h
View File

@ -63,7 +63,7 @@ public:
static const SDL_Color BLACK; static const SDL_Color BLACK;
static const SDL_Color TRANSPARENT; static const SDL_Color TRANSPARENCY;
}; };
namespace CSDL_Ext namespace CSDL_Ext

1
client/mapHandler.h
View File

@ -13,7 +13,6 @@
#include "../lib/int3.h" #include "../lib/int3.h"
#include "../lib/spells/ViewSpellInt.h" #include "../lib/spells/ViewSpellInt.h"
#include "../lib/Rect.h" #include "../lib/Rect.h"
#include "SDL.h"
#ifdef IN #ifdef IN
#undef IN #undef IN

2
client/widgets/AdventureMapClasses.cpp
View File

@ -10,7 +10,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "AdventureMapClasses.h" #include "AdventureMapClasses.h"
#include <SDL.h> #include <SDL_timer.h>
#include "MiscWidgets.h" #include "MiscWidgets.h"
#include "CComponent.h" #include "CComponent.h"