games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Renamed SDL_Pixels -> SDL_PixelAccess due to similar SDL header

Browse Source
This commit is contained in:
Ivan Savenko 2023-01-30 20:06:08 +02:00
parent 9c3030603d
commit 5cc23cc286
9 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/CMakeLists.txt
View File

@ -111,7 +111,7 @@ set(client_HEADERS
gui/Fonts.h
gui/TextAlignment.h
gui/SDL_Extensions.h
gui/SDL_Pixels.h
gui/SDL_PixelAccess.h
gui/NotificationHandler.h
gui/InterfaceObjectConfigurable.h

1
client/gui/CAnimation.cpp
View File

@ -11,7 +11,6 @@
#include "CAnimation.h"
#include "SDL_Extensions.h"
#include "SDL_Pixels.h"
#include "ColorFilter.h"
#include "../CBitmapHandler.h"

2
client/gui/Fonts.cpp
View File

@ -12,7 +12,7 @@
#include <SDL_ttf.h>
#include "SDL_Pixels.h"
#include "SDL_Extensions.h"
#include "../../lib/JsonNode.h"
#include "../../lib/vcmi_endian.h"
#include "../../lib/filesystem/Filesystem.h"

2
client/gui/SDL_Extensions.cpp
View File

@ -9,7 +9,7 @@
*/
#include "StdInc.h"
#include "SDL_Extensions.h"
#include "SDL_Pixels.h"
#include "SDL_PixelAccess.h"
#include "../CGameInfo.h"
#include "../CMessage.h"

2
client/gui/SDL_Pixels.h → client/gui/SDL_PixelAccess.h
View File

@ -1,5 +1,5 @@
/*
* SDL_Pixels.h, part of VCMI engine
* SDL_PixelAccess.h, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*

2
client/widgets/AdventureMapClasses.cpp
View File

@ -22,7 +22,7 @@
#include "../mainmenu/CMainMenu.h"
#include "../gui/CGuiHandler.h"
#include "../gui/SDL_Pixels.h"
#include "../gui/SDL_PixelAccess.h"
#include "../gui/CAnimation.h"
#include "../windows/InfoWindows.h"

1
client/widgets/Images.cpp
View File

@ -13,7 +13,6 @@
#include "MiscWidgets.h"
#include "../gui/CAnimation.h"
#include "../gui/SDL_Pixels.h"
#include "../gui/CGuiHandler.h"
#include "../gui/CursorHandler.h"
#include "../gui/ColorFilter.h"

2
client/windows/CWindowObject.cpp
View File

@ -15,7 +15,7 @@
#include "../widgets/MiscWidgets.h"
#include "../widgets/Images.h"
#include "../gui/SDL_Pixels.h"
#include "../gui/SDL_PixelAccess.h"
#include "../gui/SDL_Extensions.h"
#include "../gui/CGuiHandler.h"
#include "../gui/CursorHandler.h"

1
client/windows/InfoWindows.cpp
View File

@ -21,7 +21,6 @@
#include "../widgets/CComponent.h"
#include "../widgets/MiscWidgets.h"
#include "../gui/SDL_Pixels.h"
#include "../gui/SDL_Extensions.h"
#include "../gui/CGuiHandler.h"
#include "../gui/CursorHandler.h"