diff options
| -rw-r--r-- | accountserver.cbp | 62 | ||||
| -rw-r--r-- | gameserver.cbp | 110 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 136 | ||||
| -rw-r--r-- | src/account-server/account.cpp | 2 | ||||
| -rw-r--r-- | src/account-server/account.h (renamed from src/account-server/account.hpp) | 2 | ||||
| -rw-r--r-- | src/account-server/accountclient.cpp | 2 | ||||
| -rw-r--r-- | src/account-server/accountclient.h (renamed from src/account-server/accountclient.hpp) | 4 | ||||
| -rw-r--r-- | src/account-server/accounthandler.cpp | 36 | ||||
| -rw-r--r-- | src/account-server/accounthandler.h (renamed from src/account-server/accounthandler.hpp) | 0 | ||||
| -rw-r--r-- | src/account-server/character.cpp | 4 | ||||
| -rw-r--r-- | src/account-server/character.h (renamed from src/account-server/character.hpp) | 6 | ||||
| -rw-r--r-- | src/account-server/main-account.cpp | 26 | ||||
| -rw-r--r-- | src/account-server/serverhandler.cpp | 28 | ||||
| -rw-r--r-- | src/account-server/serverhandler.h (renamed from src/account-server/serverhandler.hpp) | 2 | ||||
| -rw-r--r-- | src/account-server/storage.cpp | 14 | ||||
| -rw-r--r-- | src/account-server/storage.h (renamed from src/account-server/storage.hpp) | 2 | ||||
| -rw-r--r-- | src/chat-server/chatchannel.cpp | 4 | ||||
| -rw-r--r-- | src/chat-server/chatchannel.h (renamed from src/chat-server/chatchannel.hpp) | 0 | ||||
| -rw-r--r-- | src/chat-server/chatchannelmanager.cpp | 12 | ||||
| -rw-r--r-- | src/chat-server/chatchannelmanager.h (renamed from src/chat-server/chatchannelmanager.hpp) | 2 | ||||
| -rw-r--r-- | src/chat-server/chatclient.h (renamed from src/chat-server/chatclient.hpp) | 2 | ||||
| -rw-r--r-- | src/chat-server/chathandler.cpp | 24 | ||||
| -rw-r--r-- | src/chat-server/chathandler.h (renamed from src/chat-server/chathandler.hpp) | 4 | ||||
| -rw-r--r-- | src/chat-server/guild.cpp | 2 | ||||
| -rw-r--r-- | src/chat-server/guild.h (renamed from src/chat-server/guild.hpp) | 0 | ||||
| -rw-r--r-- | src/chat-server/guildhandler.cpp | 24 | ||||
| -rw-r--r-- | src/chat-server/guildmanager.cpp | 10 | ||||
| -rw-r--r-- | src/chat-server/guildmanager.h (renamed from src/chat-server/guildmanager.hpp) | 0 | ||||
| -rw-r--r-- | src/chat-server/party.cpp | 2 | ||||
| -rw-r--r-- | src/chat-server/party.h (renamed from src/chat-server/party.hpp) | 0 | ||||
| -rw-r--r-- | src/chat-server/partyhandler.cpp | 14 | ||||
| -rw-r--r-- | src/chat-server/post.cpp | 7 | ||||
| -rw-r--r-- | src/chat-server/post.h (renamed from src/chat-server/post.hpp) | 2 | ||||
| -rw-r--r-- | src/common/configuration.cpp | 6 | ||||
| -rw-r--r-- | src/common/configuration.h (renamed from src/common/configuration.hpp) | 0 | ||||
| -rw-r--r-- | src/common/inventorydata.h (renamed from src/common/inventorydata.hpp) | 4 | ||||
| -rw-r--r-- | src/common/permissionmanager.cpp | 8 | ||||
| -rw-r--r-- | src/common/permissionmanager.h (renamed from src/common/permissionmanager.hpp) | 6 | ||||
| -rw-r--r-- | src/common/resourcemanager.cpp | 4 | ||||
| -rw-r--r-- | src/common/resourcemanager.h (renamed from src/common/resourcemanager.hpp) | 0 | ||||
| -rw-r--r-- | src/common/transaction.h (renamed from src/common/transaction.hpp) | 0 | ||||
| -rw-r--r-- | src/dal/mysqldataprovider.h | 2 | ||||
| -rw-r--r-- | src/dal/sqlitedataprovider.h | 2 | ||||
| -rw-r--r-- | src/game-server/accountconnection.cpp | 32 | ||||
| -rw-r--r-- | src/game-server/accountconnection.h (renamed from src/game-server/accountconnection.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/actor.cpp | 6 | ||||
| -rw-r--r-- | src/game-server/actor.h (renamed from src/game-server/actor.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/attribute.cpp | 4 | ||||
| -rw-r--r-- | src/game-server/attribute.h (renamed from src/game-server/attribute.hpp) | 6 | ||||
| -rw-r--r-- | src/game-server/attributemanager.cpp | 8 | ||||
| -rw-r--r-- | src/game-server/attributemanager.h (renamed from src/game-server/attributemanager.hpp) | 6 | ||||
| -rw-r--r-- | src/game-server/autoattack.cpp | 22 | ||||
| -rw-r--r-- | src/game-server/autoattack.h (renamed from src/game-server/autoattack.hpp) | 26 | ||||
| -rw-r--r-- | src/game-server/being.cpp | 22 | ||||
| -rw-r--r-- | src/game-server/being.h (renamed from src/game-server/being.hpp) | 6 | ||||
| -rw-r--r-- | src/game-server/buysell.cpp | 14 | ||||
| -rw-r--r-- | src/game-server/buysell.h (renamed from src/game-server/buysell.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/character.cpp | 38 | ||||
| -rw-r--r-- | src/game-server/character.h (renamed from src/game-server/character.hpp) | 10 | ||||
| -rw-r--r-- | src/game-server/collisiondetection.cpp | 2 | ||||
| -rw-r--r-- | src/game-server/collisiondetection.h (renamed from src/game-server/collisiondetection.hpp) | 0 | ||||
| -rw-r--r-- | src/game-server/command.cpp | 20 | ||||
| -rw-r--r-- | src/game-server/commandhandler.cpp | 34 | ||||
| -rw-r--r-- | src/game-server/commandhandler.h (renamed from src/game-server/commandhandler.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/effect.cpp | 6 | ||||
| -rw-r--r-- | src/game-server/effect.h (renamed from src/game-server/effect.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/eventlistener.h (renamed from src/game-server/eventlistener.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/gamehandler.cpp | 42 | ||||
| -rw-r--r-- | src/game-server/gamehandler.h (renamed from src/game-server/gamehandler.hpp) | 12 | ||||
| -rw-r--r-- | src/game-server/inventory.cpp | 10 | ||||
| -rw-r--r-- | src/game-server/inventory.h (renamed from src/game-server/inventory.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/item.cpp | 16 | ||||
| -rw-r--r-- | src/game-server/item.h (renamed from src/game-server/item.hpp) | 6 | ||||
| -rw-r--r-- | src/game-server/itemmanager.cpp | 14 | ||||
| -rw-r--r-- | src/game-server/itemmanager.h (renamed from src/game-server/itemmanager.hpp) | 0 | ||||
| -rw-r--r-- | src/game-server/main-game.cpp | 36 | ||||
| -rw-r--r-- | src/game-server/map.cpp | 2 | ||||
| -rw-r--r-- | src/game-server/map.h (renamed from src/game-server/map.hpp) | 0 | ||||
| -rw-r--r-- | src/game-server/mapcomposite.cpp | 10 | ||||
| -rw-r--r-- | src/game-server/mapcomposite.h (renamed from src/game-server/mapcomposite.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/mapmanager.cpp | 12 | ||||
| -rw-r--r-- | src/game-server/mapmanager.h (renamed from src/game-server/mapmanager.hpp) | 0 | ||||
| -rw-r--r-- | src/game-server/mapreader.cpp | 26 | ||||
| -rw-r--r-- | src/game-server/mapreader.h (renamed from src/game-server/mapreader.hpp) | 0 | ||||
| -rw-r--r-- | src/game-server/monster.cpp | 24 | ||||
| -rw-r--r-- | src/game-server/monster.h (renamed from src/game-server/monster.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/monstermanager.cpp | 12 | ||||
| -rw-r--r-- | src/game-server/monstermanager.h (renamed from src/game-server/monstermanager.hpp) | 6 | ||||
| -rw-r--r-- | src/game-server/npc.cpp | 6 | ||||
| -rw-r--r-- | src/game-server/npc.h (renamed from src/game-server/npc.hpp) | 6 | ||||
| -rw-r--r-- | src/game-server/postman.h (renamed from src/game-server/postman.hpp) | 0 | ||||
| -rw-r--r-- | src/game-server/quest.cpp | 8 | ||||
| -rw-r--r-- | src/game-server/quest.h (renamed from src/game-server/quest.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/skillmanager.cpp | 8 | ||||
| -rw-r--r-- | src/game-server/skillmanager.h (renamed from src/game-server/skillmanager.hpp) | 0 | ||||
| -rw-r--r-- | src/game-server/spawnarea.cpp | 8 | ||||
| -rw-r--r-- | src/game-server/spawnarea.h (renamed from src/game-server/spawnarea.hpp) | 8 | ||||
| -rw-r--r-- | src/game-server/state.cpp | 34 | ||||
| -rw-r--r-- | src/game-server/state.h (renamed from src/game-server/state.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/statuseffect.cpp | 6 | ||||
| -rw-r--r-- | src/game-server/statuseffect.h (renamed from src/game-server/statuseffect.hpp) | 0 | ||||
| -rw-r--r-- | src/game-server/statusmanager.cpp | 10 | ||||
| -rw-r--r-- | src/game-server/statusmanager.h (renamed from src/game-server/statusmanager.hpp) | 0 | ||||
| -rw-r--r-- | src/game-server/thing.cpp | 4 | ||||
| -rw-r--r-- | src/game-server/thing.h (renamed from src/game-server/thing.hpp) | 0 | ||||
| -rw-r--r-- | src/game-server/trade.cpp | 10 | ||||
| -rw-r--r-- | src/game-server/trade.h (renamed from src/game-server/trade.hpp) | 4 | ||||
| -rw-r--r-- | src/game-server/trigger.cpp | 10 | ||||
| -rw-r--r-- | src/game-server/trigger.h (renamed from src/game-server/trigger.hpp) | 8 | ||||
| -rw-r--r-- | src/net/bandwidth.cpp | 4 | ||||
| -rw-r--r-- | src/net/bandwidth.h (renamed from src/net/bandwidth.hpp) | 0 | ||||
| -rw-r--r-- | src/net/connection.cpp | 8 | ||||
| -rw-r--r-- | src/net/connection.h (renamed from src/net/connection.hpp) | 0 | ||||
| -rw-r--r-- | src/net/connectionhandler.cpp | 12 | ||||
| -rw-r--r-- | src/net/connectionhandler.h (renamed from src/net/connectionhandler.hpp) | 0 | ||||
| -rw-r--r-- | src/net/messagein.cpp | 2 | ||||
| -rw-r--r-- | src/net/messagein.h (renamed from src/net/messagein.hpp) | 0 | ||||
| -rw-r--r-- | src/net/messageout.cpp | 2 | ||||
| -rw-r--r-- | src/net/messageout.h (renamed from src/net/messageout.hpp) | 0 | ||||
| -rw-r--r-- | src/net/netcomputer.cpp | 8 | ||||
| -rw-r--r-- | src/net/netcomputer.h (renamed from src/net/netcomputer.hpp) | 0 | ||||
| -rw-r--r-- | src/scripting/lua.cpp | 46 | ||||
| -rw-r--r-- | src/scripting/luascript.cpp | 4 | ||||
| -rw-r--r-- | src/scripting/luascript.h (renamed from src/scripting/luascript.hpp) | 8 | ||||
| -rw-r--r-- | src/scripting/luautil.cpp | 6 | ||||
| -rw-r--r-- | src/scripting/luautil.h (renamed from src/scripting/luautil.hpp) | 4 | ||||
| -rw-r--r-- | src/scripting/script.cpp | 6 | ||||
| -rw-r--r-- | src/scripting/script.h (renamed from src/scripting/script.hpp) | 8 | ||||
| -rw-r--r-- | src/serialize/characterdata.h (renamed from src/serialize/characterdata.hpp) | 10 | ||||
| -rw-r--r-- | src/utils/logger.cpp | 4 | ||||
| -rw-r--r-- | src/utils/processorutils.cpp | 2 | ||||
| -rw-r--r-- | src/utils/processorutils.h (renamed from src/utils/processorutils.hpp) | 6 | ||||
| -rw-r--r-- | src/utils/speedconv.cpp | 2 | ||||
| -rw-r--r-- | src/utils/speedconv.h (renamed from src/utils/speedconv.hpp) | 6 | ||||
| -rw-r--r-- | src/utils/string.cpp | 2 | ||||
| -rw-r--r-- | src/utils/string.h (renamed from src/utils/string.hpp) | 0 | ||||
| -rw-r--r-- | src/utils/stringfilter.cpp | 2 | ||||
| -rw-r--r-- | src/utils/tokencollector.cpp | 2 | ||||
| -rw-r--r-- | src/utils/tokencollector.h (renamed from src/utils/tokencollector.hpp) | 6 | ||||
| -rw-r--r-- | src/utils/tokendispenser.cpp | 2 | ||||
| -rw-r--r-- | src/utils/tokendispenser.h (renamed from src/utils/tokendispenser.hpp) | 6 | ||||
| -rw-r--r-- | src/utils/xml.cpp | 6 | ||||
| -rw-r--r-- | src/utils/xml.h (renamed from src/utils/xml.hpp) | 0 | ||||
| -rw-r--r-- | src/utils/zlib.cpp | 2 | ||||
| -rw-r--r-- | src/utils/zlib.h (renamed from src/utils/zlib.hpp) | 4 |
145 files changed, 730 insertions, 691 deletions
diff --git a/accountserver.cbp b/accountserver.cbp index 45df2a8..c03547a 100644 --- a/accountserver.cbp +++ b/accountserver.cbp @@ -81,41 +81,41 @@ <Unit filename="libs\enet\include\enet\win32.h" /> <Unit filename="libs\enet\win32.c" /> <Unit filename="src\account-server\account.cpp" /> - <Unit filename="src\account-server\account.hpp" /> + <Unit filename="src\account-server\account.h" /> <Unit filename="src\account-server\accountclient.cpp" /> - <Unit filename="src\account-server\accountclient.hpp" /> + <Unit filename="src\account-server\accountclient.h" /> <Unit filename="src\account-server\accounthandler.cpp" /> - <Unit filename="src\account-server\accounthandler.hpp" /> + <Unit filename="src\account-server\accounthandler.h" /> <Unit filename="src\account-server\character.cpp" /> - <Unit filename="src\account-server\character.hpp" /> + <Unit filename="src\account-server\character.h" /> <Unit filename="src\account-server\main-account.cpp" /> <Unit filename="src\account-server\serverhandler.cpp" /> - <Unit filename="src\account-server\serverhandler.hpp" /> + <Unit filename="src\account-server\serverhandler.h" /> <Unit filename="src\account-server\storage.cpp" /> - <Unit filename="src\account-server\storage.hpp" /> + <Unit filename="src\account-server\storage.h" /> <Unit filename="src\chat-server\chatchannel.cpp" /> - <Unit filename="src\chat-server\chatchannel.hpp" /> + <Unit filename="src\chat-server\chatchannel.h" /> <Unit filename="src\chat-server\chatchannelmanager.cpp" /> - <Unit filename="src\chat-server\chatchannelmanager.hpp" /> - <Unit filename="src\chat-server\chatclient.hpp" /> + <Unit filename="src\chat-server\chatchannelmanager.h" /> + <Unit filename="src\chat-server\chatclient.h" /> <Unit filename="src\chat-server\chathandler.cpp" /> - <Unit filename="src\chat-server\chathandler.hpp" /> + <Unit filename="src\chat-server\chathandler.h" /> <Unit filename="src\chat-server\guild.cpp" /> - <Unit filename="src\chat-server\guild.hpp" /> + <Unit filename="src\chat-server\guild.h" /> <Unit filename="src\chat-server\guildhandler.cpp" /> <Unit filename="src\chat-server\guildmanager.cpp" /> - <Unit filename="src\chat-server\guildmanager.hpp" /> + <Unit filename="src\chat-server\guildmanager.h" /> <Unit filename="src\chat-server\party.cpp" /> - <Unit filename="src\chat-server\party.hpp" /> + <Unit filename="src\chat-server\party.h" /> <Unit filename="src\chat-server\partyhandler.cpp" /> <Unit filename="src\chat-server\post.cpp" /> - <Unit filename="src\chat-server\post.hpp" /> + <Unit filename="src\chat-server\post.h" /> <Unit filename="src\common\configuration.cpp" /> - <Unit filename="src\common\configuration.hpp" /> - <Unit filename="src\common\inventorydata.hpp" /> + <Unit filename="src\common\configuration.h" /> + <Unit filename="src\common\inventorydata.h" /> <Unit filename="src\common\resourcemanager.cpp" /> - <Unit filename="src\common\resourcemanager.hpp" /> - <Unit filename="src\common\transaction.hpp" /> + <Unit filename="src\common\resourcemanager.h" /> + <Unit filename="src\common\transaction.h" /> <Unit filename="src\dal\dalexcept.h" /> <Unit filename="src\dal\dataprovider.cpp" /> <Unit filename="src\dal\dataprovider.h" /> @@ -127,19 +127,19 @@ <Unit filename="src\dal\sqlitedataprovider.h" /> <Unit filename="src\defines.h" /> <Unit filename="src\net\bandwidth.cpp" /> - <Unit filename="src\net\bandwidth.hpp" /> + <Unit filename="src\net\bandwidth.h" /> <Unit filename="src\net\connection.cpp" /> - <Unit filename="src\net\connection.hpp" /> + <Unit filename="src\net\connection.h" /> <Unit filename="src\net\connectionhandler.cpp" /> - <Unit filename="src\net\connectionhandler.hpp" /> + <Unit filename="src\net\connectionhandler.h" /> <Unit filename="src\net\messagein.cpp" /> - <Unit filename="src\net\messagein.hpp" /> + <Unit filename="src\net\messagein.h" /> <Unit filename="src\net\messageout.cpp" /> - <Unit filename="src\net\messageout.hpp" /> + <Unit filename="src\net\messageout.h" /> <Unit filename="src\net\netcomputer.cpp" /> - <Unit filename="src\net\netcomputer.hpp" /> + <Unit filename="src\net\netcomputer.h" /> <Unit filename="src\point.h" /> - <Unit filename="src\serialize\characterdata.hpp" /> + <Unit filename="src\serialize\characterdata.h" /> <Unit filename="src\utils\base64.cpp" /> <Unit filename="src\utils\base64.h" /> <Unit filename="src\utils\encryption.cpp" /> @@ -150,24 +150,24 @@ <Unit filename="src\utils\mathutils.cpp" /> <Unit filename="src\utils\mathutils.h" /> <Unit filename="src\utils\processorutils.cpp" /> - <Unit filename="src\utils\processorutils.hpp" /> + <Unit filename="src\utils\processorutils.h" /> <Unit filename="src\utils\sha256.cpp" /> <Unit filename="src\utils\sha256.h" /> <Unit filename="src\utils\singleton.h" /> <Unit filename="src\utils\string.cpp" /> - <Unit filename="src\utils\string.hpp" /> + <Unit filename="src\utils\string.h" /> <Unit filename="src\utils\stringfilter.cpp" /> <Unit filename="src\utils\stringfilter.h" /> <Unit filename="src\utils\timer.cpp" /> <Unit filename="src\utils\timer.h" /> <Unit filename="src\utils\tokencollector.cpp" /> - <Unit filename="src\utils\tokencollector.hpp" /> + <Unit filename="src\utils\tokencollector.h" /> <Unit filename="src\utils\tokendispenser.cpp" /> - <Unit filename="src\utils\tokendispenser.hpp" /> + <Unit filename="src\utils\tokendispenser.h" /> <Unit filename="src\utils\xml.cpp" /> - <Unit filename="src\utils\xml.hpp" /> + <Unit filename="src\utils\xml.h" /> <Unit filename="src\utils\zlib.cpp" /> - <Unit filename="src\utils\zlib.hpp" /> + <Unit filename="src\utils\zlib.h" /> <Extensions> <code_completion /> <debugger /> diff --git a/gameserver.cbp b/gameserver.cbp index 965ab7a..3d3e537 100644 --- a/gameserver.cbp +++ b/gameserver.cbp @@ -81,101 +81,101 @@ <Unit filename="libs\enet\include\enet\win32.h" /> <Unit filename="libs\enet\win32.c" /> <Unit filename="src\common\configuration.cpp" /> - <Unit filename="src\common\configuration.hpp" /> - <Unit filename="src\common\inventorydata.hpp" /> + <Unit filename="src\common\configuration.h" /> + <Unit filename="src\common\inventorydata.h" /> <Unit filename="src\common\permissionmanager.cpp" /> - <Unit filename="src\common\permissionmanager.hpp" /> + <Unit filename="src\common\permissionmanager.h" /> <Unit filename="src\common\resourcemanager.cpp" /> - <Unit filename="src\common\resourcemanager.hpp" /> - <Unit filename="src\common\transaction.hpp" /> + <Unit filename="src\common\resourcemanager.h" /> + <Unit filename="src\common\transaction.h" /> <Unit filename="src\defines.h" /> <Unit filename="src\game-server\accountconnection.cpp" /> - <Unit filename="src\game-server\accountconnection.hpp" /> + <Unit filename="src\game-server\accountconnection.h" /> <Unit filename="src\game-server\actor.cpp" /> - <Unit filename="src\game-server\actor.hpp" /> + <Unit filename="src\game-server\actor.h" /> <Unit filename="src\game-server\attribute.cpp" /> - <Unit filename="src\game-server\attribute.hpp" /> + <Unit filename="src\game-server\attribute.h" /> <Unit filename="src\game-server\attributemanager.cpp" /> - <Unit filename="src\game-server\attributemanager.hpp" /> + <Unit filename="src\game-server\attributemanager.h" /> <Unit filename="src\game-server\autoattack.cpp" /> - <Unit filename="src\game-server\autoattack.hpp" /> + <Unit filename="src\game-server\autoattack.h" /> <Unit filename="src\game-server\being.cpp" /> - <Unit filename="src\game-server\being.hpp" /> + <Unit filename="src\game-server\being.h" /> <Unit filename="src\game-server\buysell.cpp" /> - <Unit filename="src\game-server\buysell.hpp" /> + <Unit filename="src\game-server\buysell.h" /> <Unit filename="src\game-server\character.cpp" /> - <Unit filename="src\game-server\character.hpp" /> + <Unit filename="src\game-server\character.h" /> <Unit filename="src\game-server\collisiondetection.cpp" /> - <Unit filename="src\game-server\collisiondetection.hpp" /> + <Unit filename="src\game-server\collisiondetection.h" /> <Unit filename="src\game-server\commandhandler.cpp" /> - <Unit filename="src\game-server\commandhandler.hpp" /> + <Unit filename="src\game-server\commandhandler.h" /> <Unit filename="src\game-server\effect.cpp" /> - <Unit filename="src\game-server\effect.hpp" /> - <Unit filename="src\game-server\eventlistener.hpp" /> + <Unit filename="src\game-server\effect.h" /> + <Unit filename="src\game-server\eventlistener.h" /> <Unit filename="src\game-server\gamehandler.cpp" /> - <Unit filename="src\game-server\gamehandler.hpp" /> + <Unit filename="src\game-server\gamehandler.h" /> <Unit filename="src\game-server\inventory.cpp" /> - <Unit filename="src\game-server\inventory.hpp" /> + <Unit filename="src\game-server\inventory.h" /> <Unit filename="src\game-server\item.cpp" /> - <Unit filename="src\game-server\item.hpp" /> + <Unit filename="src\game-server\item.h" /> <Unit filename="src\game-server\itemmanager.cpp" /> - <Unit filename="src\game-server\itemmanager.hpp" /> + <Unit filename="src\game-server\itemmanager.h" /> <Unit filename="src\game-server\main-game.cpp" /> <Unit filename="src\game-server\map.cpp" /> - <Unit filename="src\game-server\map.hpp" /> + <Unit filename="src\game-server\map.h" /> <Unit filename="src\game-server\mapcomposite.cpp" /> - <Unit filename="src\game-server\mapcomposite.hpp" /> + <Unit filename="src\game-server\mapcomposite.h" /> <Unit filename="src\game-server\mapmanager.cpp" /> - <Unit filename="src\game-server\mapmanager.hpp" /> + <Unit filename="src\game-server\mapmanager.h" /> <Unit filename="src\game-server\mapreader.cpp" /> - <Unit filename="src\game-server\mapreader.hpp" /> + <Unit filename="src\game-server\mapreader.h" /> <Unit filename="src\game-server\monster.cpp" /> - <Unit filename="src\game-server\monster.hpp" /> + <Unit filename="src\game-server\monster.h" /> <Unit filename="src\game-server\monstermanager.cpp" /> - <Unit filename="src\game-server\monstermanager.hpp" /> + <Unit filename="src\game-server\monstermanager.h" /> <Unit filename="src\game-server\npc.cpp" /> - <Unit filename="src\game-server\npc.hpp" /> - <Unit filename="src\game-server\postman.hpp" /> + <Unit filename="src\game-server\npc.h" /> + <Unit filename="src\game-server\postman.h" /> <Unit filename="src\game-server\quest.cpp" /> - <Unit filename="src\game-server\quest.hpp" /> + <Unit filename="src\game-server\quest.h" /> <Unit filename="src\game-server\skillmanager.cpp" /> - <Unit filename="src\game-server\skillmanager.hpp" /> + <Unit filename="src\game-server\skillmanager.h" /> <Unit filename="src\game-server\spawnarea.cpp" /> - <Unit filename="src\game-server\spawnarea.hpp" /> + <Unit filename="src\game-server\spawnarea.h" /> <Unit filename="src\game-server\state.cpp" /> - <Unit filename="src\game-server\state.hpp" /> + <Unit filename="src\game-server\state.h" /> <Unit filename="src\game-server\statuseffect.cpp" /> - <Unit filename="src\game-server\statuseffect.hpp" /> + <Unit filename="src\game-server\statuseffect.h" /> <Unit filename="src\game-server\statusmanager.cpp" /> - <Unit filename="src\game-server\statusmanager.hpp" /> + <Unit filename="src\game-server\statusmanager.h" /> <Unit filename="src\game-server\thing.cpp" /> - <Unit filename="src\game-server\thing.hpp" /> + <Unit filename="src\game-server\thing.h" /> <Unit filename="src\game-server\trade.cpp" /> - <Unit filename="src\game-server\trade.hpp" /> + <Unit filename="src\game-server\trade.h" /> <Unit filename="src\game-server\trigger.cpp" /> - <Unit filename="src\game-server\trigger.hpp" /> + <Unit filename="src\game-server\trigger.h" /> <Unit filename="src\net\bandwidth.cpp" /> - <Unit filename="src\net\bandwidth.hpp" /> + <Unit filename="src\net\bandwidth.h" /> <Unit filename="src\net\connection.cpp" /> - <Unit filename="src\net\connection.hpp" /> + <Unit filename="src\net\connection.h" /> <Unit filename="src\net\connectionhandler.cpp" /> - <Unit filename="src\net\connectionhandler.hpp" /> + <Unit filename="src\net\connectionhandler.h" /> <Unit filename="src\net\messagein.cpp" /> - <Unit filename="src\net\messagein.hpp" /> + <Unit filename="src\net\messagein.h" /> <Unit filename="src\net\messageout.cpp" /> - <Unit filename="src\net\messageout.hpp" /> + <Unit filename="src\net\messageout.h" /> <Unit filename="src\net\netcomputer.cpp" /> - <Unit filename="src\net\netcomputer.hpp" /> + <Unit filename="src\net\netcomputer.h" /> <Unit filename="src\point.h" /> <Unit filename="src\protocol.h" /> <Unit filename="src\scripting\lua.cpp" /> <Unit filename="src\scripting\luascript.cpp" /> - <Unit filename="src\scripting\luascript.hpp" /> + <Unit filename="src\scripting\luascript.h" /> <Unit filename="src\scripting\luautil.cpp" /> - <Unit filename="src\scripting\luautil.hpp" /> + <Unit filename="src\scripting\luautil.h" /> <Unit filename="src\scripting\script.cpp" /> - <Unit filename="src\scripting\script.hpp" /> - <Unit filename="src\serialize\characterdata.hpp" /> + <Unit filename="src\scripting\script.h" /> + <Unit filename="src\serialize\characterdata.h" /> <Unit filename="src\utils\base64.cpp" /> <Unit filename="src\utils\base64.h" /> <Unit filename="src\utils\logger.cpp" /> @@ -183,23 +183,23 @@ <Unit filename="src\utils\mathutils.cpp" /> <Unit filename="src\utils\mathutils.h" /> <Unit filename="src\utils\processorutils.cpp" /> - <Unit filename="src\utils\processorutils.hpp" /> + <Unit filename="src\utils\processorutils.h" /> <Unit filename="src\utils\string.cpp" /> - <Unit filename="src\utils\string.hpp" /> + <Unit filename="src\utils\string.h" /> <Unit filename="src\utils\stringfilter.cpp" /> <Unit filename="src\utils\stringfilter.h" /> <Unit filename="src\utils\speedconv.cpp" /> - <Unit filename="src\utils\speedconv.hpp" /> + <Unit filename="src\utils\speedconv.h" /> <Unit filename="src\utils\timer.cpp" /> <Unit filename="src\utils\timer.h" /> <Unit filename="src\utils\tokencollector.cpp" /> - <Unit filename="src\utils\tokencollector.hpp" /> + <Unit filename="src\utils\tokencollector.h" /> <Unit filename="src\utils\tokendispenser.cpp" /> - <Unit filename="src\utils\tokendispenser.hpp" /> + <Unit filename="src\utils\tokendispenser.h" /> <Unit filename="src\utils\xml.cpp" /> - <Unit filename="src\utils\xml.hpp" /> + <Unit filename="src\utils\xml.h" /> <Unit filename="src\utils\zlib.cpp" /> - <Unit filename="src\utils\zlib.hpp" /> + <Unit filename="src\utils\zlib.h" /> <Extensions> <code_completion /> <debugger /> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ae56580..88cbf4b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -103,73 +103,73 @@ SET(SRCS defines.h protocol.h point.h - common/configuration.hpp + common/configuration.h common/configuration.cpp - common/inventorydata.hpp - common/resourcemanager.hpp + common/inventorydata.h + common/resourcemanager.h common/resourcemanager.cpp - net/bandwidth.hpp + net/bandwidth.h net/bandwidth.cpp - net/connection.hpp + net/connection.h net/connection.cpp - net/connectionhandler.hpp + net/connectionhandler.h net/connectionhandler.cpp - net/messagein.hpp + net/messagein.h net/messagein.cpp - net/messageout.hpp + net/messageout.h net/messageout.cpp - net/netcomputer.hpp + net/netcomputer.h net/netcomputer.cpp - serialize/characterdata.hpp + serialize/characterdata.h utils/logger.h utils/logger.cpp - utils/processorutils.hpp + utils/processorutils.h utils/processorutils.cpp - utils/string.hpp + utils/string.h utils/string.cpp utils/stringfilter.h utils/stringfilter.cpp utils/timer.h utils/timer.cpp - utils/tokencollector.hpp + utils/tokencollector.h utils/tokencollector.cpp - utils/tokendispenser.hpp + utils/tokendispenser.h utils/tokendispenser.cpp - utils/xml.hpp + utils/xml.h utils/xml.cpp ) SET(SRCS_MANASERVACCOUNT account-server/main-account.cpp - account-server/account.hpp + account-server/account.h account-server/account.cpp - account-server/accountclient.hpp + account-server/accountclient.h account-server/accountclient.cpp - account-server/accounthandler.hpp + account-server/accounthandler.h account-server/accounthandler.cpp - account-server/character.hpp + account-server/character.h account-server/character.cpp - account-server/serverhandler.hpp + account-server/serverhandler.h account-server/serverhandler.cpp - account-server/storage.hpp + account-server/storage.h account-server/storage.cpp - chat-server/chathandler.hpp + chat-server/chathandler.h chat-server/chathandler.cpp - chat-server/chatclient.hpp - chat-server/chatchannel.hpp + chat-server/chatclient.h + chat-server/chatchannel.h chat-server/chatchannel.cpp - chat-server/chatchannelmanager.hpp + chat-server/chatchannelmanager.h chat-server/chatchannelmanager.cpp - chat-server/guild.hpp + chat-server/guild.h chat-server/guild.cpp chat-server/guildhandler.cpp - chat-server/guildmanager.hpp + chat-server/guildmanager.h chat-server/guildmanager.cpp chat-server/party.cpp - chat-server/party.hpp + chat-server/party.h chat-server/partyhandler.cpp chat-server/post.cpp - chat-server/post.hpp + chat-server/post.h dal/dalexcept.h dal/dataprovider.h dal/dataprovider.cpp @@ -186,82 +186,82 @@ SET(SRCS_MANASERVACCOUNT SET(SRCS_MANASERVGAME game-server/main-game.cpp - common/permissionmanager.hpp + common/permissionmanager.h common/permissionmanager.cpp - game-server/accountconnection.hpp + game-server/accountconnection.h game-server/accountconnection.cpp - game-server/actor.hpp + game-server/actor.h game-server/actor.cpp - game-server/attribute.hpp + game-server/attribute.h game-server/attribute.cpp - game-server/attributemanager.hpp + game-server/attributemanager.h game-server/attributemanager.cpp - game-server/autoattack.hpp + game-server/autoattack.h game-server/autoattack.cpp - game-server/being.hpp + game-server/being.h game-server/being.cpp - game-server/buysell.hpp + game-server/buysell.h game-server/buysell.cpp - game-server/character.hpp + game-server/character.h game-server/character.cpp - game-server/collisiondetection.hpp + game-server/collisiondetection.h game-server/collisiondetection.cpp game-server/command.cpp game-server/commandhandler.cpp - game-server/commandhandler.hpp - game-server/effect.hpp + game-server/commandhandler.h + game-server/effect.h game-server/effect.cpp - game-server/eventlistener.hpp - game-server/gamehandler.hpp + game-server/eventlistener.h + game-server/gamehandler.h game-server/gamehandler.cpp - game-server/inventory.hpp + game-server/inventory.h game-server/inventory.cpp - game-server/item.hpp + game-server/item.h game-server/item.cpp - game-server/itemmanager.hpp + game-server/itemmanager.h game-server/itemmanager.cpp - game-server/map.hpp + game-server/map.h game-server/map.cpp - game-server/mapcomposite.hpp + game-server/mapcomposite.h game-server/mapcomposite.cpp - game-server/mapmanager.hpp + game-server/mapmanager.h game-server/mapmanager.cpp - game-server/mapreader.hpp + game-server/mapreader.h game-server/mapreader.cpp - game-server/monster.hpp + game-server/monster.h game-server/monster.cpp - game-server/monstermanager.hpp + game-server/monstermanager.h game-server/monstermanager.cpp - game-server/npc.hpp + game-server/npc.h game-server/npc.cpp - game-server/postman.hpp - game-server/quest.hpp + game-server/postman.h + game-server/quest.h game-server/quest.cpp - game-server/skillmanager.hpp + game-server/skillmanager.h game-server/skillmanager.cpp - game-server/spawnarea.hpp + game-server/spawnarea.h game-server/spawnarea.cpp - game-server/state.hpp + game-server/state.h game-server/state.cpp - game-server/statuseffect.hpp + game-server/statuseffect.h game-server/statuseffect.cpp - game-server/statusmanager.hpp + game-server/statusmanager.h game-server/statusmanager.cpp - game-server/thing.hpp + game-server/thing.h game-server/thing.cpp - game-server/trade.hpp + game-server/trade.h game-server/trade.cpp - game-server/trigger.hpp + game-server/trigger.h game-server/trigger.cpp - scripting/script.hpp + scripting/script.h scripting/script.cpp utils/base64.h utils/base64.cpp utils/mathutils.h utils/mathutils.cpp - utils/speedconv.hpp + utils/speedconv.h utils/speedconv.cpp - utils/zlib.hpp + utils/zlib.h utils/zlib.cpp ) @@ -292,9 +292,9 @@ IF (ENABLE_LUA) SET(SRCS_MANASERVGAME ${SRCS_MANASERVGAME} scripting/lua.cpp scripting/luascript.cpp - scripting/luascript.hpp + scripting/luascript.h scripting/luautil.cpp - scripting/luautil.hpp) + scripting/luautil.h) ENDIF() diff --git a/src/account-server/account.cpp b/src/account-server/account.cpp index af78606..58c1f6a 100644 --- a/src/account-server/account.cpp +++ b/src/account-server/account.cpp @@ -20,7 +20,7 @@ #include <cassert> -#include "account-server/account.hpp" +#include "account-server/account.h" Account::~Account() { diff --git a/src/account-server/account.hpp b/src/account-server/account.h index c42ea28..2847a03 100644 --- a/src/account-server/account.hpp +++ b/src/account-server/account.h @@ -25,7 +25,7 @@ #include <vector> #include <time.h> -#include "account-server/character.hpp" +#include "account-server/character.h" /** * A player's account. Stores the account information as well as the diff --git a/src/account-server/accountclient.cpp b/src/account-server/accountclient.cpp index 4eb1484..f8134ba 100644 --- a/src/account-server/accountclient.cpp +++ b/src/account-server/accountclient.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "account-server/accountclient.hpp" +#include "account-server/accountclient.h" AccountClient::AccountClient(ENetPeer *peer): NetComputer(peer), diff --git a/src/account-server/accountclient.hpp b/src/account-server/accountclient.h index 15acbd4..bdcc4b8 100644 --- a/src/account-server/accountclient.hpp +++ b/src/account-server/accountclient.h @@ -23,8 +23,8 @@ #include <enet/enet.h> -#include "account-server/account.hpp" -#include "net/netcomputer.hpp" +#include "account-server/account.h" +#include "net/netcomputer.h" class AccountHandler; diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp index d76a6b1..e50c817 100644 --- a/src/account-server/accounthandler.cpp +++ b/src/account-server/accounthandler.cpp @@ -18,31 +18,31 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "account-server/accounthandler.hpp" +#include "account-server/accounthandler.h" #include "protocol.h" #include "point.h" -#include "account-server/account.hpp" -#include "account-server/accountclient.hpp" -#include "account-server/character.hpp" -#include "account-server/storage.hpp" -#include "account-server/serverhandler.hpp" -#include "chat-server/chathandler.hpp" -#include "common/configuration.hpp" -#include "common/resourcemanager.hpp" -#include "common/transaction.hpp" -#include "net/connectionhandler.hpp" -#include "net/messagein.hpp" -#include "net/messageout.hpp" -#include "net/netcomputer.hpp" +#include "account-server/account.h" +#include "account-server/accountclient.h" +#include "account-server/character.h" +#include "account-server/storage.h" +#include "account-server/serverhandler.h" +#include "chat-server/chathandler.h" +#include "common/configuration.h" +#include "common/resourcemanager.h" +#include "common/transaction.h" +#include "net/connectionhandler.h" +#include "net/messagein.h" +#include "net/messageout.h" +#include "net/netcomputer.h" #include "utils/functors.h" #include "utils/logger.h" #include "utils/stringfilter.h" -#include "utils/tokencollector.hpp" -#include "utils/tokendispenser.hpp" +#include "utils/tokencollector.h" +#include "utils/tokendispenser.h" #include "utils/sha256.h" -#include "utils/string.hpp" -#include "utils/xml.hpp" +#include "utils/string.h" +#include "utils/xml.h" static void addUpdateHost(MessageOut *msg) { diff --git a/src/account-server/accounthandler.hpp b/src/account-server/accounthandler.h index f1ffcfe..f1ffcfe 100644 --- a/src/account-server/accounthandler.hpp +++ b/src/account-server/accounthandler.h diff --git a/src/account-server/character.cpp b/src/account-server/character.cpp index b691819..4879602 100644 --- a/src/account-server/character.cpp +++ b/src/account-server/character.cpp @@ -18,9 +18,9 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "account-server/character.hpp" +#include "account-server/character.h" -#include "account-server/account.hpp" +#include "account-server/account.h" Character::Character(const std::string &name, int id): mName(name), diff --git a/src/account-server/character.hpp b/src/account-server/character.h index f9114c7..e43b61a 100644 --- a/src/account-server/character.hpp +++ b/src/account-server/character.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CHARACTERDATA_HPP -#define CHARACTERDATA_HPP +#ifndef CHARACTERDATA_H +#define CHARACTERDATA_H #include <string> #include <vector> @@ -27,7 +27,7 @@ #include "defines.h" #include "point.h" -#include "common/inventorydata.hpp" +#include "common/inventorydata.h" class Account; class MessageIn; diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp index af6e99f..9516b4d 100644 --- a/src/account-server/main-account.cpp +++ b/src/account-server/main-account.cpp @@ -23,20 +23,20 @@ #include "../config.h" #endif -#include "account-server/accounthandler.hpp" -#include "account-server/serverhandler.hpp" -#include "account-server/storage.hpp" -#include "chat-server/chatchannelmanager.hpp" -#include "chat-server/chathandler.hpp" -#include "chat-server/guildmanager.hpp" -#include "chat-server/post.hpp" -#include "common/configuration.hpp" -#include "common/resourcemanager.hpp" -#include "net/bandwidth.hpp" -#include "net/connectionhandler.hpp" -#include "net/messageout.hpp" +#include "account-server/accounthandler.h" +#include "account-server/serverhandler.h" +#include "account-server/storage.h" +#include "chat-server/chatchannelmanager.h" +#include "chat-server/chathandler.h" +#include "chat-server/guildmanager.h" +#include "chat-server/post.h" +#include "common/configuration.h" +#include "common/resourcemanager.h" +#include "net/bandwidth.h" +#include "net/connectionhandler.h" +#include "net/messageout.h" #include "utils/logger.h" -#include "utils/processorutils.hpp" +#include "utils/processorutils.h" #include "utils/stringfilter.h" #include "utils/timer.h" #include "defines.h" diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp index 048e65b..2e47199 100644 --- a/src/account-server/serverhandler.cpp +++ b/src/account-server/serverhandler.cpp @@ -22,21 +22,21 @@ #include <sstream> #include <list> -#include "account-server/serverhandler.hpp" - -#include "account-server/accountclient.hpp" -#include "account-server/accounthandler.hpp" -#include "account-server/character.hpp" -#include "account-server/storage.hpp" -#include "chat-server/post.hpp" -#include "common/transaction.hpp" -#include "common/configuration.hpp" -#include "net/connectionhandler.hpp" -#include "net/messageout.hpp" -#include "net/netcomputer.hpp" -#include "serialize/characterdata.hpp" +#include "account-server/serverhandler.h" + +#include "account-server/accountclient.h" +#include "account-server/accounthandler.h" +#include "account-server/character.h" +#include "account-server/storage.h" +#include "chat-server/post.h" +#include "common/transaction.h" +#include "common/configuration.h" +#include "net/connectionhandler.h" +#include "net/messageout.h" +#include "net/netcomputer.h" +#include "serialize/characterdata.h" #include "utils/logger.h" -#include "utils/tokendispenser.hpp" +#include "utils/tokendispenser.h" #include "protocol.h" struct MapStatistics diff --git a/src/account-server/serverhandler.hpp b/src/account-server/serverhandler.h index 569ade1..5b9ba7f 100644 --- a/src/account-server/serverhandler.hpp +++ b/src/account-server/serverhandler.h @@ -24,7 +24,7 @@ #include <iosfwd> #include <string> -#include "net/messagein.hpp" +#include "net/messagein.h" class Character; diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp index e741875..feb5922 100644 --- a/src/account-server/storage.cpp +++ b/src/account-server/storage.cpp @@ -21,19 +21,19 @@ #include <cassert> #include <time.h> -#include "account-server/storage.hpp" +#include "account-server/storage.h" #include "point.h" -#include "account-server/account.hpp" -#include "chat-server/chatchannel.hpp" -#include "chat-server/guild.hpp" -#include "chat-server/post.hpp" -#include "common/configuration.hpp" +#include "account-server/account.h" +#include "chat-server/chatchannel.h" +#include "chat-server/guild.h" +#include "chat-server/post.h" +#include "common/configuration.h" #include "dal/dalexcept.h" #include "dal/dataproviderfactory.h" #include "utils/functors.h" #include "utils/logger.h" -#include "utils/xml.hpp" +#include "utils/xml.h" static const char *DEFAULT_ITEM_FILE = "items.xml"; diff --git a/src/account-server/storage.hpp b/src/account-server/storage.h index 27d1299..9dc8069 100644 --- a/src/account-server/storage.hpp +++ b/src/account-server/storage.h @@ -27,7 +27,7 @@ #include "dal/dataprovider.h" -#include "common/transaction.hpp" +#include "common/transaction.h" class Account; class Character; diff --git a/src/chat-server/chatchannel.cpp b/src/chat-server/chatchannel.cpp index 43ca1e9..52c9bf5 100644 --- a/src/chat-server/chatchannel.cpp +++ b/src/chat-server/chatchannel.cpp @@ -21,8 +21,8 @@ #include <algorithm> #include <sstream> -#include "chat-server/chatchannel.hpp" -#include "chat-server/chatclient.hpp" +#include "chat-server/chatchannel.h" +#include "chat-server/chatclient.h" ChatChannel::ChatChannel(int id, const std::string &name, diff --git a/src/chat-server/chatchannel.hpp b/src/chat-server/chatchannel.h index 66ffb5b..66ffb5b 100644 --- a/src/chat-server/chatchannel.hpp +++ b/src/chat-server/chatchannel.h diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp index a8a3df0..7d10f53 100644 --- a/src/chat-server/chatchannelmanager.cpp +++ b/src/chat-server/chatchannelmanager.cpp @@ -20,14 +20,14 @@ #include <list> -#include "chat-server/chatchannelmanager.hpp" +#include "chat-server/chatchannelmanager.h" #include "protocol.h" -#include "account-server/storage.hpp" -#include "chat-server/chatclient.hpp" -#include "chat-server/chathandler.hpp" -#include "chat-server/guildmanager.hpp" -#include "common/configuration.hpp" +#include "account-server/storage.h" +#include "chat-server/chatclient.h" +#include "chat-server/chathandler.h" +#include "chat-server/guildmanager.h" +#include "common/configuration.h" #include "utils/stringfilter.h" ChatChannelManager::ChatChannelManager() : mNextChannelId(1) diff --git a/src/chat-server/chatchannelmanager.hpp b/src/chat-server/chatchannelmanager.h index 739b428..b7f19ee 100644 --- a/src/chat-server/chatchannelmanager.hpp +++ b/src/chat-server/chatchannelmanager.h @@ -25,7 +25,7 @@ #include <map> #include <deque> -#include "chat-server/chatchannel.hpp" +#include "chat-server/chatchannel.h" /** * The chat channel manager takes care of registering and removing public and diff --git a/src/chat-server/chatclient.hpp b/src/chat-server/chatclient.h index fed18fb..daac0fc 100644 --- a/src/chat-server/chatclient.hpp +++ b/src/chat-server/chatclient.h @@ -25,7 +25,7 @@ #include <string> #include <vector> -#include "net/netcomputer.hpp" +#include "net/netcomputer.h" class ChatChannel; class Guild; diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp index 5740dff..9a87c0c 100644 --- a/src/chat-server/chathandler.cpp +++ b/src/chat-server/chathandler.cpp @@ -24,20 +24,20 @@ #include <sstream> #include "protocol.h" -#include "account-server/character.hpp" -#include "account-server/storage.hpp" -#include "chat-server/guildmanager.hpp" -#include "chat-server/chatchannelmanager.hpp" -#include "chat-server/chatclient.hpp" -#include "chat-server/chathandler.hpp" -#include "common/transaction.hpp" -#include "net/connectionhandler.hpp" -#include "net/messagein.hpp" -#include "net/messageout.hpp" -#include "net/netcomputer.hpp" +#include "account-server/character.h" +#include "account-server/storage.h" +#include "chat-server/guildmanager.h" +#include "chat-server/chatchannelmanager.h" +#include "chat-server/chatclient.h" +#include "chat-server/chathandler.h" +#include "common/transaction.h" +#include "net/connectionhandler.h" +#include "net/messagein.h" +#include "net/messageout.h" +#include "net/netcomputer.h" #include "utils/logger.h" #include "utils/stringfilter.h" -#include "utils/tokendispenser.hpp" +#include "utils/tokendispenser.h" void registerChatClient(const std::string &token, const std::string &name, diff --git a/src/chat-server/chathandler.hpp b/src/chat-server/chathandler.h index 1cd4306..c6b680e 100644 --- a/src/chat-server/chathandler.hpp +++ b/src/chat-server/chathandler.h @@ -25,8 +25,8 @@ #include <string> #include <vector> -#include "net/connectionhandler.hpp" -#include "utils/tokencollector.hpp" +#include "net/connectionhandler.h" +#include "utils/tokencollector.h" class ChatChannel; class ChatClient; diff --git a/src/chat-server/guild.cpp b/src/chat-server/guild.cpp index 3807b68..ba1fdae 100644 --- a/src/chat-server/guild.cpp +++ b/src/chat-server/guild.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "guild.hpp" +#include "guild.h" #include "defines.h" #include <algorithm> diff --git a/src/chat-server/guild.hpp b/src/chat-server/guild.h index e9207a3..e9207a3 100644 --- a/src/chat-server/guild.hpp +++ b/src/chat-server/guild.h diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp index 63d69b6..e697018 100644 --- a/src/chat-server/guildhandler.cpp +++ b/src/chat-server/guildhandler.cpp @@ -18,18 +18,18 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "chathandler.hpp" -#include "chatchannel.hpp" -#include "chatchannelmanager.hpp" -#include "chatclient.hpp" -#include "guild.hpp" -#include "guildmanager.hpp" - -#include "account-server/character.hpp" -#include "account-server/storage.hpp" - -#include "net/messagein.hpp" -#include "net/messageout.hpp" +#include "chathandler.h" +#include "chatchannel.h" +#include "chatchannelmanager.h" +#include "chatclient.h" +#include "guild.h" +#include "guildmanager.h" + +#include "account-server/character.h" +#include "account-server/storage.h" + +#include "net/messagein.h" +#include "net/messageout.h" #include "protocol.h" diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp index 81dd609..586878d 100644 --- a/src/chat-server/guildmanager.cpp +++ b/src/chat-server/guildmanager.cpp @@ -18,13 +18,13 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "guildmanager.hpp" -#include "guild.hpp" +#include "guildmanager.h" +#include "guild.h" #include "protocol.h" #include "defines.h" -#include "account-server/storage.hpp" -#include "chat-server/chatclient.hpp" -#include "chat-server/chathandler.hpp" +#include "account-server/storage.h" +#include "chat-server/chatclient.h" +#include "chat-server/chathandler.h" GuildManager::GuildManager() { diff --git a/src/chat-server/guildmanager.hpp b/src/chat-server/guildmanager.h index b236b75..b236b75 100644 --- a/src/chat-server/guildmanager.hpp +++ b/src/chat-server/guildmanager.h diff --git a/src/chat-server/party.cpp b/src/chat-server/party.cpp index e9f193b..0719e8f 100644 --- a/src/chat-server/party.cpp +++ b/src/chat-server/party.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "party.hpp" +#include "party.h" #include <algorithm> diff --git a/src/chat-server/party.hpp b/src/chat-server/party.h index 29bb7f2..29bb7f2 100644 --- a/src/chat-server/party.hpp +++ b/src/chat-server/party.h diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp index e3d8e09..3a9b845 100644 --- a/src/chat-server/partyhandler.cpp +++ b/src/chat-server/partyhandler.cpp @@ -18,15 +18,15 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "chathandler.hpp" -#include "chatclient.hpp" -#include "party.hpp" +#include "chathandler.h" +#include "chatclient.h" +#include "party.h" -#include "account-server/storage.hpp" -#include "account-server/serverhandler.hpp" +#include "account-server/storage.h" +#include "account-server/serverhandler.h" -#include "net/messagein.hpp" -#include "net/messageout.hpp" +#include "net/messagein.h" +#include "net/messageout.h" #include "protocol.h" diff --git a/src/chat-server/post.cpp b/src/chat-server/post.cpp index 456b09f..eff5ddb 100644 --- a/src/chat-server/post.cpp +++ b/src/chat-server/post.cpp @@ -18,15 +18,14 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "post.hpp" +#include "post.h" -#include "../account-server/character.hpp" -#include "../common/configuration.hpp" +#include "../account-server/character.h" +#include "../common/configuration.h" Letter::Letter(unsigned int type, Character *sender, Character *receiver) : mId(0), mType(type), mSender(sender), mReceiver(receiver) { - } Letter::~Letter() diff --git a/src/chat-server/post.hpp b/src/chat-server/post.h index 01ded79..1cb4072 100644 --- a/src/chat-server/post.hpp +++ b/src/chat-server/post.h @@ -25,7 +25,7 @@ #include <string> #include <vector> -#include "../common/inventorydata.hpp" +#include "../common/inventorydata.h" class Item; class Character; diff --git a/src/common/configuration.cpp b/src/common/configuration.cpp index a0e2ab2..6b79b85 100644 --- a/src/common/configuration.cpp +++ b/src/common/configuration.cpp @@ -23,11 +23,11 @@ #include <map> #include <libxml/xmlreader.h> -#include "common/configuration.hpp" +#include "common/configuration.h" #include "utils/logger.h" -#include "utils/xml.hpp" -#include "utils/string.hpp" +#include "utils/xml.h" +#include "utils/string.h" /**< Persistent configuration. */ static std::map< std::string, std::string > options; diff --git a/src/common/configuration.hpp b/src/common/configuration.h index dbb0a7d..dbb0a7d 100644 --- a/src/common/configuration.hpp +++ b/src/common/configuration.h diff --git a/src/common/inventorydata.hpp b/src/common/inventorydata.h index cf7ba1b..4d5336a 100644 --- a/src/common/inventorydata.hpp +++ b/src/common/inventorydata.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef COMMON_INVENTORYDATA_HPP -#define COMMON_INVENTORYDATA_HPP +#ifndef COMMON_INVENTORYDATA_H +#define COMMON_INVENTORYDATA_H #include <vector> #include <map> diff --git a/src/common/permissionmanager.cpp b/src/common/permissionmanager.cpp index 8483e42..a2c67cd 100644 --- a/src/common/permissionmanager.cpp +++ b/src/common/permissionmanager.cpp @@ -18,12 +18,12 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "common/permissionmanager.hpp" +#include "common/permissionmanager.h" -#include "common/resourcemanager.hpp" -#include "game-server/character.hpp" +#include "common/resourcemanager.h" +#include "game-server/character.h" #include "utils/logger.h" -#include "utils/xml.hpp" +#include "utils/xml.h" #include <string.h> #include <cstring> diff --git a/src/common/permissionmanager.hpp b/src/common/permissionmanager.h index 5ef951b..bf36f65 100644 --- a/src/common/permissionmanager.hpp +++ b/src/common/permissionmanager.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PERMISSIONMANAGER_HPP -#define PERMISSIONMANAGER_HPP +#ifndef PERMISSIONMANAGER_H +#define PERMISSIONMANAGER_H #include <list> #include <map> @@ -68,4 +68,4 @@ namespace PermissionManager } // namespace PermissionManager -#endif // PERMISSIONMANAGER_HPP +#endif // PERMISSIONMANAGER_H diff --git a/src/common/resourcemanager.cpp b/src/common/resourcemanager.cpp index 9c52a8e..b32c6ff 100644 --- a/src/common/resourcemanager.cpp +++ b/src/common/resourcemanager.cpp @@ -18,9 +18,9 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "common/resourcemanager.hpp" +#include "common/resourcemanager.h" -#include "common/configuration.hpp" +#include "common/configuration.h" #include "utils/logger.h" diff --git a/src/common/resourcemanager.hpp b/src/common/resourcemanager.h index 3d722a4..3d722a4 100644 --- a/src/common/resourcemanager.hpp +++ b/src/common/resourcemanager.h diff --git a/src/common/transaction.hpp b/src/common/transaction.h index 2715176..2715176 100644 --- a/src/common/transaction.hpp +++ b/src/common/transaction.h diff --git a/src/dal/mysqldataprovider.h b/src/dal/mysqldataprovider.h index 528d4be..02fc8ea 100644 --- a/src/dal/mysqldataprovider.h +++ b/src/dal/mysqldataprovider.h @@ -31,7 +31,7 @@ #include <climits> #include "dataprovider.h" -#include "common/configuration.hpp" +#include "common/configuration.h" #include "utils/logger.h" namespace dal diff --git a/src/dal/sqlitedataprovider.h b/src/dal/sqlitedataprovider.h index 40ef361..3941364 100644 --- a/src/dal/sqlitedataprovider.h +++ b/src/dal/sqlitedataprovider.h @@ -24,7 +24,7 @@ #include <iosfwd> #include "limits.h" #include <sqlite3.h> -#include "common/configuration.hpp" +#include "common/configuration.h" // sqlite3_int64 is the preferred new datatype for 64-bit int values. diff --git a/src/game-server/accountconnection.cpp b/src/game-server/accountconnection.cpp index 3c3cd88..72546fb 100644 --- a/src/game-server/accountconnection.cpp +++ b/src/game-server/accountconnection.cpp @@ -18,23 +18,23 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/accountconnection.hpp" - -#include "common/configuration.hpp" -#include "game-server/character.hpp" -#include "game-server/gamehandler.hpp" -#include "game-server/map.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/mapmanager.hpp" -#include "game-server/itemmanager.hpp" -#include "game-server/postman.hpp" -#include "game-server/quest.hpp" -#include "game-server/state.hpp" -#include "net/messagein.hpp" -#include "serialize/characterdata.hpp" +#include "game-server/accountconnection.h" + +#include "common/configuration.h" +#include "game-server/character.h" +#include "game-server/gamehandler.h" +#include "game-server/map.h" +#include "game-server/mapcomposite.h" +#include "game-server/mapmanager.h" +#include "game-server/itemmanager.h" +#include "game-server/postman.h" +#include "game-server/quest.h" +#include "game-server/state.h" +#include "net/messagein.h" +#include "serialize/characterdata.h" #include "utils/logger.h" -#include "utils/tokendispenser.hpp" -#include "utils/tokencollector.hpp" +#include "utils/tokendispenser.h" +#include "utils/tokencollector.h" AccountConnection::AccountConnection(): mSyncBuffer(0) diff --git a/src/game-server/accountconnection.hpp b/src/game-server/accountconnection.h index 28599f8..c0bbc5c 100644 --- a/src/game-server/accountconnection.hpp +++ b/src/game-server/accountconnection.h @@ -21,8 +21,8 @@ #ifndef ACCOUNTCONNECTION_H #define ACCOUNTCONNECTION_H -#include "net/messageout.hpp" -#include "net/connection.hpp" +#include "net/messageout.h" +#include "net/connection.h" class Character; diff --git a/src/game-server/actor.cpp b/src/game-server/actor.cpp index 8c18322..b9f4504 100644 --- a/src/game-server/actor.cpp +++ b/src/game-server/actor.cpp @@ -18,10 +18,10 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/actor.hpp" +#include "game-server/actor.h" -#include "game-server/map.hpp" -#include "game-server/mapcomposite.hpp" +#include "game-server/map.h" +#include "game-server/mapcomposite.h" #include <cassert> diff --git a/src/game-server/actor.hpp b/src/game-server/actor.h index de1e30a..483cb78 100644 --- a/src/game-server/actor.hpp +++ b/src/game-server/actor.h @@ -22,8 +22,8 @@ #define ACTOR_H #include "point.h" -#include "game-server/map.hpp" -#include "game-server/thing.hpp" +#include "game-server/map.h" +#include "game-server/thing.h" /** * Flags that are raised as necessary. They trigger messages that are sent to diff --git a/src/game-server/attribute.cpp b/src/game-server/attribute.cpp index c7bc43d..e5ca1b6 100644 --- a/src/game-server/attribute.cpp +++ b/src/game-server/attribute.cpp @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "attribute.hpp" -#include "game-server/being.hpp" +#include "attribute.h" +#include "game-server/being.h" #include "utils/logger.h" #include <cassert> diff --git a/src/game-server/attribute.hpp b/src/game-server/attribute.h index e0696a4..c2b8bcf 100644 --- a/src/game-server/attribute.hpp +++ b/src/game-server/attribute.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ATTRIBUTE_HPP -#define ATTRIBUTE_HPP +#ifndef ATTRIBUTE_H +#define ATTRIBUTE_H #include "defines.h" #include <vector> @@ -181,4 +181,4 @@ class Attribute std::vector< AttributeModifiersEffect * > mMods; }; -#endif // ATTRIBUTE_HPP +#endif // ATTRIBUTE_H diff --git a/src/game-server/attributemanager.cpp b/src/game-server/attributemanager.cpp index 3c9fab2..d590a95 100644 --- a/src/game-server/attributemanager.cpp +++ b/src/game-server/attributemanager.cpp @@ -18,12 +18,12 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/attributemanager.hpp" +#include "game-server/attributemanager.h" -#include "common/resourcemanager.hpp" -#include "utils/string.hpp" +#include "common/resourcemanager.h" +#include "utils/string.h" #include "utils/logger.h" -#include "utils/xml.hpp" +#include "utils/xml.h" #include "defines.h" void AttributeManager::initialize() diff --git a/src/game-server/attributemanager.hpp b/src/game-server/attributemanager.h index c5f1d87..a87ba90 100644 --- a/src/game-server/attributemanager.hpp +++ b/src/game-server/attributemanager.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ATTRIBUTEMANAGER_HPP -#define ATTRIBUTEMANAGER_HPP +#ifndef ATTRIBUTEMANAGER_H +#define ATTRIBUTEMANAGER_H #include <map> #include <vector> @@ -80,4 +80,4 @@ class AttributeManager extern AttributeManager *attributeManager; -#endif // ATTRIBUTEMANAGER_HPP +#endif // ATTRIBUTEMANAGER_H diff --git a/src/game-server/autoattack.cpp b/src/game-server/autoattack.cpp index dae6b0f..b8c8a16 100644 --- a/src/game-server/autoattack.cpp +++ b/src/game-server/autoattack.cpp @@ -1,4 +1,24 @@ -#include "autoattack.hpp" +/* + * The Mana Server + * Copyright (C) 2010 The Mana Development Team + * + * This file is part of The Mana Server. + * + * The Mana Server is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana Server is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "autoattack.h" void AutoAttacks::add(AutoAttack n) { diff --git a/src/game-server/autoattack.hpp b/src/game-server/autoattack.h index a931d92..8be5c60 100644 --- a/src/game-server/autoattack.hpp +++ b/src/game-server/autoattack.h @@ -1,5 +1,25 @@ -#ifndef AUTOATTACK_HPP -#define AUTOATTACK_HPP +/* + * The Mana Server + * Copyright (C) 2010 The Mana Development Team + * + * This file is part of The Mana Server. + * + * The Mana Server is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana Server is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef AUTOATTACK_H +#define AUTOATTACK_H #include <list> #include <limits> @@ -97,4 +117,4 @@ class AutoAttacks }; -#endif // AUTOATTACK_HPP +#endif // AUTOATTACK_H diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp index 6533869..bbd7b4c 100644 --- a/src/game-server/being.cpp +++ b/src/game-server/being.cpp @@ -20,20 +20,20 @@ #include <cassert> -#include "game-server/being.hpp" +#include "game-server/being.h" #include "defines.h" -#include "common/configuration.hpp" -#include "game-server/attributemanager.hpp" -#include "game-server/character.hpp" -#include "game-server/collisiondetection.hpp" -#include "game-server/eventlistener.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/effect.hpp" -#include "game-server/statuseffect.hpp" -#include "game-server/statusmanager.hpp" +#include "common/configuration.h" +#include "game-server/attributemanager.h" +#include "game-server/character.h" +#include "game-server/collisiondetection.h" +#include "game-server/eventlistener.h" +#include "game-server/mapcomposite.h" +#include "game-server/effect.h" +#include "game-server/statuseffect.h" +#include "game-server/statusmanager.h" #include "utils/logger.h" -#include "utils/speedconv.hpp" +#include "utils/speedconv.h" Being::Being(ThingType type): Actor(type), diff --git a/src/game-server/being.hpp b/src/game-server/being.h index 4506cfe..375220c 100644 --- a/src/game-server/being.hpp +++ b/src/game-server/being.h @@ -27,9 +27,9 @@ #include <map> #include "limits.h" -#include "game-server/actor.hpp" -#include "game-server/attribute.hpp" -#include "game-server/autoattack.hpp" +#include "game-server/actor.h" +#include "game-server/attribute.h" +#include "game-server/autoattack.h" class Being; class MapComposite; diff --git a/src/game-server/buysell.cpp b/src/game-server/buysell.cpp index a6f68e1..b3abb3e 100644 --- a/src/game-server/buysell.cpp +++ b/src/game-server/buysell.cpp @@ -18,14 +18,14 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/buysell.hpp" +#include "game-server/buysell.h" -#include "game-server/character.hpp" -#include "game-server/gamehandler.hpp" -#include "game-server/inventory.hpp" -#include "game-server/itemmanager.hpp" -#include "game-server/item.hpp" -#include "net/messageout.hpp" +#include "game-server/character.h" +#include "game-server/gamehandler.h" +#include "game-server/inventory.h" +#include "game-server/itemmanager.h" +#include "game-server/item.h" +#include "net/messageout.h" #include "defines.h" diff --git a/src/game-server/buysell.hpp b/src/game-server/buysell.h index a9903bc..506dc8a 100644 --- a/src/game-server/buysell.hpp +++ b/src/game-server/buysell.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GAMESERVER_BUYSELL_HPP -#define GAMESERVER_BUYSELL_HPP +#ifndef GAMESERVER_BUYSELL_H +#define GAMESERVER_BUYSELL_H #include <vector> diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp index 91fcf46..49ceceb 100644 --- a/src/game-server/character.cpp +++ b/src/game-server/character.cpp @@ -23,25 +23,25 @@ #include <cmath> #include <limits.h> -#include "game-server/character.hpp" - -#include "common/configuration.hpp" -#include "game-server/accountconnection.hpp" -#include "game-server/attributemanager.hpp" -#include "game-server/buysell.hpp" -#include "game-server/eventlistener.hpp" -#include "game-server/inventory.hpp" -#include "game-server/item.hpp" -#include "game-server/itemmanager.hpp" -#include "game-server/gamehandler.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/mapmanager.hpp" -#include "game-server/state.hpp" -#include "game-server/trade.hpp" -#include "scripting/script.hpp" -#include "net/messagein.hpp" -#include "net/messageout.hpp" -#include "serialize/characterdata.hpp" +#include "game-server/character.h" + +#include "common/configuration.h" +#include "game-server/accountconnection.h" +#include "game-server/attributemanager.h" +#include "game-server/buysell.h" +#include "game-server/eventlistener.h" +#include "game-server/inventory.h" +#include "game-server/item.h" +#include "game-server/itemmanager.h" +#include "game-server/gamehandler.h" +#include "game-server/mapcomposite.h" +#include "game-server/mapmanager.h" +#include "game-server/state.h" +#include "game-server/trade.h" +#include "scripting/script.h" +#include "net/messagein.h" +#include "net/messageout.h" +#include "serialize/characterdata.h" #include "utils/logger.h" diff --git a/src/game-server/character.hpp b/src/game-server/character.h index ed41c2b..dc12099 100644 --- a/src/game-server/character.hpp +++ b/src/game-server/character.h @@ -18,15 +18,15 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CHARACTER_HPP -#define CHARACTER_HPP +#ifndef CHARACTER_H +#define CHARACTER_H #include <map> #include <string> #include <vector> -#include "common/inventorydata.hpp" -#include "game-server/being.hpp" +#include "common/inventorydata.h" +#include "game-server/being.h" #include "protocol.h" #include "defines.h" #include "utils/logger.h" @@ -464,4 +464,4 @@ class Character : public Being friend void serializeCharacterData(const T &data, MessageOut &msg); }; -#endif // CHARACTER_HPP +#endif // CHARACTER_H diff --git a/src/game-server/collisiondetection.cpp b/src/game-server/collisiondetection.cpp index 8716baa..55e40d6 100644 --- a/src/game-server/collisiondetection.cpp +++ b/src/game-server/collisiondetection.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/collisiondetection.hpp" +#include "game-server/collisiondetection.h" #include <cmath> diff --git a/src/game-server/collisiondetection.hpp b/src/game-server/collisiondetection.h index 36a5bc2..36a5bc2 100644 --- a/src/game-server/collisiondetection.hpp +++ b/src/game-server/collisiondetection.h diff --git a/src/game-server/command.cpp b/src/game-server/command.cpp index b421c67..d47bb88 100644 --- a/src/game-server/command.cpp +++ b/src/game-server/command.cpp @@ -20,16 +20,16 @@ #include <cstddef> -#include "game-server/accountconnection.hpp" -#include "game-server/character.hpp" -#include "game-server/gamehandler.hpp" -#include "game-server/inventory.hpp" -#include "game-server/item.hpp" -#include "game-server/itemmanager.hpp" -#include "game-server/mapmanager.hpp" -#include "game-server/monster.hpp" -#include "game-server/monstermanager.hpp" -#include "game-server/state.hpp" +#include "game-server/accountconnection.h" +#include "game-server/character.h" +#include "game-server/gamehandler.h" +#include "game-server/inventory.h" +#include "game-server/item.h" +#include "game-server/itemmanager.h" +#include "game-server/mapmanager.h" +#include "game-server/monster.h" +#include "game-server/monstermanager.h" +#include "game-server/state.h" template< typename T > static T proxy_cast(intptr_t v) diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp index 0e6dad6..b1d965b 100644 --- a/src/game-server/commandhandler.cpp +++ b/src/game-server/commandhandler.cpp @@ -20,23 +20,23 @@ #include <sstream> -#include "game-server/commandhandler.hpp" -#include "game-server/accountconnection.hpp" -#include "game-server/character.hpp" -#include "game-server/gamehandler.hpp" -#include "game-server/inventory.hpp" -#include "game-server/item.hpp" -#include "game-server/itemmanager.hpp" -#include "game-server/mapmanager.hpp" -#include "game-server/monster.hpp" -#include "game-server/monstermanager.hpp" -#include "game-server/state.hpp" - -#include "common/configuration.hpp" -#include "common/permissionmanager.hpp" -#include "common/transaction.hpp" - -#include "utils/string.hpp" +#include "game-server/commandhandler.h" +#include "game-server/accountconnection.h" +#include "game-server/character.h" +#include "game-server/gamehandler.h" +#include "game-server/inventory.h" +#include "game-server/item.h" +#include "game-server/itemmanager.h" +#include "game-server/mapmanager.h" +#include "game-server/monster.h" +#include "game-server/monstermanager.h" +#include "game-server/state.h" + +#include "common/configuration.h" +#include "common/permissionmanager.h" +#include "common/transaction.h" + +#include "utils/string.h" struct CmdRef { diff --git a/src/game-server/commandhandler.hpp b/src/game-server/commandhandler.h index 156cec1..5327dda 100644 --- a/src/game-server/commandhandler.hpp +++ b/src/game-server/commandhandler.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SERVER_COMMANDHANDLER_HPP -#define SERVER_COMMANDHANDLER_HPP +#ifndef SERVER_COMMANDHANDLER_H +#define SERVER_COMMANDHANDLER_H #include <string> diff --git a/src/game-server/effect.cpp b/src/game-server/effect.cpp index d00ae5b..b7c6c64 100644 --- a/src/game-server/effect.cpp +++ b/src/game-server/effect.cpp @@ -18,10 +18,10 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/effect.hpp" +#include "game-server/effect.h" -#include "game-server/mapcomposite.hpp" -#include "game-server/state.hpp" +#include "game-server/mapcomposite.h" +#include "game-server/state.h" void Effect::update() { diff --git a/src/game-server/effect.hpp b/src/game-server/effect.h index b1341ff..2e22d46 100644 --- a/src/game-server/effect.hpp +++ b/src/game-server/effect.h @@ -21,8 +21,8 @@ #ifndef EFFECT_H #define EFFECT_H -#include "game-server/actor.hpp" -#include "game-server/being.hpp" +#include "game-server/actor.h" +#include "game-server/being.h" class Effect : public Actor { diff --git a/src/game-server/eventlistener.hpp b/src/game-server/eventlistener.h index b66021f..87dac1d 100644 --- a/src/game-server/eventlistener.hpp +++ b/src/game-server/eventlistener.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GAMESERVER_EVENTLISTENER_HPP -#define GAMESERVER_EVENTLISTENER_HPP +#ifndef GAMESERVER_EVENTLISTENER_H +#define GAMESERVER_EVENTLISTENER_H class Thing; class Being; diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp index 5c7ba34..f761abc 100644 --- a/src/game-server/gamehandler.cpp +++ b/src/game-server/gamehandler.cpp @@ -21,26 +21,26 @@ #include <cassert> #include <map> -#include "game-server/gamehandler.hpp" - -#include "common/transaction.hpp" -#include "game-server/accountconnection.hpp" -#include "game-server/buysell.hpp" -#include "game-server/commandhandler.hpp" -#include "game-server/inventory.hpp" -#include "game-server/item.hpp" -#include "game-server/itemmanager.hpp" -#include "game-server/map.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/npc.hpp" -#include "game-server/postman.hpp" -#include "game-server/state.hpp" -#include "game-server/trade.hpp" -#include "net/messagein.hpp" -#include "net/messageout.hpp" -#include "net/netcomputer.hpp" +#include "game-server/gamehandler.h" + +#include "common/transaction.h" +#include "game-server/accountconnection.h" +#include "game-server/buysell.h" +#include "game-server/commandhandler.h" +#include "game-server/inventory.h" +#include "game-server/item.h" +#include "game-server/itemmanager.h" +#include "game-server/map.h" +#include "game-server/mapcomposite.h" +#include "game-server/npc.h" +#include "game-server/postman.h" +#include "game-server/state.h" +#include "game-server/trade.h" +#include "net/messagein.h" +#include "net/messageout.h" +#include "net/netcomputer.h" #include "utils/logger.h" -#include "utils/tokendispenser.hpp" +#include "utils/tokendispenser.h" const unsigned int TILES_TO_BE_NEAR = 7; @@ -135,7 +135,7 @@ static Actor *findActorNear(Actor *p, int id) { MapComposite *map = p->getMap(); const Point &ppos = p->getPosition(); - // See map.hpp for tiles constants + // See map.h for tiles constants const int pixelDist = DEFAULT_TILE_WIDTH * TILES_TO_BE_NEAR; for (ActorIterator i(map->getAroundPointIterator(ppos, pixelDist)); i; ++i) { @@ -151,7 +151,7 @@ static Character *findCharacterNear(Actor *p, int id) { MapComposite *map = p->getMap(); const Point &ppos = p->getPosition(); - // See map.hpp for tiles constants + // See map.h for tiles constants const int pixelDist = DEFAULT_TILE_WIDTH * TILES_TO_BE_NEAR; for (CharacterIterator i(map->getAroundPointIterator(ppos, pixelDist)); i; ++i) diff --git a/src/game-server/gamehandler.hpp b/src/game-server/gamehandler.h index 00e2912..5a2630d 100644 --- a/src/game-server/gamehandler.hpp +++ b/src/game-server/gamehandler.h @@ -18,13 +18,13 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SERVER_GAMEHANDLER_HPP -#define SERVER_GAMEHANDLER_HPP +#ifndef SERVER_GAMEHANDLER_H +#define SERVER_GAMEHANDLER_H -#include "game-server/character.hpp" -#include "net/connectionhandler.hpp" -#include "net/netcomputer.hpp" -#include "utils/tokencollector.hpp" +#include "game-server/character.h" +#include "net/connectionhandler.h" +#include "net/netcomputer.h" +#include "utils/tokencollector.h" enum { diff --git a/src/game-server/inventory.cpp b/src/game-server/inventory.cpp index b29f08d..b74c727 100644 --- a/src/game-server/inventory.cpp +++ b/src/game-server/inventory.cpp @@ -21,11 +21,11 @@ #include <algorithm> #include <cassert> -#include "game-server/gamehandler.hpp" -#include "game-server/inventory.hpp" -#include "game-server/item.hpp" -#include "game-server/itemmanager.hpp" -#include "net/messageout.hpp" +#include "game-server/gamehandler.h" +#include "game-server/inventory.h" +#include "game-server/item.h" +#include "game-server/itemmanager.h" +#include "net/messageout.h" #include "utils/logger.h" // TODO: diff --git a/src/game-server/inventory.hpp b/src/game-server/inventory.h index f2168c2..bd9da5c 100644 --- a/src/game-server/inventory.hpp +++ b/src/game-server/inventory.h @@ -21,8 +21,8 @@ #ifndef INVENTORY_H #define INVENTORY_H -#include "game-server/character.hpp" -#include "net/messageout.hpp" +#include "game-server/character.h" +#include "net/messageout.h" /*enum { diff --git a/src/game-server/item.cpp b/src/game-server/item.cpp index a2b481d..02c6a51 100644 --- a/src/game-server/item.cpp +++ b/src/game-server/item.cpp @@ -22,14 +22,14 @@ #include <string> #include <map> -#include "game-server/item.hpp" - -#include "common/configuration.hpp" -#include "game-server/autoattack.hpp" -#include "game-server/attributemanager.hpp" -#include "game-server/being.hpp" -#include "game-server/state.hpp" -#include "scripting/script.hpp" +#include "game-server/item.h" + +#include "common/configuration.h" +#include "game-server/autoattack.h" +#include "game-server/attributemanager.h" +#include "game-server/being.h" +#include "game-server/state.h" +#include "scripting/script.h" bool ItemEffectInfo::apply(Being *itemUser) { diff --git a/src/game-server/item.hpp b/src/game-server/item.h index 2c3f922..215b738 100644 --- a/src/game-server/item.hpp +++ b/src/game-server/item.h @@ -18,12 +18,12 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ITEM_HPP -#define ITEM_HPP +#ifndef ITEM_H +#define ITEM_H #include <vector> -#include "game-server/actor.hpp" +#include "game-server/actor.h" class Being; diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp index 34a6170..72f8acf 100644 --- a/src/game-server/itemmanager.cpp +++ b/src/game-server/itemmanager.cpp @@ -18,16 +18,16 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/itemmanager.hpp" +#include "game-server/itemmanager.h" #include "defines.h" -#include "common/resourcemanager.hpp" -#include "game-server/attributemanager.hpp" -#include "game-server/item.hpp" -#include "game-server/skillmanager.hpp" -#include "scripting/script.hpp" +#include "common/resourcemanager.h" +#include "game-server/attributemanager.h" +#include "game-server/item.h" +#include "game-server/skillmanager.h" +#include "scripting/script.h" #include "utils/logger.h" -#include "utils/xml.hpp" +#include "utils/xml.h" #include <map> #include <set> diff --git a/src/game-server/itemmanager.hpp b/src/game-server/itemmanager.h index ea0641c..ea0641c 100644 --- a/src/game-server/itemmanager.hpp +++ b/src/game-server/itemmanager.h diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp index cc968c1..084415b 100644 --- a/src/game-server/main-game.cpp +++ b/src/game-server/main-game.cpp @@ -36,25 +36,25 @@ #include "../config.h" #endif -#include "common/configuration.hpp" -#include "common/permissionmanager.hpp" -#include "common/resourcemanager.hpp" -#include "game-server/accountconnection.hpp" -#include "game-server/attributemanager.hpp" -#include "game-server/gamehandler.hpp" -#include "game-server/skillmanager.hpp" -#include "game-server/itemmanager.hpp" -#include "game-server/mapmanager.hpp" -#include "game-server/monstermanager.hpp" -#include "game-server/statusmanager.hpp" -#include "game-server/postman.hpp" -#include "game-server/state.hpp" -#include "net/bandwidth.hpp" -#include "net/connectionhandler.hpp" -#include "net/messageout.hpp" -#include "scripting/luascript.hpp" +#include "common/configuration.h" +#include "common/permissionmanager.h" +#include "common/resourcemanager.h" +#include "game-server/accountconnection.h" +#include "game-server/attributemanager.h" +#include "game-server/gamehandler.h" +#include "game-server/skillmanager.h" +#include "game-server/itemmanager.h" +#include "game-server/mapmanager.h" +#include "game-server/monstermanager.h" +#include "game-server/statusmanager.h" +#include "game-server/postman.h" +#include "game-server/state.h" +#include "net/bandwidth.h" +#include "net/connectionhandler.h" +#include "net/messageout.h" +#include "scripting/luascript.h" #include "utils/logger.h" -#include "utils/processorutils.hpp" +#include "utils/processorutils.h" #include "utils/stringfilter.h" #include "utils/timer.h" #include "utils/mathutils.h" diff --git a/src/game-server/map.cpp b/src/game-server/map.cpp index e5af1c3..1464402 100644 --- a/src/game-server/map.cpp +++ b/src/game-server/map.cpp @@ -23,7 +23,7 @@ #include <cassert> #include <cstring> -#include "game-server/map.hpp" +#include "game-server/map.h" // Basic cost for moving from one tile to another. // Used in findPath() function when computing the A* path algorithm. diff --git a/src/game-server/map.hpp b/src/game-server/map.h index fab5baa..fab5baa 100644 --- a/src/game-server/map.hpp +++ b/src/game-server/map.h diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index 30d31bc..b5a950b 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -22,11 +22,11 @@ #include <cassert> #include "point.h" -#include "common/configuration.hpp" -#include "game-server/map.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/character.hpp" -#include "scripting/script.hpp" +#include "common/configuration.h" +#include "game-server/map.h" +#include "game-server/mapcomposite.h" +#include "game-server/character.h" +#include "scripting/script.h" #include "utils/logger.h" /* TODO: Implement overlapping map zones instead of strict partitioning. diff --git a/src/game-server/mapcomposite.hpp b/src/game-server/mapcomposite.h index 0f45d8a..3de83c7 100644 --- a/src/game-server/mapcomposite.hpp +++ b/src/game-server/mapcomposite.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SERVER_MAPCOMPOSITE_HPP -#define SERVER_MAPCOMPOSITE_HPP +#ifndef SERVER_MAPCOMPOSITE_H +#define SERVER_MAPCOMPOSITE_H #include <string> #include <vector> diff --git a/src/game-server/mapmanager.cpp b/src/game-server/mapmanager.cpp index ab9b2dc..fce5cc5 100644 --- a/src/game-server/mapmanager.cpp +++ b/src/game-server/mapmanager.cpp @@ -18,14 +18,14 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/mapmanager.hpp" +#include "game-server/mapmanager.h" -#include "common/resourcemanager.hpp" -#include "game-server/map.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/mapreader.hpp" +#include "common/resourcemanager.h" +#include "game-server/map.h" +#include "game-server/mapcomposite.h" +#include "game-server/mapreader.h" #include "utils/logger.h" -#include "utils/xml.hpp" +#include "utils/xml.h" #include <cassert> diff --git a/src/game-server/mapmanager.hpp b/src/game-server/mapmanager.h index d21bd41..d21bd41 100644 --- a/src/game-server/mapmanager.hpp +++ b/src/game-server/mapmanager.h diff --git a/src/game-server/mapreader.cpp b/src/game-server/mapreader.cpp index 52dd08b..a950d44 100644 --- a/src/game-server/mapreader.cpp +++ b/src/game-server/mapreader.cpp @@ -18,21 +18,21 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/mapreader.hpp" - -#include "common/resourcemanager.hpp" -#include "game-server/map.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/mapmanager.hpp" -#include "game-server/monstermanager.hpp" -#include "game-server/spawnarea.hpp" -#include "game-server/trigger.hpp" -#include "scripting/script.hpp" +#include "game-server/mapreader.h" + +#include "common/resourcemanager.h" +#include "game-server/map.h" +#include "game-server/mapcomposite.h" +#include "game-server/mapmanager.h" +#include "game-server/monstermanager.h" +#include "game-server/spawnarea.h" +#include "game-server/trigger.h" +#include "scripting/script.h" #include "utils/base64.h" #include "utils/logger.h" -#include "utils/xml.hpp" -#include "utils/zlib.hpp" -#include "utils/string.hpp" +#include "utils/xml.h" +#include "utils/zlib.h" +#include "utils/string.h" #include <cstring> diff --git a/src/game-server/mapreader.hpp b/src/game-server/mapreader.h index f4a0e5f..f4a0e5f 100644 --- a/src/game-server/mapreader.hpp +++ b/src/game-server/mapreader.h diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp index 56391aa..611fcea 100644 --- a/src/game-server/monster.cpp +++ b/src/game-server/monster.cpp @@ -18,19 +18,19 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/monster.hpp" - -#include "common/configuration.hpp" -#include "common/resourcemanager.hpp" -#include "game-server/attributemanager.hpp" -#include "game-server/character.hpp" -#include "game-server/collisiondetection.hpp" -#include "game-server/item.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/state.hpp" -#include "scripting/script.hpp" +#include "game-server/monster.h" + +#include "common/configuration.h" +#include "common/resourcemanager.h" +#include "game-server/attributemanager.h" +#include "game-server/character.h" +#include "game-server/collisiondetection.h" +#include "game-server/item.h" +#include "game-server/mapcomposite.h" +#include "game-server/state.h" +#include "scripting/script.h" #include "utils/logger.h" -#include "utils/speedconv.hpp" +#include "utils/speedconv.h" #include <cmath> diff --git a/src/game-server/monster.hpp b/src/game-server/monster.h index 2c4d59e..0028920 100644 --- a/src/game-server/monster.hpp +++ b/src/game-server/monster.h @@ -25,8 +25,8 @@ #include <vector> #include <string> -#include "game-server/being.hpp" -#include "game-server/eventlistener.hpp" +#include "game-server/being.h" +#include "game-server/eventlistener.h" #include "defines.h" class ItemClass; diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp index 1444e17..0ad48f7 100644 --- a/src/game-server/monstermanager.cpp +++ b/src/game-server/monstermanager.cpp @@ -18,14 +18,14 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/monstermanager.hpp" +#include "game-server/monstermanager.h" -#include "common/resourcemanager.hpp" -#include "game-server/attributemanager.hpp" -#include "game-server/itemmanager.hpp" -#include "game-server/monster.hpp" +#include "common/resourcemanager.h" +#include "game-server/attributemanager.h" +#include "game-server/itemmanager.h" +#include "game-server/monster.h" #include "utils/logger.h" -#include "utils/xml.hpp" +#include "utils/xml.h" Element elementFromString (const std::string &name) { diff --git a/src/game-server/monstermanager.hpp b/src/game-server/monstermanager.h index 6337b81..36d11e3 100644 --- a/src/game-server/monstermanager.hpp +++ b/src/game-server/monstermanager.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MONSTERMANAGER_HPP -#define MONSTERMANAGER_HPP +#ifndef MONSTERMANAGER_H +#define MONSTERMANAGER_H #include <string> #include <map> @@ -59,4 +59,4 @@ class MonsterManager extern MonsterManager *monsterManager; -#endif // MONSTERMANAGER_HPP +#endif // MONSTERMANAGER_H diff --git a/src/game-server/npc.cpp b/src/game-server/npc.cpp index e22f7f2..c1b91d6 100644 --- a/src/game-server/npc.cpp +++ b/src/game-server/npc.cpp @@ -18,9 +18,9 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/character.hpp" -#include "game-server/npc.hpp" -#include "scripting/script.hpp" +#include "game-server/character.h" +#include "game-server/npc.h" +#include "scripting/script.h" NPC::NPC(const std::string &name, int id, Script *s): Being(OBJECT_NPC), diff --git a/src/game-server/npc.hpp b/src/game-server/npc.h index f8dd2c3..02b26a7 100644 --- a/src/game-server/npc.hpp +++ b/src/game-server/npc.h @@ -18,10 +18,10 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GAMESERVER_NPC_HPP -#define GAMESERVER_NPC_HPP +#ifndef GAMESERVER_NPC_H +#define GAMESERVER_NPC_H -#include "game-server/being.hpp" +#include "game-server/being.h" class Script; class Character; diff --git a/src/game-server/postman.hpp b/src/game-server/postman.h index 82b7a5a..82b7a5a 100644 --- a/src/game-server/postman.hpp +++ b/src/game-server/postman.h diff --git a/src/game-server/quest.cpp b/src/game-server/quest.cpp index d1e1b52..0a7b02f 100644 --- a/src/game-server/quest.cpp +++ b/src/game-server/quest.cpp @@ -23,11 +23,11 @@ #include <map> #include <string> -#include "game-server/quest.hpp" +#include "game-server/quest.h" -#include "game-server/accountconnection.hpp" -#include "game-server/character.hpp" -#include "game-server/eventlistener.hpp" +#include "game-server/accountconnection.h" +#include "game-server/character.h" +#include "game-server/eventlistener.h" #include "utils/logger.h" typedef std::list< QuestCallback > QuestCallbacks; diff --git a/src/game-server/quest.hpp b/src/game-server/quest.h index e3a9f34..56fa5c2 100644 --- a/src/game-server/quest.hpp +++ b/src/game-server/quest.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GAMESERVER_QUEST_HPP -#define GAMESERVER_QUEST_HPP +#ifndef GAMESERVER_QUEST_H +#define GAMESERVER_QUEST_H #include <string> diff --git a/src/game-server/skillmanager.cpp b/src/game-server/skillmanager.cpp index 2cfcba5..d15219a 100644 --- a/src/game-server/skillmanager.cpp +++ b/src/game-server/skillmanager.cpp @@ -18,12 +18,12 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/skillmanager.hpp" +#include "game-server/skillmanager.h" -#include "common/resourcemanager.hpp" -#include "utils/string.hpp" // for the toUpper function +#include "common/resourcemanager.h" +#include "utils/string.h" // for the toUpper function #include "utils/logger.h" -#include "utils/xml.hpp" +#include "utils/xml.h" #include <map> diff --git a/src/game-server/skillmanager.hpp b/src/game-server/skillmanager.h index c6a73a5..c6a73a5 100644 --- a/src/game-server/skillmanager.hpp +++ b/src/game-server/skillmanager.h diff --git a/src/game-server/spawnarea.cpp b/src/game-server/spawnarea.cpp index 105523c..43e3a93 100644 --- a/src/game-server/spawnarea.cpp +++ b/src/game-server/spawnarea.cpp @@ -18,11 +18,11 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/spawnarea.hpp" +#include "game-server/spawnarea.h" -#include "game-server/mapcomposite.hpp" -#include "game-server/monster.hpp" -#include "game-server/state.hpp" +#include "game-server/mapcomposite.h" +#include "game-server/monster.h" +#include "game-server/state.h" #include "utils/logger.h" struct SpawnAreaEventDispatch : EventDispatch diff --git a/src/game-server/spawnarea.hpp b/src/game-server/spawnarea.h index e04d69e..d3b2fd0 100644 --- a/src/game-server/spawnarea.hpp +++ b/src/game-server/spawnarea.h @@ -18,12 +18,12 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SPAWNAREA_HPP -#define SPAWNAREA_HPP +#ifndef SPAWNAREA_H +#define SPAWNAREA_H #include "point.h" -#include "game-server/eventlistener.hpp" -#include "game-server/thing.hpp" +#include "game-server/eventlistener.h" +#include "game-server/thing.h" class Being; class MonsterClass; diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp index 0c3121c..c652549 100644 --- a/src/game-server/state.cpp +++ b/src/game-server/state.cpp @@ -20,26 +20,26 @@ #include <cassert> -#include "game-server/state.hpp" +#include "game-server/state.h" #include "point.h" -#include "common/configuration.hpp" -#include "game-server/accountconnection.hpp" -#include "game-server/gamehandler.hpp" -#include "game-server/inventory.hpp" -#include "game-server/item.hpp" -#include "game-server/itemmanager.hpp" -#include "game-server/effect.hpp" -#include "game-server/map.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/mapmanager.hpp" -#include "game-server/monster.hpp" -#include "game-server/npc.hpp" -#include "game-server/trade.hpp" -#include "net/messageout.hpp" -#include "scripting/script.hpp" +#include "common/configuration.h" +#include "game-server/accountconnection.h" +#include "game-server/gamehandler.h" +#include "game-server/inventory.h" +#include "game-server/item.h" +#include "game-server/itemmanager.h" +#include "game-server/effect.h" +#include "game-server/map.h" +#include "game-server/mapcomposite.h" +#include "game-server/mapmanager.h" +#include "game-server/monster.h" +#include "game-server/npc.h" +#include "game-server/trade.h" +#include "net/messageout.h" +#include "scripting/script.h" #include "utils/logger.h" -#include "utils/speedconv.hpp" +#include "utils/speedconv.h" enum { diff --git a/src/game-server/state.hpp b/src/game-server/state.h index c0ddc02..f58ab03 100644 --- a/src/game-server/state.hpp +++ b/src/game-server/state.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SERVER_STATE_HPP -#define SERVER_STATE_HPP +#ifndef SERVER_STATE_H +#define SERVER_STATE_H #include <string> diff --git a/src/game-server/statuseffect.cpp b/src/game-server/statuseffect.cpp index f201927..9f91711 100644 --- a/src/game-server/statuseffect.cpp +++ b/src/game-server/statuseffect.cpp @@ -18,10 +18,10 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/statuseffect.hpp" +#include "game-server/statuseffect.h" -#include "scripting/script.hpp" -#include "game-server/being.hpp" +#include "scripting/script.h" +#include "game-server/being.h" StatusEffect::StatusEffect(int id): mId(id), diff --git a/src/game-server/statuseffect.hpp b/src/game-server/statuseffect.h index 3aa4d84..3aa4d84 100644 --- a/src/game-server/statuseffect.hpp +++ b/src/game-server/statuseffect.h diff --git a/src/game-server/statusmanager.cpp b/src/game-server/statusmanager.cpp index 008e982..5e9bfcb 100644 --- a/src/game-server/statusmanager.cpp +++ b/src/game-server/statusmanager.cpp @@ -18,13 +18,13 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/statusmanager.hpp" +#include "game-server/statusmanager.h" -#include "common/resourcemanager.hpp" -#include "game-server/statuseffect.hpp" -#include "scripting/script.hpp" +#include "common/resourcemanager.h" +#include "game-server/statuseffect.h" +#include "scripting/script.h" #include "utils/logger.h" -#include "utils/xml.hpp" +#include "utils/xml.h" #include <map> #include <set> diff --git a/src/game-server/statusmanager.hpp b/src/game-server/statusmanager.h index fc09adb..fc09adb 100644 --- a/src/game-server/statusmanager.hpp +++ b/src/game-server/statusmanager.h diff --git a/src/game-server/thing.cpp b/src/game-server/thing.cpp index 70d2c4c..5fe9424 100644 --- a/src/game-server/thing.cpp +++ b/src/game-server/thing.cpp @@ -20,9 +20,9 @@ #include <cassert> -#include "game-server/thing.hpp" +#include "game-server/thing.h" -#include "game-server/eventlistener.hpp" +#include "game-server/eventlistener.h" Thing::~Thing() { diff --git a/src/game-server/thing.hpp b/src/game-server/thing.h index f1f0df2..f1f0df2 100644 --- a/src/game-server/thing.hpp +++ b/src/game-server/thing.h diff --git a/src/game-server/trade.cpp b/src/game-server/trade.cpp index 1c197c7..5150930 100644 --- a/src/game-server/trade.cpp +++ b/src/game-server/trade.cpp @@ -21,12 +21,12 @@ #include <algorithm> #include <cassert> -#include "game-server/trade.hpp" +#include "game-server/trade.h" -#include "game-server/character.hpp" -#include "game-server/gamehandler.hpp" -#include "game-server/inventory.hpp" -#include "net/messageout.hpp" +#include "game-server/character.h" +#include "game-server/gamehandler.h" +#include "game-server/inventory.h" +#include "net/messageout.h" /* * States : diff --git a/src/game-server/trade.hpp b/src/game-server/trade.h index a95e89c..d425767 100644 --- a/src/game-server/trade.hpp +++ b/src/game-server/trade.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GAMESERVER_TRADE_HPP -#define GAMESERVER_TRADE_HPP +#ifndef GAMESERVER_TRADE_H +#define GAMESERVER_TRADE_H #include <vector> diff --git a/src/game-server/trigger.cpp b/src/game-server/trigger.cpp index ce5cd33..f25b00b 100644 --- a/src/game-server/trigger.cpp +++ b/src/game-server/trigger.cpp @@ -18,12 +18,12 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/trigger.hpp" +#include "game-server/trigger.h" -#include "game-server/character.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/actor.hpp" -#include "game-server/state.hpp" +#include "game-server/character.h" +#include "game-server/mapcomposite.h" +#include "game-server/actor.h" +#include "game-server/state.h" #include "utils/logger.h" diff --git a/src/game-server/trigger.hpp b/src/game-server/trigger.h index 0b5cb97..f6649f1 100644 --- a/src/game-server/trigger.hpp +++ b/src/game-server/trigger.h @@ -18,12 +18,12 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TRIGGER_HPP -#define TRIGGER_HPP +#ifndef TRIGGER_H +#define TRIGGER_H #include "point.h" -#include "game-server/thing.hpp" -#include "scripting/script.hpp" +#include "game-server/thing.h" +#include "scripting/script.h" class Actor; diff --git a/src/net/bandwidth.cpp b/src/net/bandwidth.cpp index ab6e930..4d04b3b 100644 --- a/src/net/bandwidth.cpp +++ b/src/net/bandwidth.cpp @@ -18,9 +18,9 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "bandwidth.hpp" +#include "bandwidth.h" -#include "netcomputer.hpp" +#include "netcomputer.h" BandwidthMonitor::BandwidthMonitor(): mAmountServerOutput(0), diff --git a/src/net/bandwidth.hpp b/src/net/bandwidth.h index 4ffeff7..4ffeff7 100644 --- a/src/net/bandwidth.hpp +++ b/src/net/bandwidth.h diff --git a/src/net/connection.cpp b/src/net/connection.cpp index aeda22a..88c59f0 100644 --- a/src/net/connection.cpp +++ b/src/net/connection.cpp @@ -18,10 +18,10 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "net/connection.hpp" -#include "net/bandwidth.hpp" -#include "net/messagein.hpp" -#include "net/messageout.hpp" +#include "net/connection.h" +#include "net/bandwidth.h" +#include "net/messagein.h" +#include "net/messageout.h" #include "utils/logger.h" #ifdef ENET_VERSION_CREATE diff --git a/src/net/connection.hpp b/src/net/connection.h index 288d9fc..288d9fc 100644 --- a/src/net/connection.hpp +++ b/src/net/connection.h diff --git a/src/net/connectionhandler.cpp b/src/net/connectionhandler.cpp index ec78666..e9ec194 100644 --- a/src/net/connectionhandler.cpp +++ b/src/net/connectionhandler.cpp @@ -20,13 +20,13 @@ #include <algorithm> -#include "net/connectionhandler.hpp" +#include "net/connectionhandler.h" -#include "common/configuration.hpp" -#include "net/bandwidth.hpp" -#include "net/messagein.hpp" -#include "net/messageout.hpp" -#include "net/netcomputer.hpp" +#include "common/configuration.h" +#include "net/bandwidth.h" +#include "net/messagein.h" +#include "net/messageout.h" +#include "net/netcomputer.h" #include "utils/logger.h" #ifdef ENET_VERSION_CREATE diff --git a/src/net/connectionhandler.hpp b/src/net/connectionhandler.h index 96fc90c..96fc90c 100644 --- a/src/net/connectionhandler.hpp +++ b/src/net/connectionhandler.h diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 7d6de27..022ac46 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -27,7 +27,7 @@ #include <sstream> #endif -#include "net/messagein.hpp" +#include "net/messagein.h" #include "utils/logger.h" MessageIn::MessageIn(const char *data, int length): diff --git a/src/net/messagein.hpp b/src/net/messagein.h index f01c185..f01c185 100644 --- a/src/net/messagein.hpp +++ b/src/net/messagein.h diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index c8310c5..a5b0a53 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -28,7 +28,7 @@ #include <string> #include <enet/enet.h> -#include "net/messageout.hpp" +#include "net/messageout.h" /** Initial amount of bytes allocated for the messageout data buffer. */ const unsigned int INITIAL_DATA_CAPACITY = 16; diff --git a/src/net/messageout.hpp b/src/net/messageout.h index cf3e0c7..cf3e0c7 100644 --- a/src/net/messageout.hpp +++ b/src/net/messageout.h diff --git a/src/net/netcomputer.cpp b/src/net/netcomputer.cpp index 84a1074..c4af342 100644 --- a/src/net/netcomputer.cpp +++ b/src/net/netcomputer.cpp @@ -22,12 +22,12 @@ #include <queue> #include <enet/enet.h> -#include "bandwidth.hpp" -#include "messageout.hpp" -#include "netcomputer.hpp" +#include "bandwidth.h" +#include "messageout.h" +#include "netcomputer.h" #include "../utils/logger.h" -#include "../utils/processorutils.hpp" +#include "../utils/processorutils.h" NetComputer::NetComputer(ENetPeer *peer): mPeer(peer) diff --git a/src/net/netcomputer.hpp b/src/net/netcomputer.h index d3485f6..d3485f6 100644 --- a/src/net/netcomputer.hpp +++ b/src/net/netcomputer.h diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp index 410b1cb..72d20a6 100644 --- a/src/scripting/lua.cpp +++ b/src/scripting/lua.cpp @@ -27,30 +27,30 @@ extern "C" { #include <lauxlib.h> } -#include "common/resourcemanager.hpp" -#include "game-server/accountconnection.hpp" -#include "game-server/buysell.hpp" -#include "game-server/character.hpp" -#include "game-server/collisiondetection.hpp" -#include "game-server/effect.hpp" -#include "game-server/gamehandler.hpp" -#include "game-server/inventory.hpp" -#include "game-server/item.hpp" -#include "game-server/itemmanager.hpp" -#include "game-server/mapcomposite.hpp" -#include "game-server/mapmanager.hpp" -#include "game-server/monster.hpp" -#include "game-server/monstermanager.hpp" -#include "game-server/npc.hpp" -#include "game-server/postman.hpp" -#include "game-server/quest.hpp" -#include "game-server/state.hpp" -#include "game-server/trigger.hpp" -#include "net/messageout.hpp" -#include "scripting/luautil.hpp" -#include "scripting/luascript.hpp" +#include "common/resourcemanager.h" +#include "game-server/accountconnection.h" +#include "game-server/buysell.h" +#include "game-server/character.h" +#include "game-server/collisiondetection.h" +#include "game-server/effect.h" +#include "game-server/gamehandler.h" +#include "game-server/inventory.h" +#include "game-server/item.h" +#include "game-server/itemmanager.h" +#include "game-server/mapcomposite.h" +#include "game-server/mapmanager.h" +#include "game-server/monster.h" +#include "game-server/monstermanager.h" +#include "game-server/npc.h" +#include "game-server/postman.h" +#include "game-server/quest.h" +#include "game-server/state.h" +#include "game-server/trigger.h" +#include "net/messageout.h" +#include "scripting/luautil.h" +#include "scripting/luascript.h" #include "utils/logger.h" -#include "utils/speedconv.hpp" +#include "utils/speedconv.h" #include <string.h> diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp index 23e4fdb..ff99389 100644 --- a/src/scripting/luascript.cpp +++ b/src/scripting/luascript.cpp @@ -19,9 +19,9 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "luascript.hpp" +#include "luascript.h" -#include "game-server/being.hpp" +#include "game-server/being.h" #include "utils/logger.h" #include <cassert> diff --git a/src/scripting/luascript.hpp b/src/scripting/luascript.h index 292c35a..cc1675d 100644 --- a/src/scripting/luascript.hpp +++ b/src/scripting/luascript.h @@ -18,15 +18,15 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LUASCRIPT_HPP -#define LUASCRIPT_HPP +#ifndef LUASCRIPT_H +#define LUASCRIPT_H extern "C" { #include <lualib.h> #include <lauxlib.h> } -#include "scripting/script.hpp" +#include "scripting/script.h" /** * Implementation of the Script class for Lua. @@ -93,4 +93,4 @@ struct LuaRegister static LuaRegister dummy; -#endif // LUASCRIPT_HPP +#endif // LUASCRIPT_H diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp index 008a5e3..cec3ae7 100644 --- a/src/scripting/luautil.cpp +++ b/src/scripting/luautil.cpp @@ -19,10 +19,10 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "luautil.hpp" +#include "luautil.h" -#include "game-server/character.hpp" -#include "game-server/npc.hpp" +#include "game-server/character.h" +#include "game-server/npc.h" #include "utils/logger.h" diff --git a/src/scripting/luautil.hpp b/src/scripting/luautil.h index aec2c5c..8718515 100644 --- a/src/scripting/luautil.hpp +++ b/src/scripting/luautil.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SCRIPTING_LUAUTIL_HPP -#define SCRIPTING_LUAUTIL_HPP +#ifndef SCRIPTING_LUAUTIL_H +#define SCRIPTING_LUAUTIL_H extern "C" { #include <lualib.h> diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp index 334895c..b222b0f 100644 --- a/src/scripting/script.cpp +++ b/src/scripting/script.cpp @@ -18,10 +18,10 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "scripting/script.hpp" +#include "scripting/script.h" -#include "common/resourcemanager.hpp" -#include "game-server/being.hpp" +#include "common/resourcemanager.h" +#include "game-server/being.h" #include "utils/logger.h" #include <cstdlib> diff --git a/src/scripting/script.hpp b/src/scripting/script.h index 6f5dded..5d5d1f4 100644 --- a/src/scripting/script.hpp +++ b/src/scripting/script.h @@ -18,13 +18,13 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SCRIPTING_SCRIPT_HPP -#define SCRIPTING_SCRIPT_HPP +#ifndef SCRIPTING_SCRIPT_H +#define SCRIPTING_SCRIPT_H #include <string> -#include "game-server/character.hpp" -#include "game-server/eventlistener.hpp" +#include "game-server/character.h" +#include "game-server/eventlistener.h" class MapComposite; class Thing; diff --git a/src/serialize/characterdata.hpp b/src/serialize/characterdata.h index bf08dc1..f36581d 100644 --- a/src/serialize/characterdata.hpp +++ b/src/serialize/characterdata.h @@ -18,15 +18,15 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SERIALIZE_CHARACTERDATA_HPP -#define SERIALIZE_CHARACTERDATA_HPP +#ifndef SERIALIZE_CHARACTERDATA_H +#define SERIALIZE_CHARACTERDATA_H #include <map> #include "defines.h" -#include "common/inventorydata.hpp" -#include "net/messagein.hpp" -#include "net/messageout.hpp" +#include "common/inventorydata.h" +#include "net/messagein.h" +#include "net/messageout.h" #include "point.h" template< class T > diff --git a/src/utils/logger.cpp b/src/utils/logger.cpp index 2053c9a..958d2e5 100644 --- a/src/utils/logger.cpp +++ b/src/utils/logger.cpp @@ -20,8 +20,8 @@ */ #include "logger.h" -#include "common/resourcemanager.hpp" -#include "utils/string.hpp" +#include "common/resourcemanager.h" +#include "utils/string.h" #include <ctime> #include <fstream> diff --git a/src/utils/processorutils.cpp b/src/utils/processorutils.cpp index 37db06a..06ef017 100644 --- a/src/utils/processorutils.cpp +++ b/src/utils/processorutils.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "utils/processorutils.hpp" +#include "utils/processorutils.h" bool utils::processor::isLittleEndian; diff --git a/src/utils/processorutils.hpp b/src/utils/processorutils.h index 05bb7c8..6fc0139 100644 --- a/src/utils/processorutils.hpp +++ b/src/utils/processorutils.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PROCESSORUTILS_HPP -#define PROCESSORUTILS_HPP +#ifndef PROCESSORUTILS_H +#define PROCESSORUTILS_H namespace utils { @@ -47,4 +47,4 @@ namespace utils } // namespace processor } // namespace utils -#endif // TOKENDISPENSER_HPP +#endif // PROCESSORUTILS_H diff --git a/src/utils/speedconv.cpp b/src/utils/speedconv.cpp index 18602ab..f6be2e7 100644 --- a/src/utils/speedconv.cpp +++ b/src/utils/speedconv.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "utils/speedconv.hpp" +#include "utils/speedconv.h" double utils::tpsToSpeed(double tps) { diff --git a/src/utils/speedconv.hpp b/src/utils/speedconv.h index 6a29d0f..33e1a94 100644 --- a/src/utils/speedconv.hpp +++ b/src/utils/speedconv.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SPEEDCONV_HPP -#define SPEEDCONV_HPP +#ifndef SPEEDCONV_H +#define SPEEDCONV_H // Simple helper functions for converting between tiles per // second and the internal speed representation @@ -41,4 +41,4 @@ namespace utils { double speedToTps(double); } -#endif // SPEEDCONV_HPP +#endif // SPEEDCONV_H diff --git a/src/utils/string.cpp b/src/utils/string.cpp index 785a092..089a537 100644 --- a/src/utils/string.cpp +++ b/src/utils/string.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "utils/string.hpp" +#include "utils/string.h" #include <cctype> #include <algorithm> diff --git a/src/utils/string.hpp b/src/utils/string.h index 6127bfe..6127bfe 100644 --- a/src/utils/string.hpp +++ b/src/utils/string.h diff --git a/src/utils/stringfilter.cpp b/src/utils/stringfilter.cpp index 4a9d19c..617da90 100644 --- a/src/utils/stringfilter.cpp +++ b/src/utils/stringfilter.cpp @@ -22,7 +22,7 @@ #include "utils/stringfilter.h" -#include "common/configuration.hpp" +#include "common/configuration.h" #include "utils/logger.h" namespace utils diff --git a/src/utils/tokencollector.cpp b/src/utils/tokencollector.cpp index f82dcd1..e41d228 100644 --- a/src/utils/tokencollector.cpp +++ b/src/utils/tokencollector.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "utils/tokencollector.hpp" +#include "utils/tokencollector.h" /* We are optimistic and we assume that clients connect as soon as possible. It means that pending data are mainly outdated ones, except for the newer diff --git a/src/utils/tokencollector.hpp b/src/utils/tokencollector.h index 5e4c3f2..3d2b653 100644 --- a/src/utils/tokencollector.hpp +++ b/src/utils/tokencollector.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TOKENCOLLECTOR_HPP -#define TOKENCOLLECTOR_HPP +#ifndef TOKENCOLLECTOR_H +#define TOKENCOLLECTOR_H #include <string> #include <list> @@ -135,4 +135,4 @@ class TokenCollector: private TokenCollectorBase Handler *mHandler; }; -#endif // TOKENCOLLECTOR_HPP +#endif // TOKENCOLLECTOR_H diff --git a/src/utils/tokendispenser.cpp b/src/utils/tokendispenser.cpp index 9aff9e4..2cbf16d 100644 --- a/src/utils/tokendispenser.cpp +++ b/src/utils/tokendispenser.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "utils/tokendispenser.hpp" +#include "utils/tokendispenser.h" #include <cstdlib> diff --git a/src/utils/tokendispenser.hpp b/src/utils/tokendispenser.h index dc3173c..d04d17b 100644 --- a/src/utils/tokendispenser.hpp +++ b/src/utils/tokendispenser.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TOKENDISPENSER_HPP -#define TOKENDISPENSER_HPP +#ifndef TOKENDISPENSER_H +#define TOKENDISPENSER_H #define MAGIC_TOKEN_LENGTH 32 @@ -42,4 +42,4 @@ namespace utils } // namespace utils -#endif // TOKENDISPENSER_HPP +#endif // TOKENDISPENSER_H diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 2920227..a4a5360 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -19,11 +19,11 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "utils/xml.hpp" +#include "utils/xml.h" -#include "common/resourcemanager.hpp" +#include "common/resourcemanager.h" #include "utils/logger.h" -#include "utils/string.hpp" +#include "utils/string.h" #include <iostream> #include <fstream> diff --git a/src/utils/xml.hpp b/src/utils/xml.h index eba88e5..eba88e5 100644 --- a/src/utils/xml.hpp +++ b/src/utils/xml.h diff --git a/src/utils/zlib.cpp b/src/utils/zlib.cpp index e3d3c60..3c5e8f3 100644 --- a/src/utils/zlib.cpp +++ b/src/utils/zlib.cpp @@ -21,7 +21,7 @@ #include <cstdlib> #include <zlib.h> -#include "utils/zlib.hpp" +#include "utils/zlib.h" #include "utils/logger.h" diff --git a/src/utils/zlib.hpp b/src/utils/zlib.h index 6d5347f..f78aa26 100644 --- a/src/utils/zlib.hpp +++ b/src/utils/zlib.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ZLIB_HPP -#define ZLIB_HPP +#ifndef ZLIB_H +#define ZLIB_H /** * Inflates either zlib or gzip deflated memory. The inflated memory is |