diff options
35 files changed, 10 insertions, 64 deletions
diff --git a/src/const/resources/map/map.h b/src/const/resources/map/map.h index ccf54c3dc..94a5b8cb7 100644 --- a/src/const/resources/map/map.h +++ b/src/const/resources/map/map.h @@ -20,9 +20,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_MAP_MAPCONSTS_H -#define RESOURCES_MAP_MAPCONSTS_H +#ifndef CONST_RESOURCES_MAP_MAP_H +#define CONST_RESOURCES_MAP_MAP_H static const int mapTileSize = 32; -#endif // RESOURCES_MAP_MAPCONSTS_H +#endif // CONST_RESOURCES_MAP_MAP_H diff --git a/src/const/spells.h b/src/const/spells.h index 3f75fbe5d..608c0d31e 100644 --- a/src/const/spells.h +++ b/src/const/spells.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONST_SPELLMINID_H -#define CONST_SPELLMINID_H +#ifndef CONST_SPELLS_H +#define CONST_SPELLS_H #include "localconsts.h" @@ -29,4 +29,4 @@ const unsigned int SPELL_SHORTCUT_ITEMS = 49; const unsigned int SPELL_SHORTCUT_TABS = 5; const unsigned int SPELLS_SIZE = SPELL_SHORTCUT_ITEMS * SPELL_SHORTCUT_TABS; -#endif // CONST_SPELLMINID_H +#endif // CONST_SPELLS_H diff --git a/src/game.cpp b/src/game.cpp index efc4bd0f0..29dcca1df 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -34,7 +34,6 @@ #include "itemshortcut.h" #include "soundmanager.h" #include "settings.h" -#include "spellshortcut.h" #include "touchmanager.h" #include "being/crazymoves.h" diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index a5299ce1f..e4949fbaf 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -727,7 +727,7 @@ void GraphicsManager::updateTextureCompressionFormat() const const int compressionFormat = config.getIntValue("compresstextures"); // using extensions if can if (checkGLVersion(3, 1) || - checkGLesVersion(2,0) || + checkGLesVersion(2, 0) || supportExtension("GL_ARB_texture_compression")) { GLint num = 0; diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index cc1cf0726..eba6f1ee9 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -27,7 +27,6 @@ #include "gamemodifiers.h" #include "item.h" #include "party.h" -#include "spellmanager.h" #include "being/localplayer.h" #include "being/playerinfo.h" diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 4bcc5cd80..4659f4afd 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -30,8 +30,6 @@ #include "being/playerinfo.h" -#include "const/spells.h" - #include "input/inputmanager.h" #include "gui/viewport.h" diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index c5ef083b0..1d1b15836 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -28,8 +28,6 @@ #include "spellmanager.h" #include "spellshortcut.h" -#include "const/spells.h" - #include "gui/viewport.h" #include "gui/fonts/font.h" diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index d290a41a4..a30c2fefa 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -28,7 +28,6 @@ #include "party.h" #include "settings.h" #include "spellmanager.h" -#include "spellshortcut.h" #include "being/localplayer.h" #include "being/playerinfo.h" diff --git a/src/net/ea/buysellrecv.cpp b/src/net/ea/buysellrecv.cpp index 27e74ba6d..8ec0e86b0 100644 --- a/src/net/ea/buysellrecv.cpp +++ b/src/net/ea/buysellrecv.cpp @@ -40,8 +40,6 @@ #include "net/messagein.h" -#include "net/ea/eaprotocol.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/inventoryrecv.cpp b/src/net/ea/inventoryrecv.cpp index 65ba9078d..73210a0e5 100644 --- a/src/net/ea/inventoryrecv.cpp +++ b/src/net/ea/inventoryrecv.cpp @@ -37,7 +37,6 @@ #include "net/inventoryhandler.h" #include "net/messagein.h" -#include "net/ea/eaprotocol.h" #include "net/ea/equipbackend.h" #include "utils/delete2.h" diff --git a/src/net/eathena/auctionhandler.cpp b/src/net/eathena/auctionhandler.cpp index 79d72ebc0..02e903929 100644 --- a/src/net/eathena/auctionhandler.cpp +++ b/src/net/eathena/auctionhandler.cpp @@ -24,8 +24,6 @@ #include "const/net/inventory.h" -#include "net/ea/eaprotocol.h" - #include "net/eathena/messageout.h" #include "net/eathena/protocolout.h" diff --git a/src/net/eathena/buyingstorehandler.cpp b/src/net/eathena/buyingstorehandler.cpp index 682cc68cb..8ff7f65bb 100644 --- a/src/net/eathena/buyingstorehandler.cpp +++ b/src/net/eathena/buyingstorehandler.cpp @@ -27,8 +27,6 @@ #include "const/net/inventory.h" -#include "net/ea/eaprotocol.h" - #include "net/eathena/messageout.h" #include "net/eathena/protocolout.h" diff --git a/src/net/eathena/buyingstorerecv.cpp b/src/net/eathena/buyingstorerecv.cpp index 0dd2096c1..13054c2c3 100644 --- a/src/net/eathena/buyingstorerecv.cpp +++ b/src/net/eathena/buyingstorerecv.cpp @@ -42,8 +42,6 @@ #include "net/messagein.h" -#include "net/ea/eaprotocol.h" - #include "debug.h" namespace EAthena diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 76dc02800..706d286f1 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -33,8 +33,6 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocolout.h" -#include "net/ea/eaprotocol.h" - #include "debug.h" extern Net::InventoryHandler *inventoryHandler; diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp index 91dd66fb9..b4a7e91cc 100644 --- a/src/net/eathena/inventoryrecv.cpp +++ b/src/net/eathena/inventoryrecv.cpp @@ -48,7 +48,6 @@ #include "net/eathena/itemflags.h" #include "net/eathena/menu.h" -#include "net/ea/eaprotocol.h" #include "net/ea/equipbackend.h" #include "net/ea/inventoryrecv.h" @@ -924,7 +923,6 @@ void InventoryRecv::processPlayerRefine(Net::MessageIn &msg) const Inventory *const inv = PlayerInfo::getInventory(); const Item *item = nullptr; int notifyType; - std::string message; std::string itemName; if (inv) item = inv->getItem(index); diff --git a/src/net/eathena/mailhandler.cpp b/src/net/eathena/mailhandler.cpp index 14fa96073..96140b739 100644 --- a/src/net/eathena/mailhandler.cpp +++ b/src/net/eathena/mailhandler.cpp @@ -22,8 +22,6 @@ #include "const/net/inventory.h" -#include "net/ea/eaprotocol.h" - #include "net/eathena/messageout.h" #include "net/eathena/protocolout.h" diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 7ec98f382..5a267c25e 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -34,7 +34,6 @@ #include "net/messagein.h" -#include "net/ea/eaprotocol.h" #include "net/ea/npcrecv.h" #include "net/eathena/messageout.h" diff --git a/src/net/eathena/petrecv.cpp b/src/net/eathena/petrecv.cpp index 474c0315b..b0bd19e1d 100644 --- a/src/net/eathena/petrecv.cpp +++ b/src/net/eathena/petrecv.cpp @@ -40,8 +40,6 @@ #include "net/inventoryhandler.h" #include "net/messagein.h" -#include "net/ea/eaprotocol.h" - #include "net/eathena/menu.h" #include "utils/gettext.h" diff --git a/src/net/eathena/skillrecv.cpp b/src/net/eathena/skillrecv.cpp index 5ebf59178..edb776ad1 100644 --- a/src/net/eathena/skillrecv.cpp +++ b/src/net/eathena/skillrecv.cpp @@ -41,8 +41,6 @@ #include "net/messagein.h" -#include "net/ea/skillrecv.h" - #include "net/eathena/menu.h" #include "resources/iteminfo.h" diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index 801cdc51e..6c3026e7b 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -32,8 +32,6 @@ #include "net/eathena/protocolout.h" #include "net/eathena/traderecv.h" -#include "net/ea/eaprotocol.h" - #include "debug.h" extern Net::TradeHandler *tradeHandler; diff --git a/src/net/eathena/vendinghandler.cpp b/src/net/eathena/vendinghandler.cpp index 6e387317d..5a0661ae4 100644 --- a/src/net/eathena/vendinghandler.cpp +++ b/src/net/eathena/vendinghandler.cpp @@ -27,8 +27,6 @@ #include "const/net/inventory.h" -#include "net/ea/eaprotocol.h" - #include "net/eathena/messageout.h" #include "net/eathena/protocolout.h" #include "net/eathena/vendingrecv.h" diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 189eae351..ea4d27804 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -31,8 +31,6 @@ #include "net/tmwa/messageout.h" #include "net/tmwa/protocolout.h" -#include "net/ea/eaprotocol.h" - #include "debug.h" extern Net::InventoryHandler *inventoryHandler; diff --git a/src/net/tmwa/inventoryrecv.cpp b/src/net/tmwa/inventoryrecv.cpp index ee5323095..4ff6725dd 100644 --- a/src/net/tmwa/inventoryrecv.cpp +++ b/src/net/tmwa/inventoryrecv.cpp @@ -34,7 +34,6 @@ #include "net/messagein.h" -#include "net/ea/eaprotocol.h" #include "net/ea/equipbackend.h" #include "net/ea/inventoryrecv.h" diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index eac7c883d..55c94b1a1 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -35,7 +35,6 @@ #include "net/tmwa/messageout.h" #include "net/tmwa/protocolout.h" -#include "net/ea/eaprotocol.h" #include "net/ea/npcrecv.h" #include "debug.h" diff --git a/src/net/tmwa/skillrecv.cpp b/src/net/tmwa/skillrecv.cpp index 1713ba301..f8b6962ff 100644 --- a/src/net/tmwa/skillrecv.cpp +++ b/src/net/tmwa/skillrecv.cpp @@ -35,8 +35,6 @@ #include "net/messagein.h" -#include "net/ea/skillrecv.h" - #include "utils/gettext.h" #include "debug.h" diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 7a4161388..ebdd56fb6 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -31,8 +31,6 @@ #include "net/tmwa/messageout.h" #include "net/tmwa/protocolout.h" -#include "net/ea/eaprotocol.h" - #include "debug.h" extern Net::TradeHandler *tradeHandler; diff --git a/src/net/tmwa/traderecv.cpp b/src/net/tmwa/traderecv.cpp index d5e6ab586..db27d7800 100644 --- a/src/net/tmwa/traderecv.cpp +++ b/src/net/tmwa/traderecv.cpp @@ -39,7 +39,6 @@ #include "net/messagein.h" #include "net/tradehandler.h" -#include "net/ea/eaprotocol.h" #include "net/ea/traderecv.h" #include "utils/stringutils.h" diff --git a/src/render/imagegraphics.h b/src/render/imagegraphics.h index df07bdacd..f9ace972a 100644 --- a/src/render/imagegraphics.h +++ b/src/render/imagegraphics.h @@ -33,8 +33,6 @@ class Image; class ImageCollection; class ImageVertexes; -struct SDL_Surface; - /** * A central point of control for graphics. */ diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp index 9db0f07f4..baca7f219 100644 --- a/src/render/mobileopengl2graphics.cpp +++ b/src/render/mobileopengl2graphics.cpp @@ -24,7 +24,6 @@ #include "render/mobileopengl2graphics.h" -#include "configuration.h" #include "graphicsmanager.h" #include "graphicsvertexes.h" #include "logger.h" diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index ce7501e27..1a8c697a2 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -24,8 +24,6 @@ #include "render/mobileopenglgraphics.h" -#include "configuration.h" -#include "graphicsmanager.h" #include "graphicsvertexes.h" #include "logger.h" diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index b86859f6d..85053b7a3 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -24,8 +24,6 @@ #include "render/normalopenglgraphics.h" -#include "configuration.h" -#include "graphicsmanager.h" #include "graphicsvertexes.h" #include "logger.h" diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp index 143594733..af136cd19 100644 --- a/src/render/safeopenglgraphics.cpp +++ b/src/render/safeopenglgraphics.cpp @@ -23,9 +23,6 @@ #if defined USE_OPENGL && !defined ANDROID #include "render/safeopenglgraphics.h" -#include "configuration.h" -#include "graphicsmanager.h" - #include "render/mgl.h" #include "resources/image.h" diff --git a/src/resources/image.cpp b/src/resources/image.cpp index c196b217c..8b0f35c28 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -28,9 +28,6 @@ #ifdef USE_OPENGL #include "resources/openglimagehelper.h" -#ifndef ANDROID -#include "resources/safeopenglimagehelper.h" -#endif // ANDROID #endif // USE_OPENGL #include "resources/sdlimagehelper.h" #include "resources/subimage.h" diff --git a/src/spellshortcut.cpp b/src/spellshortcut.cpp index c0afd2b20..aa4e95248 100644 --- a/src/spellshortcut.cpp +++ b/src/spellshortcut.cpp @@ -24,8 +24,6 @@ #include "spellmanager.h" -#include "const/spells.h" - #include "debug.h" SpellShortcut *spellShortcut = nullptr; diff --git a/src/utils/naclmessages.cpp b/src/utils/naclmessages.cpp index 1723f7180..de7227eae 100644 --- a/src/utils/naclmessages.cpp +++ b/src/utils/naclmessages.cpp @@ -51,7 +51,8 @@ static void naclMessageHandlerFunc(struct PP_Var key, struct PP_Var value, void* user_data) { - NaclMessageHandle *handle = (NaclMessageHandle *)user_data; + NaclMessageHandle *handle = reinterpret_cast<NaclMessageHandle *>( + user_data); if (key.type != PP_VARTYPE_STRING || value.type != PP_VARTYPE_STRING) return; @@ -72,7 +73,7 @@ NaclMessageHandle *naclRegisterMessageHandler(const std::string &type) PSEventRegisterMessageHandler(type.c_str(), naclMessageHandlerFunc, - (void *)handle); + reinterpret_cast<void *>(handle)); return handle; } |