diff --git a/src/char/char.cpp b/src/char/char.cpp index c5059f490e..af1ade357d 100644 --- a/src/char/char.cpp +++ b/src/char/char.cpp @@ -1,16 +1,17 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #pragma warning(disable:4800) #include "char.hpp" -#include #include #include #include #include +#include #include "../common/cbasetypes.hpp" +#include "../common/cli.hpp" #include "../common/core.hpp" #include "../common/db.hpp" #include "../common/malloc.hpp" @@ -21,20 +22,19 @@ #include "../common/socket.hpp" #include "../common/strlib.hpp" #include "../common/timer.hpp" -#include "../common/cli.hpp" +#include "char_clif.hpp" +#include "char_cnslif.hpp" +#include "char_logif.hpp" +#include "char_mapif.hpp" +#include "inter.hpp" +#include "int_elemental.hpp" #include "int_guild.hpp" #include "int_homun.hpp" #include "int_mail.hpp" #include "int_mercenary.hpp" -#include "int_elemental.hpp" #include "int_party.hpp" #include "int_storage.hpp" -#include "inter.hpp" -#include "char_logif.hpp" -#include "char_mapif.hpp" -#include "char_cnslif.hpp" -#include "char_clif.hpp" //definition of exported var declared in .h int login_fd=-1; //login file descriptor diff --git a/src/char/char.hpp b/src/char/char.hpp index 9243798bf6..0012f5128c 100644 --- a/src/char/char.hpp +++ b/src/char/char.hpp @@ -1,13 +1,13 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CHAR_HPP_ #define _CHAR_HPP_ -#include "../config/core.hpp" #include "../common/core.hpp" // CORE_ST_LAST -#include "../common/msg_conf.hpp" #include "../common/mmo.hpp" +#include "../common/msg_conf.hpp" +#include "../config/core.hpp" extern int login_fd; //login file descriptor extern int char_fd; //char file descriptor diff --git a/src/char/char_clif.cpp b/src/char/char_clif.cpp index 8353f4f050..3afff1afc3 100644 --- a/src/char/char_clif.cpp +++ b/src/char/char_clif.cpp @@ -6,20 +6,21 @@ #include #include +#include "../common/malloc.hpp" +#include "../common/mapindex.hpp" #include "../common/mmo.hpp" -#include "../common/socket.hpp" -#include "../common/sql.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" -#include "../common/mapindex.hpp" -#include "../common/malloc.hpp" +#include "../common/socket.hpp" +#include "../common/sql.hpp" #include "../common/strlib.hpp" -#include "../common/utils.hpp" #include "../common/timer.hpp" -#include "inter.hpp" +#include "../common/utils.hpp" + #include "char.hpp" #include "char_logif.hpp" #include "char_mapif.hpp" +#include "inter.hpp" #if PACKETVER_SUPPORTS_PINCODE bool pincode_allowed( char* pincode ); diff --git a/src/char/char_cnslif.cpp b/src/char/char_cnslif.cpp index 720dae2f30..062334845e 100644 --- a/src/char/char_cnslif.cpp +++ b/src/char/char_cnslif.cpp @@ -6,11 +6,11 @@ #include #include -#include "../common/socket.hpp" -#include "../common/showmsg.hpp" -#include "../common/timer.hpp" -#include "../common/ers.hpp" #include "../common/cli.hpp" +#include "../common/ers.hpp" +#include "../common/showmsg.hpp" +#include "../common/socket.hpp" +#include "../common/timer.hpp" #include "char.hpp" diff --git a/src/char/char_logif.cpp b/src/char/char_logif.cpp index 88cdd88187..06c71366f5 100644 --- a/src/char/char_logif.cpp +++ b/src/char/char_logif.cpp @@ -6,18 +6,18 @@ #include #include -#include "../common/socket.hpp" -#include "../common/timer.hpp" #include "../common/showmsg.hpp" +#include "../common/socket.hpp" #include "../common/sql.hpp" -#include "../common/utils.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" +#include "../common/utils.hpp" -#include "inter.hpp" -#include "int_guild.hpp" #include "char.hpp" #include "char_clif.hpp" #include "char_mapif.hpp" +#include "inter.hpp" +#include "int_guild.hpp" //early declaration void chlogif_on_ready(void); diff --git a/src/char/char_mapif.cpp b/src/char/char_mapif.cpp index 6e74b9d548..4062b046a7 100644 --- a/src/char/char_mapif.cpp +++ b/src/char/char_mapif.cpp @@ -1,26 +1,20 @@ -/** - * @file char_mapif.c - * Module purpose is to handle incoming and outgoing requests with map-server. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams originally in login.c - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder #include "char_mapif.hpp" #include #include //memcpy -#include "../common/socket.hpp" -#include "../common/sql.hpp" #include "../common/malloc.hpp" #include "../common/showmsg.hpp" +#include "../common/socket.hpp" +#include "../common/sql.hpp" #include "../common/strlib.hpp" -#include "inter.hpp" #include "char.hpp" #include "char_logif.hpp" +#include "inter.hpp" /** * Packet send to all map-servers, attach to ourself diff --git a/src/char/char_mapif.hpp b/src/char/char_mapif.hpp index 4d71e80921..1df3edb297 100644 --- a/src/char/char_mapif.hpp +++ b/src/char/char_mapif.hpp @@ -1,11 +1,5 @@ -/** - * @file char_mapif.h - * Module purpose is to handle incoming and outgoing requests with map-server. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams originally in login.c - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder #ifndef _CHAR_MAPIF_HPP_ #define _CHAR_MAPIF_HPP_ diff --git a/src/char/int_achievement.cpp b/src/char/int_achievement.cpp index 391bff6395..70a0b40aff 100644 --- a/src/char/int_achievement.cpp +++ b/src/char/int_achievement.cpp @@ -1,11 +1,11 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_achievement.hpp" #include -#include #include +#include #include "../common/db.hpp" #include "../common/malloc.hpp" diff --git a/src/char/int_achievement.hpp b/src/char/int_achievement.hpp index 565557e5b1..e3d63c9d4e 100644 --- a/src/char/int_achievement.hpp +++ b/src/char/int_achievement.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_ACHIEVEMENT_HPP_ diff --git a/src/char/int_auction.cpp b/src/char/int_auction.cpp index 7fc5182680..84a36057e5 100644 --- a/src/char/int_auction.cpp +++ b/src/char/int_auction.cpp @@ -1,18 +1,18 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_auction.hpp" #include -#include #include +#include -#include "../common/mmo.hpp" #include "../common/malloc.hpp" +#include "../common/mmo.hpp" #include "../common/showmsg.hpp" #include "../common/socket.hpp" -#include "../common/strlib.hpp" #include "../common/sql.hpp" +#include "../common/strlib.hpp" #include "../common/timer.hpp" #include "char.hpp" diff --git a/src/char/int_auction.hpp b/src/char/int_auction.hpp index 35b52576e7..3ddb9f720d 100644 --- a/src/char/int_auction.hpp +++ b/src/char/int_auction.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_AUCTION_HPP_ diff --git a/src/char/int_clan.cpp b/src/char/int_clan.cpp index 94ea35c005..7935e1d212 100644 --- a/src/char/int_clan.cpp +++ b/src/char/int_clan.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_clan.hpp" diff --git a/src/char/int_clan.hpp b/src/char/int_clan.hpp index e0b4076c9c..6d2b30fe28 100644 --- a/src/char/int_clan.hpp +++ b/src/char/int_clan.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_CLAN_HPP_ diff --git a/src/char/int_elemental.cpp b/src/char/int_elemental.cpp index 1416f7ba75..30fe46ff39 100644 --- a/src/char/int_elemental.cpp +++ b/src/char/int_elemental.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_elemental.hpp" @@ -7,10 +7,10 @@ #include #include "../common/mmo.hpp" -#include "../common/strlib.hpp" #include "../common/showmsg.hpp" #include "../common/socket.hpp" #include "../common/sql.hpp" +#include "../common/strlib.hpp" #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_elemental.hpp b/src/char/int_elemental.hpp index e212f21767..ac4f4a5b59 100644 --- a/src/char/int_elemental.hpp +++ b/src/char/int_elemental.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_ELEMENTAL_HPP_ diff --git a/src/char/int_guild.cpp b/src/char/int_guild.cpp index 93e961ed50..d34b746e51 100644 --- a/src/char/int_guild.cpp +++ b/src/char/int_guild.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_guild.hpp" @@ -8,10 +8,10 @@ #include #include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" #include "../common/malloc.hpp" -#include "../common/socket.hpp" +#include "../common/mmo.hpp" #include "../common/showmsg.hpp" +#include "../common/socket.hpp" #include "../common/strlib.hpp" #include "../common/timer.hpp" diff --git a/src/char/int_guild.hpp b/src/char/int_guild.hpp index 6702acf378..85b45d0fe6 100644 --- a/src/char/int_guild.hpp +++ b/src/char/int_guild.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_GUILD_HPP_ diff --git a/src/char/int_homun.cpp b/src/char/int_homun.cpp index 085a6e2b9d..2d24e13766 100644 --- a/src/char/int_homun.cpp +++ b/src/char/int_homun.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_homun.hpp" @@ -7,11 +7,11 @@ #include #include "../common/mmo.hpp" -#include "../common/strlib.hpp" #include "../common/showmsg.hpp" #include "../common/socket.hpp" -#include "../common/utils.hpp" #include "../common/sql.hpp" +#include "../common/strlib.hpp" +#include "../common/utils.hpp" #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_homun.hpp b/src/char/int_homun.hpp index cab765d37e..afcf430906 100644 --- a/src/char/int_homun.hpp +++ b/src/char/int_homun.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_HOMUN_HPP_ diff --git a/src/char/int_mail.cpp b/src/char/int_mail.cpp index e3a0724fcb..9fa22b9940 100644 --- a/src/char/int_mail.cpp +++ b/src/char/int_mail.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_mail.hpp" @@ -9,8 +9,8 @@ #include "../common/mmo.hpp" #include "../common/showmsg.hpp" #include "../common/socket.hpp" -#include "../common/strlib.hpp" #include "../common/sql.hpp" +#include "../common/strlib.hpp" #include "char.hpp" #include "char_mapif.hpp" diff --git a/src/char/int_mail.hpp b/src/char/int_mail.hpp index 864e7a5815..dc67d285a3 100644 --- a/src/char/int_mail.hpp +++ b/src/char/int_mail.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_MAIL_HPP_ diff --git a/src/char/int_mercenary.cpp b/src/char/int_mercenary.cpp index caded55468..117d6f9a94 100644 --- a/src/char/int_mercenary.cpp +++ b/src/char/int_mercenary.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_mercenary.hpp" @@ -7,10 +7,10 @@ #include #include "../common/mmo.hpp" -#include "../common/strlib.hpp" #include "../common/showmsg.hpp" #include "../common/socket.hpp" #include "../common/sql.hpp" +#include "../common/strlib.hpp" #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_mercenary.hpp b/src/char/int_mercenary.hpp index 1cfd03dd40..3feaf28e27 100644 --- a/src/char/int_mercenary.hpp +++ b/src/char/int_mercenary.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_MERCENARY_HPP_ diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp index fc14f78d1f..ce7bfe9835 100644 --- a/src/char/int_party.cpp +++ b/src/char/int_party.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_party.hpp" @@ -7,13 +7,13 @@ #include #include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" #include "../common/malloc.hpp" -#include "../common/strlib.hpp" -#include "../common/socket.hpp" -#include "../common/showmsg.hpp" #include "../common/mapindex.hpp" +#include "../common/mmo.hpp" +#include "../common/showmsg.hpp" +#include "../common/socket.hpp" #include "../common/sql.hpp" +#include "../common/strlib.hpp" #include "char.hpp" #include "char_mapif.hpp" diff --git a/src/char/int_party.hpp b/src/char/int_party.hpp index 266cee57c7..d347bc9eb7 100644 --- a/src/char/int_party.hpp +++ b/src/char/int_party.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_PARTY_HPP_ diff --git a/src/char/int_pet.cpp b/src/char/int_pet.cpp index 40fe5261b8..d510ce2ebf 100644 --- a/src/char/int_pet.cpp +++ b/src/char/int_pet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_pet.hpp" @@ -6,13 +6,13 @@ #include #include -#include "../common/mmo.hpp" #include "../common/malloc.hpp" -#include "../common/socket.hpp" -#include "../common/strlib.hpp" +#include "../common/mmo.hpp" #include "../common/showmsg.hpp" -#include "../common/utils.hpp" +#include "../common/socket.hpp" #include "../common/sql.hpp" +#include "../common/strlib.hpp" +#include "../common/utils.hpp" #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_pet.hpp b/src/char/int_pet.hpp index 76daad23b5..c0c6061a3f 100644 --- a/src/char/int_pet.hpp +++ b/src/char/int_pet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_PET_HPP_ diff --git a/src/char/int_quest.cpp b/src/char/int_quest.cpp index fa74ca6698..ea7c2f2ed8 100644 --- a/src/char/int_quest.cpp +++ b/src/char/int_quest.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "int_quest.hpp" @@ -6,11 +6,11 @@ #include #include -#include "../common/mmo.hpp" #include "../common/malloc.hpp" +#include "../common/mmo.hpp" #include "../common/socket.hpp" -#include "../common/strlib.hpp" #include "../common/sql.hpp" +#include "../common/strlib.hpp" #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_quest.hpp b/src/char/int_quest.hpp index 626e594232..d402d7ede6 100644 --- a/src/char/int_quest.hpp +++ b/src/char/int_quest.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_QUEST_HPP_ diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp index eecf8cf725..0afa72518a 100644 --- a/src/char/int_storage.cpp +++ b/src/char/int_storage.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #pragma warning(disable:4800) //forcing value to bool @@ -11,8 +11,9 @@ #include "../common/mmo.hpp" #include "../common/showmsg.hpp" #include "../common/socket.hpp" -#include "../common/strlib.hpp" // StringBuf #include "../common/sql.hpp" +#include "../common/strlib.hpp" // StringBuf + #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp index 72e5855f28..89d27b2160 100644 --- a/src/char/int_storage.hpp +++ b/src/char/int_storage.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INT_STORAGE_HPP_ diff --git a/src/char/inter.cpp b/src/char/inter.cpp index ee49a1857b..b2872e6195 100644 --- a/src/char/inter.cpp +++ b/src/char/inter.cpp @@ -1,39 +1,38 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "inter.hpp" +#include #include -#include -#include // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool] -#include #include +#include // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool] #include -#include +#include #include "../common/cbasetypes.hpp" #include "../common/malloc.hpp" -#include "../common/strlib.hpp" #include "../common/showmsg.hpp" #include "../common/socket.hpp" +#include "../common/strlib.hpp" #include "../common/timer.hpp" #include "char.hpp" #include "char_logif.hpp" #include "char_mapif.hpp" #include "inter.hpp" -#include "int_party.hpp" -#include "int_guild.hpp" -#include "int_storage.hpp" -#include "int_pet.hpp" -#include "int_homun.hpp" -#include "int_mercenary.hpp" -#include "int_mail.hpp" -#include "int_auction.hpp" -#include "int_quest.hpp" -#include "int_elemental.hpp" -#include "int_clan.hpp" #include "int_achievement.hpp" +#include "int_auction.hpp" +#include "int_clan.hpp" +#include "int_elemental.hpp" +#include "int_guild.hpp" +#include "int_homun.hpp" +#include "int_mail.hpp" +#include "int_mercenary.hpp" +#include "int_party.hpp" +#include "int_pet.hpp" +#include "int_quest.hpp" +#include "int_storage.hpp" #define WISDATA_TTL (60*1000) //Wis data Time To Live (60 seconds) #define WISDELLIST_MAX 256 // Number of elements in the list Delete data Wis diff --git a/src/char/inter.hpp b/src/char/inter.hpp index 9384c0fc7a..bf043832eb 100644 --- a/src/char/inter.hpp +++ b/src/char/inter.hpp @@ -1,16 +1,16 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INTER_HPP_ #define _INTER_HPP_ -#include "../common/cbasetypes.hpp" -#include "../common/sql.hpp" - #include #include #include +#include "../common/cbasetypes.hpp" +#include "../common/sql.hpp" + struct s_storage_table; struct Inter_Config { std::string cfgFile; ///< Inter-Config file diff --git a/src/common/cbasetypes.hpp b/src/common/cbasetypes.hpp index 41f9ecfb5c..ac92314d38 100644 --- a/src/common/cbasetypes.hpp +++ b/src/common/cbasetypes.hpp @@ -1,3 +1,6 @@ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder + #ifndef _CBASETYPES_HPP_ #define _CBASETYPES_HPP_ diff --git a/src/common/cli.cpp b/src/common/cli.cpp index aae8f2ca80..687d22f8e4 100644 --- a/src/common/cli.cpp +++ b/src/common/cli.cpp @@ -1,15 +1,12 @@ -/** - * @file cli.cpp - * Module purpose is to handle the console (cli=console line input) while the servers launch and run. - * This contains functions common to all servers, but then dispatches them to a specific parser on each server. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder + +#include "cli.hpp" #include -#include #include +#include + #ifdef WIN32 #include #else @@ -17,9 +14,8 @@ #endif #include "cbasetypes.hpp" -#include "showmsg.hpp" #include "core.hpp" -#include "cli.hpp" +#include "showmsg.hpp" //map confs const char* MAP_CONF_NAME; diff --git a/src/common/cli.hpp b/src/common/cli.hpp index 6de4ec7681..15e0ec7de9 100644 --- a/src/common/cli.hpp +++ b/src/common/cli.hpp @@ -1,14 +1,10 @@ -/** - * @file cli.hpp - * Module purpose is to handle the console (cli=console line input) while the servers launch and run. - * This contains functions common to all servers, but then dispatches them to a specific parser on each server. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder -#ifndef CLI_HPP -#define CLI_HPP +#ifndef _CLI_HPP_ +#define _CLI_HPP_ + +#include "cbasetypes.hpp" #define MAX_CONSOLE_IN 200 //max is map... #define MIN_CONSOLE_IN 4 //min is help @@ -37,5 +33,5 @@ int cli_get_options(int argc, char ** argv); int parse_console_timer(int tid, unsigned int tick, int id, intptr_t data); extern int parse_console(const char* buf); //particular for each serv -#endif /* CLI_HPP */ +#endif /* _CLI_HPP_ */ diff --git a/src/common/conf.cpp b/src/common/conf.cpp index 3964065e64..f075031d12 100644 --- a/src/common/conf.cpp +++ b/src/common/conf.cpp @@ -1,7 +1,8 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "conf.hpp" + #include "showmsg.hpp" // ShowError int conf_read_file(config_t *config, const char *config_filename) diff --git a/src/common/conf.hpp b/src/common/conf.hpp index f441d2d197..95ff68fffb 100644 --- a/src/common/conf.hpp +++ b/src/common/conf.hpp @@ -1,12 +1,13 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CONF_HPP_ #define _CONF_HPP_ -#include "cbasetypes.hpp" #include "../../3rdparty/libconfig/libconfig.h" +#include "cbasetypes.hpp" + int conf_read_file(config_t *config, const char *config_filename); int config_setting_copy(config_setting_t *parent, const config_setting_t *src); diff --git a/src/common/core.cpp b/src/common/core.cpp index 7eea502ff7..c251242b50 100644 --- a/src/common/core.cpp +++ b/src/common/core.cpp @@ -1,12 +1,8 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "mmo.hpp" -#include "cbasetypes.hpp" -#include "showmsg.hpp" -#include "malloc.hpp" #include "core.hpp" -#include "strlib.hpp" + #ifndef MINICORE #include "ers.hpp" #include "socket.hpp" @@ -22,6 +18,11 @@ #include // _chdir #endif +#include "cbasetypes.hpp" +#include "malloc.hpp" +#include "mmo.hpp" +#include "showmsg.hpp" +#include "strlib.hpp" /// Called when a terminate signal is received. void (*shutdown_callback)(void) = NULL; diff --git a/src/common/core.hpp b/src/common/core.hpp index c50fb1bd80..8d2d3affca 100644 --- a/src/common/core.hpp +++ b/src/common/core.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CORE_HPP_ diff --git a/src/common/db.cpp b/src/common/db.cpp index e63a5469bb..14ca951ed7 100644 --- a/src/common/db.cpp +++ b/src/common/db.cpp @@ -1,5 +1,5 @@ /*****************************************************************************\ - * Copyright (c) Athena Dev Teams - Licensed under GNU GPL + * Copyright (c) rAthena Dev Teams - Licensed under GNU GPL * For more information, see LICENCE in the main folder * * This file is separated in five sections: @@ -70,15 +70,15 @@ #include "db.hpp" +#include +#include + #include "ers.hpp" #include "malloc.hpp" #include "mmo.hpp" #include "showmsg.hpp" #include "strlib.hpp" -#include -#include - /*****************************************************************************\ * (1) Private typedefs, enums, structures, defines and global variables of * * the database system. * diff --git a/src/common/db.hpp b/src/common/db.hpp index 065403975b..94afa2378f 100644 --- a/src/common/db.hpp +++ b/src/common/db.hpp @@ -1,5 +1,5 @@ /*****************************************************************************\ - * Copyright (c) Athena Dev Teams - Licensed under GNU GPL * + * Copyright (c) rAthena Dev Teams - Licensed under GNU GPL * * For more information, see LICENCE in the main folder * * * * This file is separated in two sections: * diff --git a/src/common/des.cpp b/src/common/des.cpp index 5ff97b526a..cdcd645888 100644 --- a/src/common/des.cpp +++ b/src/common/des.cpp @@ -1,8 +1,7 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "cbasetypes.hpp" -#include "des.hpp" +#include "des.hpp" /// DES (Data Encryption Standard) algorithm, modified version. /// @see http://www.eathena.ws/board/index.php?autocom=bugtracker&showbug=5099. diff --git a/src/common/des.hpp b/src/common/des.hpp index 6bfb593a24..333e69a99a 100644 --- a/src/common/des.hpp +++ b/src/common/des.hpp @@ -1,15 +1,15 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder + #ifndef _DES_HPP_ #define _DES_HPP_ +#include "cbasetypes.hpp" /// One 64-bit block. typedef struct BIT64 { uint8_t b[8]; } BIT64; - void des_decrypt_block(BIT64* block); void des_decrypt(unsigned char* data, size_t size); - #endif // _DES_HPP_ diff --git a/src/common/ers.cpp b/src/common/ers.cpp index 1ae9ad348b..dea4047481 100644 --- a/src/common/ers.cpp +++ b/src/common/ers.cpp @@ -1,5 +1,5 @@ /*****************************************************************************\ - * Copyright (c) Athena Dev Teams - Licensed under GNU GPL * + * Copyright (c) rAthena Dev Teams - Licensed under GNU GPL * * For more information, see LICENCE in the main folder * * * *

Entry Reusage System

* @@ -40,16 +40,16 @@ * @see common#ers.hpp * \*****************************************************************************/ - -#include "cbasetypes.hpp" #include "ers.hpp" -#include "malloc.hpp" // CREATE, RECREATE, aMalloc, aFree -#include "nullpo.hpp" -#include "showmsg.hpp" // ShowMessage, ShowError, ShowFatalError, CL_BOLD, CL_NORMAL #include #include +#include "cbasetypes.hpp" +#include "malloc.hpp" // CREATE, RECREATE, aMalloc, aFree +#include "nullpo.hpp" +#include "showmsg.hpp" // ShowMessage, ShowError, ShowFatalError, CL_BOLD, CL_NORMAL + #ifndef DISABLE_ERS #define ERS_BLOCK_ENTRIES 2048 diff --git a/src/common/ers.hpp b/src/common/ers.hpp index 100e3cae61..0d4e9798b6 100644 --- a/src/common/ers.hpp +++ b/src/common/ers.hpp @@ -1,5 +1,5 @@ /*****************************************************************************\ - * Copyright (c) Athena Dev Teams - Licensed under GNU GPL * + * Copyright (c) rAthena Dev Teams - Licensed under GNU GPL * * For more information, see LICENCE in the main folder * * * *

Entry Reusage System

* diff --git a/src/common/grfio.cpp b/src/common/grfio.cpp index 2b0d00b035..6a9e91d488 100644 --- a/src/common/grfio.cpp +++ b/src/common/grfio.cpp @@ -1,16 +1,17 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder +#include "grfio.hpp" + +#include +#include + #include "cbasetypes.hpp" #include "des.hpp" #include "malloc.hpp" #include "showmsg.hpp" #include "strlib.hpp" #include "utils.hpp" -#include "grfio.hpp" - -#include -#include //---------------------------- // file entry table struct diff --git a/src/common/grfio.hpp b/src/common/grfio.hpp index 90d05d6399..f053d4dc66 100644 --- a/src/common/grfio.hpp +++ b/src/common/grfio.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _GRFIO_HPP_ diff --git a/src/common/malloc.cpp b/src/common/malloc.cpp index 064c4a16c2..a84d63bcd2 100644 --- a/src/common/malloc.cpp +++ b/src/common/malloc.cpp @@ -1,14 +1,15 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "malloc.hpp" -#include "core.hpp" -#include "showmsg.hpp" #include #include #include +#include "core.hpp" +#include "showmsg.hpp" + #define FREED_POINTER 0xdeadbeafL ////////////// Memory Libraries ////////////////// diff --git a/src/common/malloc.hpp b/src/common/malloc.hpp index 40428bdbb3..128818d7e4 100644 --- a/src/common/malloc.hpp +++ b/src/common/malloc.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _MALLOC_HPP_ diff --git a/src/common/mapindex.cpp b/src/common/mapindex.cpp index 81b98abb0b..3abe8eb17a 100644 --- a/src/common/mapindex.cpp +++ b/src/common/mapindex.cpp @@ -1,14 +1,15 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "mmo.hpp" -#include "core.hpp" #include "mapindex.hpp" -#include "showmsg.hpp" -#include "strlib.hpp" #include +#include "core.hpp" +#include "mmo.hpp" +#include "showmsg.hpp" +#include "strlib.hpp" + DBMap *mapindex_db; struct _indexes { char name[MAP_NAME_LENGTH]; //Stores map name diff --git a/src/common/mapindex.hpp b/src/common/mapindex.hpp index c1a0d0546a..95db177c0e 100644 --- a/src/common/mapindex.hpp +++ b/src/common/mapindex.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _MAPINDEX_HPP_ diff --git a/src/common/md5calc.cpp b/src/common/md5calc.cpp index 840d47f999..95bea78caf 100644 --- a/src/common/md5calc.cpp +++ b/src/common/md5calc.cpp @@ -1,3 +1,6 @@ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder + /*********************************************************** * md5 calculation algorithm * @@ -6,10 +9,12 @@ * ***********************************************************/ -#include "../common/random.hpp" #include "md5calc.hpp" -#include + #include +#include + +#include "../common/random.hpp" #ifndef UINT_MAX #define UINT_MAX 4294967295U diff --git a/src/common/md5calc.hpp b/src/common/md5calc.hpp index a13282ff22..7f4619a913 100644 --- a/src/common/md5calc.hpp +++ b/src/common/md5calc.hpp @@ -1,3 +1,6 @@ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder + #ifndef _MD5CALC_HPP_ #define _MD5CALC_HPP_ diff --git a/src/common/mmo.hpp b/src/common/mmo.hpp index b188904e14..7b7716bf2e 100644 --- a/src/common/mmo.hpp +++ b/src/common/mmo.hpp @@ -1,14 +1,16 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _MMO_HPP_ #define _MMO_HPP_ -#include "cbasetypes.hpp" -#include "../config/core.hpp" -#include "db.hpp" #include +#include "../config/core.hpp" + +#include "cbasetypes.hpp" +#include "db.hpp" + #ifndef PACKETVER #error Please define PACKETVER in src/config/packets.hpp #endif diff --git a/src/common/msg_conf.cpp b/src/common/msg_conf.cpp index 471ca5da67..299d2629d7 100644 --- a/src/common/msg_conf.cpp +++ b/src/common/msg_conf.cpp @@ -1,9 +1,13 @@ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder + +#include "msg_conf.hpp" + #include -#include #include +#include #include "malloc.hpp" -#include "msg_conf.hpp" #include "showmsg.hpp" /* diff --git a/src/common/msg_conf.hpp b/src/common/msg_conf.hpp index f9a36f9b37..f26d4dba14 100644 --- a/src/common/msg_conf.hpp +++ b/src/common/msg_conf.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef MSG_CONF_HPP diff --git a/src/common/nullpo.cpp b/src/common/nullpo.cpp index 26b301ebc2..534d318cc6 100644 --- a/src/common/nullpo.cpp +++ b/src/common/nullpo.cpp @@ -1,10 +1,12 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder +#include "nullpo.hpp" + #include #include #include -#include "nullpo.hpp" + #include "showmsg.hpp" static void nullpo_info_core(const char *file, int line, const char *func, const char *fmt, va_list ap); diff --git a/src/common/nullpo.hpp b/src/common/nullpo.hpp index e7532b1a84..046de58d1d 100644 --- a/src/common/nullpo.hpp +++ b/src/common/nullpo.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _NULLPO_HPP_ diff --git a/src/common/random.cpp b/src/common/random.cpp index c7aa1d0c43..5aa42d23f0 100644 --- a/src/common/random.cpp +++ b/src/common/random.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "random.hpp" diff --git a/src/common/random.hpp b/src/common/random.hpp index 97eb7cebd8..2946bf97cd 100644 --- a/src/common/random.hpp +++ b/src/common/random.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _RANDOM_HPP_ diff --git a/src/common/showmsg.cpp b/src/common/showmsg.cpp index 694f756cd5..5ef01ddea1 100644 --- a/src/common/showmsg.cpp +++ b/src/common/showmsg.cpp @@ -1,13 +1,10 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "cbasetypes.hpp" -#include "strlib.hpp" // StringBuf #include "showmsg.hpp" -#include "core.hpp" //[Ind] - For SERVER_TYPE -#include #include // atexit +#include #ifdef WIN32 #include "winapi.hpp" @@ -39,6 +36,10 @@ #endif #endif +#include "cbasetypes.hpp" +#include "core.hpp" //[Ind] - For SERVER_TYPE +#include "strlib.hpp" // StringBuf + /////////////////////////////////////////////////////////////////////////////// /// behavioral parameter. /// when redirecting output: diff --git a/src/common/showmsg.hpp b/src/common/showmsg.hpp index 519f35489b..e99f1b1c3a 100644 --- a/src/common/showmsg.hpp +++ b/src/common/showmsg.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _SHOWMSG_HPP_ diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 5dbadf5705..59101e943d 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -1,12 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "cbasetypes.hpp" -#include "mmo.hpp" -#include "timer.hpp" -#include "malloc.hpp" -#include "showmsg.hpp" -#include "strlib.hpp" #include "socket.hpp" #include @@ -34,6 +28,13 @@ #endif #endif +#include "cbasetypes.hpp" +#include "malloc.hpp" +#include "mmo.hpp" +#include "showmsg.hpp" +#include "strlib.hpp" +#include "timer.hpp" + ///////////////////////////////////////////////////////////////////// #if defined(WIN32) ///////////////////////////////////////////////////////////////////// diff --git a/src/common/socket.hpp b/src/common/socket.hpp index 7cfaa117cd..c36294cf6e 100644 --- a/src/common/socket.hpp +++ b/src/common/socket.hpp @@ -1,11 +1,9 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _SOCKET_HPP_ #define _SOCKET_HPP_ -#include "cbasetypes.hpp" - #ifdef WIN32 #include "winapi.hpp" typedef long in_addr_t; @@ -14,9 +12,10 @@ #include #include #endif - #include +#include "cbasetypes.hpp" + #define FIFOSIZE_SERVERLINK 256*1024 // socket I/O macros diff --git a/src/common/sql.cpp b/src/common/sql.cpp index 75debe3302..b79131160f 100644 --- a/src/common/sql.cpp +++ b/src/common/sql.cpp @@ -1,18 +1,20 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder +#include "sql.hpp" + +#ifdef WIN32 +#include "winapi.hpp" +#endif + +#include +#include // strtoul + #include "cbasetypes.hpp" #include "malloc.hpp" #include "showmsg.hpp" #include "strlib.hpp" #include "timer.hpp" -#include "sql.hpp" - -#ifdef WIN32 -#include "winapi.hpp" -#endif -#include -#include // strtoul // MySQL 8.0 or later removed my_bool typedef. // Reintroduce it as a bandaid fix. diff --git a/src/common/sql.hpp b/src/common/sql.hpp index 9625e1efcd..31ce4398e0 100644 --- a/src/common/sql.hpp +++ b/src/common/sql.hpp @@ -1,12 +1,13 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _COMMON_SQL_HPP_ #define _COMMON_SQL_HPP_ -#include "cbasetypes.hpp" #include // va_list +#include "cbasetypes.hpp" + // Return codes #define SQL_ERROR -1 #define SQL_SUCCESS 0 diff --git a/src/common/strlib.cpp b/src/common/strlib.cpp index 34b77814a5..7c5a79b22f 100644 --- a/src/common/strlib.cpp +++ b/src/common/strlib.cpp @@ -1,13 +1,13 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "cbasetypes.hpp" -#include "malloc.hpp" -#include "showmsg.hpp" #include "strlib.hpp" #include +#include "cbasetypes.hpp" +#include "malloc.hpp" +#include "showmsg.hpp" #define J_MAX_MALLOC_SIZE 65535 diff --git a/src/common/strlib.hpp b/src/common/strlib.hpp index 89199c3321..0c86188077 100644 --- a/src/common/strlib.hpp +++ b/src/common/strlib.hpp @@ -1,12 +1,13 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _STRLIB_HPP_ #define _STRLIB_HPP_ -#include "cbasetypes.hpp" #include +#include "cbasetypes.hpp" + #if !defined(__USE_GNU) #define __USE_GNU // required to enable strnlen on some platforms #define __USED_GNU diff --git a/src/common/timer.cpp b/src/common/timer.cpp index 0a16bbec19..36f3322dda 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp @@ -1,12 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "cbasetypes.hpp" -#include "db.hpp" -#include "malloc.hpp" -#include "showmsg.hpp" -#include "utils.hpp" -#include "nullpo.hpp" #include "timer.hpp" #include @@ -17,6 +11,13 @@ #else #endif +#include "cbasetypes.hpp" +#include "db.hpp" +#include "malloc.hpp" +#include "nullpo.hpp" +#include "showmsg.hpp" +#include "utils.hpp" + // If the server can't handle processing thousands of monsters // or many connected clients, please increase TIMER_MIN_INTERVAL. // The official interval of 20ms is however strongly recommended, diff --git a/src/common/timer.hpp b/src/common/timer.hpp index 88533244b2..11f119f824 100644 --- a/src/common/timer.hpp +++ b/src/common/timer.hpp @@ -1,12 +1,13 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _TIMER_HPP_ #define _TIMER_HPP_ -#include "cbasetypes.hpp" #include +#include "cbasetypes.hpp" + #define DIFF_TICK(a,b) ((int)((a)-(b))) #define INVALID_TIMER -1 diff --git a/src/common/utilities.cpp b/src/common/utilities.cpp index e94ce813b5..de7db772fc 100644 --- a/src/common/utilities.cpp +++ b/src/common/utilities.cpp @@ -1,10 +1,13 @@ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder + #include "utilities.hpp" -#include -#include #include +#include #include #include //iota +#include struct cScopeTimer::sPimpl { std::chrono::steady_clock::time_point start; diff --git a/src/common/utilities.hpp b/src/common/utilities.hpp index d2f61b4e32..022a29198e 100644 --- a/src/common/utilities.hpp +++ b/src/common/utilities.hpp @@ -1,4 +1,9 @@ -#pragma once +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder + +#ifndef _UTILILITIES_HPP_ +#define _UTILILITIES_HPP_ + #include #include #include @@ -26,3 +31,5 @@ namespace rathena { } } } + +#endif /* _UTILILITIES_HPP_ */ diff --git a/src/common/utils.cpp b/src/common/utils.cpp index 2d9f3613c0..2059102523 100644 --- a/src/common/utils.cpp +++ b/src/common/utils.cpp @@ -1,14 +1,11 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "cbasetypes.hpp" -#include "showmsg.hpp" -#include "socket.hpp" #include "utils.hpp" +#include // floor() #include #include -#include // floor() #ifdef WIN32 #include "winapi.hpp" @@ -21,6 +18,9 @@ #include #endif +#include "cbasetypes.hpp" +#include "showmsg.hpp" +#include "socket.hpp" /// Dumps given buffer into file pointed to by a handle. void WriteDump(FILE* fp, const void* buffer, size_t length) diff --git a/src/common/utils.hpp b/src/common/utils.hpp index 6807182d47..c6b749f07b 100644 --- a/src/common/utils.hpp +++ b/src/common/utils.hpp @@ -1,12 +1,13 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _UTILS_HPP_ #define _UTILS_HPP_ -#include "cbasetypes.hpp" #include // FILE* +#include "cbasetypes.hpp" + // generate a hex dump of the first 'length' bytes of 'buffer' void WriteDump(FILE* fp, const void* buffer, size_t length); void ShowDump(const void* buffer, size_t length); diff --git a/src/common/winapi.cpp b/src/common/winapi.cpp index 30cf636243..ad70e5f2b4 100644 --- a/src/common/winapi.cpp +++ b/src/common/winapi.cpp @@ -1,10 +1,8 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "winapi.hpp" -#include "cbasetypes.hpp" - // Taken from https://support.microsoft.com/de-de/help/118626/how-to-determine-whether-a-thread-is-running-in-user-context-of-local bool IsCurrentUserLocalAdministrator(void){ #ifdef WIN32 diff --git a/src/common/winapi.hpp b/src/common/winapi.hpp index 910c02af8d..b26cdf5389 100644 --- a/src/common/winapi.hpp +++ b/src/common/winapi.hpp @@ -1,6 +1,8 @@ -#pragma once +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder -#include +#ifndef _WINAPI_HPP_ +#define _WINAPI_HPP_ #ifndef NTDDI_VERSION #define NTDDI_VERSION 0x05000000 // Windows 2000 @@ -34,7 +36,6 @@ #define NOSOUND #define NOTEXTMETRIC - #define _CRT_SECURE_NO_WARNINGS #define _CRT_NONSTDC_NO_WARNINGS @@ -49,3 +50,5 @@ #include "cbasetypes.hpp" bool IsCurrentUserLocalAdministrator(void); + +#endif /* _WINAPI_HPP_ */ diff --git a/src/config/classes/general.hpp b/src/config/classes/general.hpp index 50621bfa8e..dfad8091e6 100644 --- a/src/config/classes/general.hpp +++ b/src/config/classes/general.hpp @@ -1,5 +1,6 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder + #ifndef _CONFIG_GENERAL_HPP_ #define _CONFIG_GENERAL_HPP_ diff --git a/src/config/const.hpp b/src/config/const.hpp index 10837637c9..0a0879cd93 100644 --- a/src/config/const.hpp +++ b/src/config/const.hpp @@ -1,5 +1,6 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder + #ifndef _CONFIG_CONST_H_ #define _CONFIG_CONST_H_ diff --git a/src/config/core.hpp b/src/config/core.hpp index de52af7744..154e0c2a39 100644 --- a/src/config/core.hpp +++ b/src/config/core.hpp @@ -1,5 +1,6 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder + #ifndef _CONFIG_CORE_HPP_ #define _CONFIG_CORE_HPP_ diff --git a/src/config/packets.hpp b/src/config/packets.hpp index 5e9c3f35b9..44aa45c5d2 100644 --- a/src/config/packets.hpp +++ b/src/config/packets.hpp @@ -1,5 +1,6 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder + #ifndef _CONFIG_PACKETS_HPP_ #define _CONFIG_PACKETS_HPP_ diff --git a/src/config/renewal.hpp b/src/config/renewal.hpp index 2751e9ed9b..080fea23b2 100644 --- a/src/config/renewal.hpp +++ b/src/config/renewal.hpp @@ -1,5 +1,6 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder + #ifndef _CONFIG_RENEWAL_HPP_ #define _CONFIG_RENEWAL_HPP_ diff --git a/src/config/secure.hpp b/src/config/secure.hpp index b0ce6b9f95..6b42219567 100644 --- a/src/config/secure.hpp +++ b/src/config/secure.hpp @@ -1,5 +1,6 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder + #ifndef _CONFIG_SECURE_HPP_ #define _CONFIG_SECURE_HPP_ diff --git a/src/custom/atcommand.inc b/src/custom/atcommand.inc index 2095166798..9dd4a3856c 100644 --- a/src/custom/atcommand.inc +++ b/src/custom/atcommand.inc @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder /** diff --git a/src/custom/atcommand_def.inc b/src/custom/atcommand_def.inc index 300944c7fb..54d9e74ba5 100644 --- a/src/custom/atcommand_def.inc +++ b/src/custom/atcommand_def.inc @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder /** diff --git a/src/custom/battle_config_init.inc b/src/custom/battle_config_init.inc index c2a4555f2c..e47aca9be3 100644 --- a/src/custom/battle_config_init.inc +++ b/src/custom/battle_config_init.inc @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder /** diff --git a/src/custom/battle_config_struct.inc b/src/custom/battle_config_struct.inc index a527852586..805ad4c02e 100644 --- a/src/custom/battle_config_struct.inc +++ b/src/custom/battle_config_struct.inc @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder /** diff --git a/src/custom/defines_post.hpp b/src/custom/defines_post.hpp index 295dbdb47c..f5ac873a2a 100644 --- a/src/custom/defines_post.hpp +++ b/src/custom/defines_post.hpp @@ -1,5 +1,6 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder + #ifndef _CONFIG_CUSTOM_DEFINES_POST_HPP_ #define _CONFIG_CUSTOM_DEFINES_POST_HPP_ diff --git a/src/custom/defines_pre.hpp b/src/custom/defines_pre.hpp index 54c5372d48..2fb9e2db0e 100644 --- a/src/custom/defines_pre.hpp +++ b/src/custom/defines_pre.hpp @@ -1,5 +1,6 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder + #ifndef _CONFIG_CUSTOM_DEFINES_PRE_HPP_ #define _CONFIG_CUSTOM_DEFINES_PRE_HPP_ diff --git a/src/custom/script.inc b/src/custom/script.inc index 1e01c886c0..839b990cb2 100644 --- a/src/custom/script.inc +++ b/src/custom/script.inc @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder /** diff --git a/src/custom/script_def.inc b/src/custom/script_def.inc index 3319eea5e9..8863992732 100644 --- a/src/custom/script_def.inc +++ b/src/custom/script_def.inc @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder /** diff --git a/src/login/account.cpp b/src/login/account.cpp index 2297e2bfba..73b625ada3 100644 --- a/src/login/account.cpp +++ b/src/login/account.cpp @@ -1,17 +1,11 @@ -/** - * @file account.c - * Module purpose is to save, load, and update changes into the account table or file. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams < r15k - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder #include "account.hpp" +#include //min / max #include #include -#include //min / max #include "../common/malloc.hpp" #include "../common/mmo.hpp" diff --git a/src/login/account.hpp b/src/login/account.hpp index 7f6edf236f..d67ed752a8 100644 --- a/src/login/account.hpp +++ b/src/login/account.hpp @@ -1,13 +1,6 @@ -/** - * @file account.h - * Module purpose is to save, load, and update changes into the account table or file. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams < r15k - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder -#pragma once #ifndef _ACCOUNT_HPP_ #define _ACCOUNT_HPP_ diff --git a/src/login/ipban.cpp b/src/login/ipban.cpp index 66696b1cbe..3b4614062c 100644 --- a/src/login/ipban.cpp +++ b/src/login/ipban.cpp @@ -1,12 +1,5 @@ -/** - * @file ipban.c - * Module purpose is to read configuration for login-server and handle accounts, - * and also to synchronize all login interfaces: loginchrif, loginclif, logincnslif. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams < r15k - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder #include "ipban.hpp" @@ -18,6 +11,7 @@ #include "../common/sql.hpp" #include "../common/strlib.hpp" #include "../common/timer.hpp" + #include "login.hpp" #include "loginlog.hpp" diff --git a/src/login/ipban.hpp b/src/login/ipban.hpp index 9de70de326..7ee5fb678b 100644 --- a/src/login/ipban.hpp +++ b/src/login/ipban.hpp @@ -1,14 +1,6 @@ -/** - * @file ipban.h - * Module purpose is to read configuration for login-server and handle accounts, - * and also to synchronize all login interfaces: loginchrif, loginclif, logincnslif. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams < r15k - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder -#pragma once #ifndef _IPBAN_HPP_ #define _IPBAN_HPP_ diff --git a/src/login/login.cpp b/src/login/login.cpp index fc5c1736db..8ff6ee3504 100644 --- a/src/login/login.cpp +++ b/src/login/login.cpp @@ -1,12 +1,5 @@ -/** - * @file login.c - * Module purpose is to read configuration for login-server and handle accounts, - * and also to synchronize all login interfaces: loginchrif, loginclif, logincnslif. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams < r15k - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder #pragma warning(disable:4800) #include "login.hpp" @@ -15,26 +8,27 @@ #include #include +#include "../common/cli.hpp" #include "../common/core.hpp" #include "../common/db.hpp" #include "../common/malloc.hpp" #include "../common/md5calc.hpp" +#include "../common/mmo.hpp" +#include "../common/msg_conf.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" #include "../common/socket.hpp" //ip2str #include "../common/strlib.hpp" #include "../common/timer.hpp" -#include "../common/msg_conf.hpp" -#include "../common/cli.hpp" #include "../common/utils.hpp" -#include "../common/mmo.hpp" #include "../config/core.hpp" + #include "account.hpp" #include "ipban.hpp" -#include "loginlog.hpp" -#include "loginclif.hpp" #include "loginchrif.hpp" +#include "loginclif.hpp" #include "logincnslif.hpp" +#include "loginlog.hpp" #define LOGIN_MAX_MSG 30 /// Max number predefined in msg_conf static char* msg_table[LOGIN_MAX_MSG]; /// Login Server messages_conf diff --git a/src/login/login.hpp b/src/login/login.hpp index 311b38e377..4df76618d4 100644 --- a/src/login/login.hpp +++ b/src/login/login.hpp @@ -1,23 +1,15 @@ -/** - * @file login.h - * Module purpose is to read configuration for login-server and handle accounts, - * and also to synchronise all login interfaces: loginchrif, loginclif, logincnslif. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams < r15k - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder -#pragma once #ifndef _LOGIN_HPP_ #define _LOGIN_HPP_ #include -#include "../config/core.hpp" #include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" // NAME_LENGTH,SEX_* #include "../common/core.hpp" // CORE_ST_LAST +#include "../common/mmo.hpp" // NAME_LENGTH,SEX_* +#include "../config/core.hpp" #include "account.hpp" diff --git a/src/login/loginchrif.cpp b/src/login/loginchrif.cpp index cb3a634d4d..db207912fb 100644 --- a/src/login/loginchrif.cpp +++ b/src/login/loginchrif.cpp @@ -1,21 +1,15 @@ -/** - * @file loginchrif.c - * Module purpose is to handle incoming and outgoing requests with char-server. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams originally in login.c - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder #include "loginchrif.hpp" #include #include -#include "../common/timer.hpp" //difftick -#include "../common/strlib.hpp" //safeprint #include "../common/showmsg.hpp" //show notice #include "../common/socket.hpp" //wfifo session +#include "../common/strlib.hpp" //safeprint +#include "../common/timer.hpp" //difftick #include "account.hpp" #include "login.hpp" diff --git a/src/login/loginchrif.hpp b/src/login/loginchrif.hpp index 7ac1f547ed..8720074659 100644 --- a/src/login/loginchrif.hpp +++ b/src/login/loginchrif.hpp @@ -1,13 +1,6 @@ -/** - * @file loginchrif.h - * Module purpose is to handle incoming and outgoing requests with char-server. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams originally in login.c - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder -#pragma once #ifndef _LOGINCHRIF_HPP_ #define _LOGINCHRIF_HPP_ diff --git a/src/login/loginclif.cpp b/src/login/loginclif.cpp index dfaa40924d..05c5a46cea 100644 --- a/src/login/loginclif.cpp +++ b/src/login/loginclif.cpp @@ -1,31 +1,25 @@ -/** - * @file loginclif.c - * Module purpose is to handle incoming and outgoing requests with client. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams originally in login.c - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder #include "loginclif.hpp" #include #include -#include "../common/timer.hpp" //difftick -#include "../common/strlib.hpp" //safeprint -#include "../common/showmsg.hpp" //show notice -#include "../common/socket.hpp" //wfifo session #include "../common/malloc.hpp" -#include "../common/utils.hpp" #include "../common/md5calc.hpp" #include "../common/random.hpp" +#include "../common/showmsg.hpp" //show notice +#include "../common/socket.hpp" //wfifo session +#include "../common/strlib.hpp" //safeprint +#include "../common/timer.hpp" //difftick +#include "../common/utils.hpp" #include "account.hpp" #include "ipban.hpp" //ipban_check #include "login.hpp" -#include "loginlog.hpp" #include "loginchrif.hpp" +#include "loginlog.hpp" /** * Transmit auth result to client. diff --git a/src/login/loginclif.hpp b/src/login/loginclif.hpp index b5e43088a2..7351b45772 100644 --- a/src/login/loginclif.hpp +++ b/src/login/loginclif.hpp @@ -1,13 +1,6 @@ -/** - * @file loginclif.h - * Module purpose is to handle incoming and outgoing requests with client. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams originally in login.c - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder -#pragma once #ifndef _LOGINCLIF_HPP_ #define _LOGINCLIF_HPP_ diff --git a/src/login/logincnslif.cpp b/src/login/logincnslif.cpp index 820bafd262..4b931c8abc 100644 --- a/src/login/logincnslif.cpp +++ b/src/login/logincnslif.cpp @@ -1,24 +1,18 @@ -/** - * @file logincnslif.c - * Module purpose is to handle incoming and outgoing requests with console. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams originally in login.c - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder #include "logincnslif.hpp" #include #include +#include "../common/cli.hpp" +#include "../common/ers.hpp" +#include "../common/md5calc.hpp" #include "../common/mmo.hpp" //cbasetype + NAME_LENGTH #include "../common/showmsg.hpp" //show notice -#include "../common/md5calc.hpp" -#include "../common/ers.hpp" -#include "../common/cli.hpp" -#include "../common/timer.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "login.hpp" diff --git a/src/login/logincnslif.hpp b/src/login/logincnslif.hpp index 00c31a5005..197021bcb2 100644 --- a/src/login/logincnslif.hpp +++ b/src/login/logincnslif.hpp @@ -1,17 +1,9 @@ -/** - * @file logincnslif.h - * Module purpose is to handle incoming and outgoing requests with console. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams originally in login.c - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder -#pragma once #ifndef _LOGINCNSLIF_HPP_ #define _LOGINCNSLIF_HPP_ - /** * Console Command Parser * Transmited from command cli.cpp diff --git a/src/login/loginlog.cpp b/src/login/loginlog.cpp index a0784acbf8..2591b53990 100644 --- a/src/login/loginlog.cpp +++ b/src/login/loginlog.cpp @@ -1,11 +1,5 @@ -/** - * @file loginlog.c - * Module purpose is to register (log) events into a file or sql database. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams rev < 15k - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder #include "loginlog.hpp" @@ -14,10 +8,10 @@ #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" +#include "../common/showmsg.hpp" #include "../common/socket.hpp" #include "../common/sql.hpp" #include "../common/strlib.hpp" -#include "../common/showmsg.hpp" // global sql settings (in ipban_sql.c) static char global_db_hostname[64] = "127.0.0.1"; // Doubled to reflect the change on commit #0f2dd7f diff --git a/src/login/loginlog.hpp b/src/login/loginlog.hpp index 73b03a2cde..74d57575b6 100644 --- a/src/login/loginlog.hpp +++ b/src/login/loginlog.hpp @@ -1,13 +1,6 @@ -/** - * @file loginlog.h - * Module purpose is to register (log) events into a file or sql database. - * Licensed under GNU GPL. - * For more information, see LICENCE in the main folder. - * @author Athena Dev Teams rev < 15k - * @author rAthena Dev Team - */ +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL +// For more information, see LICENCE in the main folder -#pragma once #ifndef _LOGINLOG_HPP_ #define _LOGINLOG_HPP_ diff --git a/src/map/achievement.cpp b/src/map/achievement.cpp index beefe9b53c..41688976f2 100644 --- a/src/map/achievement.cpp +++ b/src/map/achievement.cpp @@ -1,13 +1,13 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "achievement.hpp" #include +#include #include #include #include -#include #include #include "../common/cbasetypes.hpp" @@ -23,10 +23,10 @@ #include "intif.hpp" #include "itemdb.hpp" #include "map.hpp" +#include "npc.hpp" #include "pc.hpp" #include "script.hpp" #include "status.hpp" -#include "npc.hpp" static jmp_buf av_error_jump; static char* av_error_msg; diff --git a/src/map/achievement.hpp b/src/map/achievement.hpp index 7e4c288cfb..54ca33a527 100644 --- a/src/map/achievement.hpp +++ b/src/map/achievement.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _ACHIEVEMENT_HPP_ diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index ea3249d252..0059ee1425 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -1,54 +1,54 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "atcommand.hpp" -#include #include +#include #include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" #include "../common/cli.hpp" -#include "../common/timer.hpp" -#include "../common/nullpo.hpp" -#include "../common/showmsg.hpp" +#include "../common/conf.hpp" #include "../common/malloc.hpp" +#include "../common/mmo.hpp" +#include "../common/nullpo.hpp" #include "../common/random.hpp" +#include "../common/showmsg.hpp" #include "../common/socket.hpp" #include "../common/strlib.hpp" -#include "../common/utils.hpp" +#include "../common/timer.hpp" #include "../common/utilities.hpp" -#include "../common/conf.hpp" +#include "../common/utils.hpp" -#include "map.hpp" +#include "achievement.hpp" #include "battle.hpp" -#include "chat.hpp" #include "channel.hpp" +#include "chat.hpp" #include "chrif.hpp" +#include "clan.hpp" +#include "clif.hpp" #include "duel.hpp" +#include "elemental.hpp" +#include "guild.hpp" +#include "homunculus.hpp" #include "instance.hpp" #include "intif.hpp" -#include "pet.hpp" -#include "homunculus.hpp" +#include "itemdb.hpp" // MAX_ITEMGROUP +#include "log.hpp" #include "mail.hpp" +#include "map.hpp" +#include "mapreg.hpp" #include "mercenary.hpp" -#include "elemental.hpp" +#include "mob.hpp" +#include "npc.hpp" #include "party.hpp" +#include "pc.hpp" +#include "pc_groups.hpp" +#include "pet.hpp" +#include "quest.hpp" #include "script.hpp" #include "storage.hpp" #include "trade.hpp" -#include "mapreg.hpp" -#include "quest.hpp" -#include "pc.hpp" -#include "pc_groups.hpp" -#include "npc.hpp" -#include "guild.hpp" -#include "clif.hpp" -#include "log.hpp" -#include "itemdb.hpp" // MAX_ITEMGROUP -#include "mob.hpp" -#include "achievement.hpp" -#include "clan.hpp" #define ATCOMMAND_LENGTH 50 #define ACMD_FUNC(x) static int atcommand_ ## x (const int fd, struct map_session_data* sd, const char* command, const char* message) diff --git a/src/map/atcommand.hpp b/src/map/atcommand.hpp index b8f762bd59..fbcaffe510 100644 --- a/src/map/atcommand.hpp +++ b/src/map/atcommand.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _ATCOMMAND_HPP_ diff --git a/src/map/battle.cpp b/src/map/battle.cpp index f36a76956d..590a07e65a 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -1,37 +1,37 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "battle.hpp" -#include #include +#include #include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" -#include "../common/nullpo.hpp" -#include "../common/malloc.hpp" -#include "../common/showmsg.hpp" #include "../common/ers.hpp" +#include "../common/malloc.hpp" +#include "../common/nullpo.hpp" #include "../common/random.hpp" +#include "../common/showmsg.hpp" #include "../common/socket.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "../common/utils.hpp" -#include "map.hpp" -#include "path.hpp" -#include "pc.hpp" -#include "homunculus.hpp" -#include "mercenary.hpp" -#include "elemental.hpp" -#include "pet.hpp" -#include "party.hpp" #include "battleground.hpp" #include "chrif.hpp" -#include "guild.hpp" #include "clif.hpp" -#include "mob.hpp" +#include "elemental.hpp" +#include "guild.hpp" +#include "homunculus.hpp" #include "log.hpp" +#include "map.hpp" +#include "mercenary.hpp" +#include "mob.hpp" +#include "party.hpp" +#include "path.hpp" +#include "pc.hpp" #include "pc_groups.hpp" +#include "pet.hpp" int attr_fix_table[MAX_ELE_LEVEL][ELE_MAX][ELE_MAX]; diff --git a/src/map/battle.hpp b/src/map/battle.hpp index 5bcf65ee41..ca4e38e1fb 100644 --- a/src/map/battle.hpp +++ b/src/map/battle.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _BATTLE_HPP_ @@ -6,7 +6,6 @@ #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" - #include "../config/core.hpp" #include "map.hpp" //ELE_MAX diff --git a/src/map/battleground.cpp b/src/map/battleground.cpp index 3f7316741d..6fe752c098 100644 --- a/src/map/battleground.cpp +++ b/src/map/battleground.cpp @@ -1,24 +1,24 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "battleground.hpp" #include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" #include "../common/malloc.hpp" #include "../common/nullpo.hpp" #include "../common/showmsg.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "battle.hpp" #include "clif.hpp" +#include "guild.hpp" +#include "homunculus.hpp" +#include "mercenary.hpp" +#include "mob.hpp" #include "npc.hpp" #include "pc.hpp" #include "pet.hpp" -#include "homunculus.hpp" -#include "mercenary.hpp" -#include "guild.hpp" -#include "mob.hpp" static DBMap* bg_team_db; // int bg_id -> struct battleground_data* static unsigned int bg_team_counter = 0; // Next bg_id diff --git a/src/map/battleground.hpp b/src/map/battleground.hpp index 36de4f245f..65bee90594 100644 --- a/src/map/battleground.hpp +++ b/src/map/battleground.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _BATTLEGROUND_HPP_ diff --git a/src/map/buyingstore.cpp b/src/map/buyingstore.cpp index 8b1656ce77..dcaa14f2bf 100644 --- a/src/map/buyingstore.cpp +++ b/src/map/buyingstore.cpp @@ -1,13 +1,13 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "buyingstore.hpp" // struct s_buyingstore #include // atoi -#include "../common/nullpo.hpp" #include "../common/db.hpp" // ARR_FIND #include "../common/malloc.hpp" // aMalloc, aFree +#include "../common/nullpo.hpp" #include "../common/showmsg.hpp" // ShowWarning #include "../common/socket.hpp" // RBUF* #include "../common/strlib.hpp" // safestrncpy @@ -15,11 +15,11 @@ #include "atcommand.hpp" // msg_txt #include "battle.hpp" // battle_config.* +#include "chrif.hpp" #include "clif.hpp" // clif_buyingstore_* #include "log.hpp" // log_pick_pc, log_zeny -#include "pc.hpp" // struct map_session_data -#include "chrif.hpp" #include "npc.hpp" +#include "pc.hpp" // struct map_session_data //Autotrader static DBMap *buyingstore_autotrader_db; /// Holds autotrader info: char_id -> struct s_autotrader diff --git a/src/map/buyingstore.hpp b/src/map/buyingstore.hpp index 860cfdb610..2737de9eec 100644 --- a/src/map/buyingstore.hpp +++ b/src/map/buyingstore.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _BUYINGSTORE_HPP_ @@ -69,4 +69,4 @@ void do_init_buyingstore(void); void do_init_buyingstore_autotrade( void ); void buyingstore_reopen( struct map_session_data* sd ); -#endif // _BUYINGSTORE_HPP_ +#endif /* _BUYINGSTORE_HPP_ */ diff --git a/src/map/cashshop.cpp b/src/map/cashshop.cpp index 5c554ff1ae..b47bb27c73 100644 --- a/src/map/cashshop.cpp +++ b/src/map/cashshop.cpp @@ -1,19 +1,19 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "cashshop.hpp" -#include // memset #include // atoi +#include // memset #include "../common/cbasetypes.hpp" // uint16, uint32 #include "../common/malloc.hpp" // CREATE, RECREATE, aFree #include "../common/showmsg.hpp" // ShowWarning, ShowStatus -#include "pc.hpp" // s_map_session_data -#include "pet.hpp" // pet_create_egg #include "clif.hpp" #include "log.hpp" +#include "pc.hpp" // s_map_session_data +#include "pet.hpp" // pet_create_egg struct cash_item_db cash_shop_items[CASHSHOP_TAB_MAX]; #if PACKETVER_SUPPORTS_SALES diff --git a/src/map/cashshop.hpp b/src/map/cashshop.hpp index a8240823cf..b0ef4c9bf0 100644 --- a/src/map/cashshop.hpp +++ b/src/map/cashshop.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CASHSHOP_HPP_ @@ -6,7 +6,6 @@ #include "../common/cbasetypes.hpp" // uint16, uint32 #include "../common/timer.hpp" // ShowWarning, ShowStatus - #include "../config/core.hpp" struct map_session_data; diff --git a/src/map/channel.cpp b/src/map/channel.cpp index 10888365b6..cdb225f6cf 100644 --- a/src/map/channel.cpp +++ b/src/map/channel.cpp @@ -6,20 +6,20 @@ #include #include "../common/cbasetypes.hpp" -#include "../common/malloc.hpp" #include "../common/conf.hpp" //libconfig -#include "../common/showmsg.hpp" -#include "../common/strlib.hpp" //safestrncpy -#include "../common/socket.hpp" //set_eof -#include "../common/timer.hpp" // DIFF_TICK +#include "../common/malloc.hpp" #include "../common/nullpo.hpp" +#include "../common/showmsg.hpp" +#include "../common/socket.hpp" //set_eof +#include "../common/strlib.hpp" //safestrncpy +#include "../common/timer.hpp" // DIFF_TICK -#include "map.hpp" //msg_conf -#include "clif.hpp" //clif_chsys_msg -#include "pc.hpp" -#include "guild.hpp" -#include "pc_groups.hpp" #include "battle.hpp" +#include "clif.hpp" //clif_chsys_msg +#include "guild.hpp" +#include "map.hpp" //msg_conf +#include "pc.hpp" +#include "pc_groups.hpp" static DBMap* channel_db; // channels diff --git a/src/map/channel.hpp b/src/map/channel.hpp index 0b29dcf04a..e19bcbae7a 100644 --- a/src/map/channel.hpp +++ b/src/map/channel.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef CHANNEL_H -#define CHANNEL_H +#ifndef _CHANNEL_HPP_ +#define _CHANNEL_HPP_ #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" @@ -128,4 +128,4 @@ int channel_pcsetopt(struct map_session_data *sd, char *chname, const char *opti void do_init_channel(void); void do_final_channel(void); -#endif /* CHANNEL_H */ +#endif /* _CHANNEL_HPP_ */ diff --git a/src/map/chat.cpp b/src/map/chat.cpp index 65d819c891..c8a29c63a9 100644 --- a/src/map/chat.cpp +++ b/src/map/chat.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "chat.hpp" @@ -7,19 +7,19 @@ #include "../common/cbasetypes.hpp" #include "../common/malloc.hpp" +#include "../common/mmo.hpp" #include "../common/nullpo.hpp" #include "../common/showmsg.hpp" #include "../common/strlib.hpp" -#include "../common/mmo.hpp" -#include "map.hpp" +#include "achievement.hpp" #include "atcommand.hpp" // msg_txt() #include "battle.hpp" // struct battle_config #include "clif.hpp" +#include "map.hpp" #include "npc.hpp" // npc_event_do() #include "pc.hpp" #include "pc_groups.hpp" -#include "achievement.hpp" int chat_triggerevent(struct chat_data *cd); // forward declaration diff --git a/src/map/chat.hpp b/src/map/chat.hpp index b69697d632..2a323e89a6 100644 --- a/src/map/chat.hpp +++ b/src/map/chat.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CHAT_HPP_ diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp index a2937ea2f9..d6cad6d701 100644 --- a/src/map/chrif.cpp +++ b/src/map/chrif.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "chrif.hpp" @@ -7,31 +7,31 @@ #include #include "../common/cbasetypes.hpp" +#include "../common/ers.hpp" #include "../common/malloc.hpp" -#include "../common/socket.hpp" -#include "../common/timer.hpp" #include "../common/nullpo.hpp" #include "../common/showmsg.hpp" +#include "../common/socket.hpp" #include "../common/strlib.hpp" -#include "../common/ers.hpp" +#include "../common/timer.hpp" -#include "map.hpp" #include "battle.hpp" #include "clan.hpp" #include "clif.hpp" +#include "elemental.hpp" +#include "guild.hpp" +#include "homunculus.hpp" +#include "instance.hpp" #include "intif.hpp" +#include "log.hpp" +#include "map.hpp" +#include "mercenary.hpp" #include "npc.hpp" #include "pc.hpp" #include "pc_groups.hpp" #include "pet.hpp" -#include "homunculus.hpp" -#include "instance.hpp" -#include "mercenary.hpp" -#include "elemental.hpp" #include "script.hpp" // script_config #include "storage.hpp" -#include "guild.hpp" -#include "log.hpp" static int check_connect_char_server(int tid, unsigned int tick, int id, intptr_t data); diff --git a/src/map/chrif.hpp b/src/map/chrif.hpp index 16990428f2..5e7bd188f8 100644 --- a/src/map/chrif.hpp +++ b/src/map/chrif.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CHRIF_HPP_ diff --git a/src/map/clan.cpp b/src/map/clan.cpp index 7840a28627..ec05704ff0 100644 --- a/src/map/clan.cpp +++ b/src/map/clan.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "clan.hpp" @@ -6,17 +6,17 @@ #include //memset #include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" #include "../common/malloc.hpp" +#include "../common/mmo.hpp" #include "../common/nullpo.hpp" #include "../common/showmsg.hpp" #include "clif.hpp" #include "intif.hpp" +#include "log.hpp" #include "pc.hpp" #include "script.hpp" #include "status.hpp" -#include "log.hpp" static DBMap* clan_db; // int clan_id -> struct clan* diff --git a/src/map/clan.hpp b/src/map/clan.hpp index 5b4309d4ac..f2b90ab804 100644 --- a/src/map/clan.hpp +++ b/src/map/clan.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CLAN_HPP_ @@ -23,4 +23,4 @@ void clan_recv_message(int clan_id,uint32 account_id,const char *mes,int len); struct map_session_data* clan_getavailablesd( struct clan* clan ); int clan_get_alliance_count( struct clan *clan, int flag ); -#endif /* CLAN_H */ +#endif /* _CLAN_HPP_ */ diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 7ae702bb3d..71ce9b96a7 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -1,61 +1,61 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "clif.hpp" +#include #include #include #include -#include #include #include "../common/cbasetypes.hpp" -#include "../common/socket.hpp" -#include "../common/timer.hpp" +#include "../common/conf.hpp" +#include "../common/ers.hpp" #include "../common/grfio.hpp" #include "../common/malloc.hpp" #include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" +#include "../common/socket.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "../common/utils.hpp" -#include "../common/ers.hpp" -#include "../common/conf.hpp" -#include "map.hpp" -#include "chrif.hpp" -#include "pc.hpp" -#include "pc_groups.hpp" -#include "status.hpp" -#include "npc.hpp" -#include "itemdb.hpp" -#include "chat.hpp" -#include "trade.hpp" -#include "storage.hpp" -#include "script.hpp" -#include "skill.hpp" +#include "achievement.hpp" #include "atcommand.hpp" -#include "intif.hpp" #include "battle.hpp" #include "battleground.hpp" -#include "mob.hpp" -#include "party.hpp" -#include "unit.hpp" -#include "guild.hpp" -#include "vending.hpp" -#include "pet.hpp" -#include "homunculus.hpp" -#include "instance.hpp" -#include "mercenary.hpp" -#include "elemental.hpp" -#include "log.hpp" -#include "clif.hpp" -#include "mail.hpp" -#include "quest.hpp" #include "cashshop.hpp" #include "channel.hpp" -#include "achievement.hpp" +#include "chat.hpp" +#include "chrif.hpp" #include "clan.hpp" +#include "clif.hpp" +#include "elemental.hpp" +#include "guild.hpp" +#include "homunculus.hpp" +#include "instance.hpp" +#include "intif.hpp" +#include "itemdb.hpp" +#include "log.hpp" +#include "mail.hpp" +#include "map.hpp" +#include "mercenary.hpp" +#include "mob.hpp" +#include "npc.hpp" +#include "party.hpp" +#include "pc.hpp" +#include "pc_groups.hpp" +#include "pet.hpp" +#include "quest.hpp" +#include "script.hpp" +#include "skill.hpp" +#include "status.hpp" +#include "storage.hpp" +#include "trade.hpp" +#include "unit.hpp" +#include "vending.hpp" /* for clif_clearunit_delayed */ static struct eri *delay_clearunit_ers; diff --git a/src/map/clif.hpp b/src/map/clif.hpp index dfa29fe5ca..1531106593 100644 --- a/src/map/clif.hpp +++ b/src/map/clif.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CLIF_HPP_ diff --git a/src/map/clif_obfuscation.hpp b/src/map/clif_obfuscation.hpp index 02219f654e..953131f9bd 100644 --- a/src/map/clif_obfuscation.hpp +++ b/src/map/clif_obfuscation.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CLIF_OBFUSCATION_HPP_ diff --git a/src/map/clif_packetdb.hpp b/src/map/clif_packetdb.hpp index 296234954b..4a753132b8 100644 --- a/src/map/clif_packetdb.hpp +++ b/src/map/clif_packetdb.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CLIF_PACKETDB_HPP_ diff --git a/src/map/clif_shuffle.hpp b/src/map/clif_shuffle.hpp index f7ef14f917..baea719e54 100644 --- a/src/map/clif_shuffle.hpp +++ b/src/map/clif_shuffle.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _CLIF_SHUFFLE_HPP_ diff --git a/src/map/date.cpp b/src/map/date.cpp index dca9bea1df..b93399ccf8 100644 --- a/src/map/date.cpp +++ b/src/map/date.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "date.hpp" diff --git a/src/map/date.hpp b/src/map/date.hpp index c12d78fe9e..96016ebcac 100644 --- a/src/map/date.hpp +++ b/src/map/date.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _DATE_HPP_ diff --git a/src/map/duel.cpp b/src/map/duel.cpp index 858519033c..321a55c0ff 100644 --- a/src/map/duel.cpp +++ b/src/map/duel.cpp @@ -1,6 +1,5 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -// Duel organizing functions [LuzZza] #include "duel.hpp" @@ -12,9 +11,9 @@ #include "../common/timer.hpp" #include "atcommand.hpp" // msg_txt +#include "battle.hpp" #include "clif.hpp" #include "pc.hpp" -#include "battle.hpp" //std::recursive_mutex> duel_list_mutex; //preparation for multithread std::unordered_map duel_list; diff --git a/src/map/duel.hpp b/src/map/duel.hpp index fad6c4338c..2589db8cc5 100644 --- a/src/map/duel.hpp +++ b/src/map/duel.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #pragma once #ifndef _DUEL_HPP_ diff --git a/src/map/elemental.cpp b/src/map/elemental.cpp index 7699f64b1b..933f0dfa69 100644 --- a/src/map/elemental.cpp +++ b/src/map/elemental.cpp @@ -1,32 +1,32 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "elemental.hpp" -#include -#include -#include //floor #include +#include //floor +#include +#include #include "../common/cbasetypes.hpp" #include "../common/malloc.hpp" -#include "../common/timer.hpp" -#include "../common/nullpo.hpp" #include "../common/mmo.hpp" -#include "../common/showmsg.hpp" +#include "../common/nullpo.hpp" #include "../common/random.hpp" +#include "../common/showmsg.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "../common/utils.hpp" -#include "log.hpp" +#include "battle.hpp" #include "clif.hpp" #include "intif.hpp" #include "itemdb.hpp" -#include "pc.hpp" -#include "party.hpp" -#include "trade.hpp" +#include "log.hpp" #include "npc.hpp" -#include "battle.hpp" +#include "party.hpp" +#include "pc.hpp" +#include "trade.hpp" struct s_elemental_db elemental_db[MAX_ELEMENTAL_CLASS]; // Elemental Database static uint16 elemental_count; diff --git a/src/map/elemental.hpp b/src/map/elemental.hpp index 82b911ad64..d86ac3208b 100644 --- a/src/map/elemental.hpp +++ b/src/map/elemental.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _ELEMENTAL_HPP_ diff --git a/src/map/guild.cpp b/src/map/guild.cpp index 196c3dcb2d..d781726ec3 100644 --- a/src/map/guild.cpp +++ b/src/map/guild.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "guild.hpp" @@ -6,27 +6,27 @@ #include #include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" -#include "../common/nullpo.hpp" +#include "../common/ers.hpp" #include "../common/malloc.hpp" #include "../common/mapindex.hpp" +#include "../common/nullpo.hpp" #include "../common/showmsg.hpp" -#include "../common/ers.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "../common/utils.hpp" -#include "map.hpp" -#include "storage.hpp" #include "battle.hpp" -#include "npc.hpp" -#include "pc.hpp" +#include "channel.hpp" +#include "clif.hpp" #include "instance.hpp" #include "intif.hpp" -#include "channel.hpp" #include "log.hpp" -#include "trade.hpp" -#include "clif.hpp" +#include "map.hpp" #include "mob.hpp" +#include "npc.hpp" +#include "pc.hpp" +#include "storage.hpp" +#include "trade.hpp" static DBMap* guild_db; // int guild_id -> struct guild* static DBMap* castle_db; // int castle_id -> struct guild_castle* diff --git a/src/map/guild.hpp b/src/map/guild.hpp index 7553d154f7..39e8cef5be 100644 --- a/src/map/guild.hpp +++ b/src/map/guild.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _GUILD_HPP_ diff --git a/src/map/homunculus.cpp b/src/map/homunculus.cpp index 484ad791c4..488bf0bd60 100644 --- a/src/map/homunculus.cpp +++ b/src/map/homunculus.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "homunculus.hpp" @@ -7,23 +7,23 @@ #include "../common/cbasetypes.hpp" #include "../common/malloc.hpp" -#include "../common/timer.hpp" -#include "../common/nullpo.hpp" #include "../common/mmo.hpp" +#include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "../common/utils.hpp" -#include "log.hpp" +#include "battle.hpp" #include "clif.hpp" #include "intif.hpp" #include "itemdb.hpp" -#include "pc.hpp" -#include "party.hpp" -#include "trade.hpp" +#include "log.hpp" #include "npc.hpp" -#include "battle.hpp" +#include "party.hpp" +#include "pc.hpp" +#include "trade.hpp" struct s_homunculus_db homunculus_db[MAX_HOMUNCULUS_CLASS]; //[orn] struct homun_skill_tree_entry hskill_tree[MAX_HOMUNCULUS_CLASS][MAX_HOM_SKILL_TREE]; diff --git a/src/map/homunculus.hpp b/src/map/homunculus.hpp index 5460a3d23c..e6fb9c1ef7 100644 --- a/src/map/homunculus.hpp +++ b/src/map/homunculus.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _HOMUNCULUS_HPP_ diff --git a/src/map/instance.cpp b/src/map/instance.cpp index 46731bc3f5..120a0a7168 100644 --- a/src/map/instance.cpp +++ b/src/map/instance.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "instance.hpp" @@ -6,14 +6,14 @@ #include #include "../common/cbasetypes.hpp" -#include "../common/socket.hpp" -#include "../common/timer.hpp" +#include "../common/db.hpp" +#include "../common/ers.hpp" // ers_destroy +#include "../common/malloc.hpp" #include "../common/nullpo.hpp" #include "../common/showmsg.hpp" +#include "../common/socket.hpp" #include "../common/strlib.hpp" -#include "../common/db.hpp" -#include "../common/malloc.hpp" -#include "../common/ers.hpp" // ers_destroy +#include "../common/timer.hpp" #include "clan.hpp" #include "clif.hpp" diff --git a/src/map/instance.hpp b/src/map/instance.hpp index 8c47f7c40d..27f5639733 100644 --- a/src/map/instance.hpp +++ b/src/map/instance.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INSTANCE_HPP_ diff --git a/src/map/intif.cpp b/src/map/intif.cpp index e588ac7143..fceb509ee0 100644 --- a/src/map/intif.cpp +++ b/src/map/intif.cpp @@ -1,36 +1,36 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "intif.hpp" #include +#include "../common/malloc.hpp" +#include "../common/mmo.hpp" +#include "../common/nullpo.hpp" #include "../common/showmsg.hpp" #include "../common/socket.hpp" -#include "../common/nullpo.hpp" -#include "../common/malloc.hpp" #include "../common/strlib.hpp" -#include "../common/mmo.hpp" #include "../common/timer.hpp" -#include "map.hpp" +#include "achievement.hpp" #include "battle.hpp" #include "chrif.hpp" #include "clan.hpp" -#include "guild.hpp" #include "clif.hpp" -#include "pc.hpp" -#include "storage.hpp" -#include "party.hpp" -#include "pet.hpp" -#include "mercenary.hpp" -#include "homunculus.hpp" #include "elemental.hpp" +#include "guild.hpp" +#include "homunculus.hpp" +#include "log.hpp" #include "mail.hpp" +#include "map.hpp" +#include "mercenary.hpp" +#include "party.hpp" +#include "pc.hpp" +#include "pet.hpp" #include "quest.hpp" #include "status.hpp" -#include "achievement.hpp" -#include "log.hpp" +#include "storage.hpp" /// Received packet Lengths from inter-server static const int packet_len_table[] = { diff --git a/src/map/intif.hpp b/src/map/intif.hpp index 2222afdf84..ab1647db6d 100644 --- a/src/map/intif.hpp +++ b/src/map/intif.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _INTIF_HPP_ diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp index 898513da34..6593567d37 100644 --- a/src/map/itemdb.cpp +++ b/src/map/itemdb.cpp @@ -1,12 +1,12 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "itemdb.hpp" #include -#include "../common/nullpo.hpp" #include "../common/malloc.hpp" +#include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" #include "../common/strlib.hpp" @@ -14,12 +14,12 @@ #include "battle.hpp" // struct battle_config #include "cashshop.hpp" -#include "intif.hpp" -#include "pc.hpp" -#include "status.hpp" #include "clif.hpp" +#include "intif.hpp" #include "log.hpp" #include "mob.hpp" +#include "pc.hpp" +#include "status.hpp" static DBMap *itemdb; /// Item DB static DBMap *itemdb_combo; /// Item Combo DB diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index 0fea7b2e05..bf37742233 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _ITEMDB_HPP_ diff --git a/src/map/log.cpp b/src/map/log.cpp index cd7453f6a2..f1b164aadb 100644 --- a/src/map/log.cpp +++ b/src/map/log.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "log.hpp" @@ -6,18 +6,18 @@ #include #include "../common/cbasetypes.hpp" -#include "../common/sql.hpp" // SQL_INNODB -#include "../common/strlib.hpp" #include "../common/nullpo.hpp" #include "../common/showmsg.hpp" +#include "../common/sql.hpp" // SQL_INNODB +#include "../common/strlib.hpp" -#include "map.hpp" #include "battle.hpp" -#include "itemdb.hpp" #include "homunculus.hpp" +#include "itemdb.hpp" +#include "map.hpp" #include "mob.hpp" -#include "pet.hpp" #include "pc.hpp" +#include "pet.hpp" static char log_timestamp_format[20]; diff --git a/src/map/log.hpp b/src/map/log.hpp index 6dc3114974..5f89bd9b64 100644 --- a/src/map/log.hpp +++ b/src/map/log.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _LOG_HPP_ diff --git a/src/map/mail.cpp b/src/map/mail.cpp index 3a028b8580..94bf1650e8 100644 --- a/src/map/mail.cpp +++ b/src/map/mail.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "mail.hpp" @@ -9,13 +9,13 @@ #include "../common/timer.hpp" #include "atcommand.hpp" -#include "itemdb.hpp" -#include "clif.hpp" -#include "pc.hpp" -#include "intif.hpp" -#include "date.hpp" // date_get_dayofyear -#include "log.hpp" #include "battle.hpp" +#include "clif.hpp" +#include "date.hpp" // date_get_dayofyear +#include "intif.hpp" +#include "itemdb.hpp" +#include "log.hpp" +#include "pc.hpp" void mail_clear(struct map_session_data *sd) { diff --git a/src/map/mail.hpp b/src/map/mail.hpp index 25796113e0..d1d1ed0733 100644 --- a/src/map/mail.hpp +++ b/src/map/mail.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _MAIL_HPP_ diff --git a/src/map/map.cpp b/src/map/map.cpp index cf30daffca..328ff77227 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "map.hpp" @@ -7,47 +7,47 @@ #include #include "../common/cbasetypes.hpp" +#include "../common/cli.hpp" #include "../common/core.hpp" -#include "../common/timer.hpp" +#include "../common/ers.hpp" #include "../common/grfio.hpp" #include "../common/malloc.hpp" -#include "../common/socket.hpp" // WFIFO*() -#include "../common/showmsg.hpp" #include "../common/nullpo.hpp" #include "../common/random.hpp" +#include "../common/showmsg.hpp" +#include "../common/socket.hpp" // WFIFO*() #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "../common/utils.hpp" -#include "../common/cli.hpp" -#include "../common/ers.hpp" -#include "path.hpp" +#include "achievement.hpp" +#include "atcommand.hpp" +#include "battle.hpp" +#include "battleground.hpp" +#include "cashshop.hpp" +#include "channel.hpp" +#include "chat.hpp" #include "chrif.hpp" #include "clan.hpp" #include "clif.hpp" #include "duel.hpp" -#include "intif.hpp" -#include "npc.hpp" -#include "pc.hpp" -#include "chat.hpp" -#include "storage.hpp" -#include "trade.hpp" -#include "party.hpp" -#include "battleground.hpp" -#include "quest.hpp" -#include "mapreg.hpp" -#include "pet.hpp" +#include "elemental.hpp" +#include "guild.hpp" #include "homunculus.hpp" #include "instance.hpp" -#include "mercenary.hpp" -#include "elemental.hpp" -#include "cashshop.hpp" -#include "channel.hpp" -#include "achievement.hpp" -#include "guild.hpp" -#include "atcommand.hpp" -#include "battle.hpp" +#include "intif.hpp" #include "log.hpp" +#include "mapreg.hpp" +#include "mercenary.hpp" #include "mob.hpp" +#include "npc.hpp" +#include "party.hpp" +#include "path.hpp" +#include "pc.hpp" +#include "pet.hpp" +#include "quest.hpp" +#include "storage.hpp" +#include "trade.hpp" char default_codepage[32] = ""; diff --git a/src/map/map.hpp b/src/map/map.hpp index cfb6b8b996..ae90e4b6a7 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _MAP_HPP_ @@ -8,11 +8,10 @@ #include "../common/cbasetypes.hpp" #include "../common/core.hpp" // CORE_ST_LAST -#include "../common/mmo.hpp" -#include "../common/mapindex.hpp" #include "../common/db.hpp" +#include "../common/mapindex.hpp" +#include "../common/mmo.hpp" #include "../common/msg_conf.hpp" - #include "../config/core.hpp" struct npc_data; diff --git a/src/map/mapreg.cpp b/src/map/mapreg.cpp index 94ddf2b15e..9b20dd384e 100644 --- a/src/map/mapreg.cpp +++ b/src/map/mapreg.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "mapreg.hpp" diff --git a/src/map/mapreg.hpp b/src/map/mapreg.hpp index 8b757e5a78..49b0e65288 100644 --- a/src/map/mapreg.hpp +++ b/src/map/mapreg.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _MAPREG_HPP_ diff --git a/src/map/mercenary.cpp b/src/map/mercenary.cpp index b31a8a4b9f..8cfc14c4c5 100644 --- a/src/map/mercenary.cpp +++ b/src/map/mercenary.cpp @@ -1,32 +1,31 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "mercenary.hpp" -#include #include #include - -#include "../common/utilities.hpp" +#include #include "../common/cbasetypes.hpp" #include "../common/malloc.hpp" -#include "../common/timer.hpp" -#include "../common/nullpo.hpp" #include "../common/mmo.hpp" +#include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" +#include "../common/utilities.hpp" #include "../common/utils.hpp" -#include "log.hpp" #include "clif.hpp" #include "intif.hpp" #include "itemdb.hpp" -#include "pc.hpp" -#include "party.hpp" -#include "trade.hpp" +#include "log.hpp" #include "npc.hpp" +#include "party.hpp" +#include "pc.hpp" +#include "trade.hpp" using namespace rathena; diff --git a/src/map/mercenary.hpp b/src/map/mercenary.hpp index 1b2139f73b..eff865fdaf 100644 --- a/src/map/mercenary.hpp +++ b/src/map/mercenary.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _MERCENARY_HPP_ diff --git a/src/map/mob.cpp b/src/map/mob.cpp index beb38d3c47..f228ec1bad 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -1,46 +1,44 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "mob.hpp" -#include +#include #include #include - -#include "../common/utilities.hpp" +#include +#include +#include #include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" #include "../common/db.hpp" -#include "../common/nullpo.hpp" -#include "../common/malloc.hpp" -#include "../common/showmsg.hpp" #include "../common/ers.hpp" +#include "../common/malloc.hpp" +#include "../common/nullpo.hpp" #include "../common/random.hpp" -#include "../common/strlib.hpp" -#include "../common/utils.hpp" +#include "../common/showmsg.hpp" #include "../common/socket.hpp" +#include "../common/strlib.hpp" +#include "../common/timer.hpp" +#include "../common/utilities.hpp" +#include "../common/utils.hpp" -#include "map.hpp" -#include "path.hpp" +#include "achievement.hpp" +#include "battle.hpp" #include "clif.hpp" +#include "elemental.hpp" +#include "guild.hpp" +#include "homunculus.hpp" #include "intif.hpp" +#include "log.hpp" +#include "map.hpp" +#include "mercenary.hpp" +#include "npc.hpp" +#include "party.hpp" +#include "path.hpp" #include "pc.hpp" #include "pet.hpp" -#include "homunculus.hpp" -#include "mercenary.hpp" -#include "elemental.hpp" -#include "party.hpp" #include "quest.hpp" -#include "npc.hpp" -#include "guild.hpp" -#include "battle.hpp" -#include "log.hpp" -#include "achievement.hpp" - -#include -#include -#include using namespace rathena; diff --git a/src/map/mob.hpp b/src/map/mob.hpp index bfa7950b0b..7d0bf4a50a 100644 --- a/src/map/mob.hpp +++ b/src/map/mob.hpp @@ -1,16 +1,16 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _MOB_HPP_ #define _MOB_HPP_ +#include + #include "../common/mmo.hpp" // struct item #include "status.hpp" // struct status data, struct status_change #include "unit.hpp" // unit_stop_walking(), unit_stop_attack() -#include - struct guardian_data; //The number of drops all mobs have and the max drop-slot that the steal skill will attempt to steal from. diff --git a/src/map/npc.cpp b/src/map/npc.cpp index 35181ee5b6..647a765952 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -1,38 +1,37 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "npc.hpp" +#include #include +#include #include -#include -#include - #include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" -#include "../common/nullpo.hpp" +#include "../common/db.hpp" +#include "../common/ers.hpp" #include "../common/malloc.hpp" +#include "../common/nullpo.hpp" #include "../common/showmsg.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "../common/utils.hpp" -#include "../common/ers.hpp" -#include "../common/db.hpp" -#include "map.hpp" -#include "log.hpp" +#include "battle.hpp" +#include "chat.hpp" #include "clif.hpp" #include "date.hpp" // days of week enum +#include "guild.hpp" +#include "instance.hpp" #include "intif.hpp" +#include "log.hpp" +#include "log.hpp" +#include "map.hpp" +#include "mob.hpp" #include "pc.hpp" #include "pet.hpp" -#include "instance.hpp" -#include "chat.hpp" #include "script.hpp" // script_config -#include "guild.hpp" -#include "battle.hpp" -#include "mob.hpp" -#include "log.hpp" struct npc_data* fake_nd; diff --git a/src/map/npc.hpp b/src/map/npc.hpp index 8c748d925b..d6a9b97978 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _NPC_HPP_ diff --git a/src/map/npc_chat.cpp b/src/map/npc_chat.cpp index 6cafb6219b..5977b55770 100644 --- a/src/map/npc_chat.cpp +++ b/src/map/npc_chat.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifdef PCRE_SUPPORT @@ -7,15 +7,14 @@ #include "../../3rdparty/pcre/include/pcre.h" -#include "../common/timer.hpp" #include "../common/malloc.hpp" #include "../common/showmsg.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "mob.hpp" // struct mob_data #include "pc.hpp" // struct map_session_data - /** * Written by MouseJstr in a vision... (2/21/2005) * diff --git a/src/map/party.cpp b/src/map/party.cpp index aa67d81e19..6ffec3f112 100644 --- a/src/map/party.cpp +++ b/src/map/party.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "party.hpp" @@ -6,27 +6,27 @@ #include #include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" -#include "../common/socket.hpp" // last_tick -#include "../common/nullpo.hpp" #include "../common/malloc.hpp" +#include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" -#include "../common/utils.hpp" +#include "../common/socket.hpp" // last_tick #include "../common/strlib.hpp" +#include "../common/timer.hpp" +#include "../common/utils.hpp" +#include "achievement.hpp" #include "atcommand.hpp" //msg_txt() -#include "pc.hpp" +#include "battle.hpp" +#include "clif.hpp" #include "instance.hpp" #include "intif.hpp" -#include "mapreg.hpp" -#include "trade.hpp" -#include "clif.hpp" -#include "battle.hpp" -#include "mob.hpp" #include "log.hpp" +#include "mapreg.hpp" +#include "mob.hpp" +#include "pc.hpp" #include "pc_groups.hpp" -#include "achievement.hpp" +#include "trade.hpp" static DBMap* party_db; // int party_id -> struct party_data* (releases data) static DBMap* party_booking_db; // uint32 char_id -> struct party_booking_ad_info* (releases data) // Party Booking [Spiria] diff --git a/src/map/party.hpp b/src/map/party.hpp index f23e32fad5..40916a1f2a 100644 --- a/src/map/party.hpp +++ b/src/map/party.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _PARTY_HPP_ diff --git a/src/map/path.cpp b/src/map/path.cpp index afd40775f3..e27f522d42 100644 --- a/src/map/path.cpp +++ b/src/map/path.cpp @@ -1,12 +1,12 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "path.hpp" +#include #include #include #include -#include #include "../common/cbasetypes.hpp" #include "../common/db.hpp" @@ -15,8 +15,8 @@ #include "../common/random.hpp" #include "../common/showmsg.hpp" -#include "map.hpp" #include "battle.hpp" +#include "map.hpp" #define SET_OPEN 0 #define SET_CLOSED 1 diff --git a/src/map/path.hpp b/src/map/path.hpp index 8c8172ce05..a4a16265ba 100644 --- a/src/map/path.hpp +++ b/src/map/path.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _PATH_HPP_ diff --git a/src/map/pc.cpp b/src/map/pc.cpp index 599c174ad0..3c38ef21de 100755 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -1,14 +1,16 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "pc.hpp" -#include #include +#include #include "../common/cbasetypes.hpp" #include "../common/core.hpp" // get_svn_revision() +#include "../common/ers.hpp" // ers_destroy #include "../common/malloc.hpp" +#include "../common/mmo.hpp" //NAME_LENGTH #include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" @@ -16,42 +18,40 @@ #include "../common/strlib.hpp" // safestrncpy() #include "../common/timer.hpp" #include "../common/utils.hpp" -#include "../common/mmo.hpp" //NAME_LENGTH -#include "../common/ers.hpp" // ers_destroy +#include "achievement.hpp" #include "atcommand.hpp" // get_atcommand_level() -#include "map.hpp" #include "battle.hpp" // battle_config #include "battleground.hpp" +#include "buyingstore.hpp" // struct s_buyingstore #include "channel.hpp" #include "chat.hpp" #include "chrif.hpp" +#include "clan.hpp" +#include "clif.hpp" #include "date.hpp" // is_day_of_*() #include "duel.hpp" -#include "intif.hpp" +#include "elemental.hpp" +#include "guild.hpp" #include "homunculus.hpp" #include "instance.hpp" -#include "mercenary.hpp" -#include "elemental.hpp" -#include "pet.hpp" // pet_unlocktarget() -#include "party.hpp" // party_search() -#include "storage.hpp" -#include "quest.hpp" -#include "npc.hpp" -#include "guild.hpp" -#include "clif.hpp" -#include "buyingstore.hpp" // struct s_buyingstore +#include "intif.hpp" #include "itemdb.hpp" // MAX_ITEMGROUP +#include "log.hpp" +#include "map.hpp" +#include "mercenary.hpp" +#include "mob.hpp" +#include "npc.hpp" +#include "party.hpp" // party_search() +#include "pc_groups.hpp" +#include "pet.hpp" // pet_unlocktarget() +#include "quest.hpp" #include "script.hpp" // struct script_reg, struct script_regstr #include "searchstore.hpp" // struct s_search_store_info #include "status.hpp" // OPTION_*, struct weapon_atk +#include "storage.hpp" #include "unit.hpp" // unit_stop_attack(), unit_stop_walking() #include "vending.hpp" // struct s_vending -#include "mob.hpp" -#include "log.hpp" -#include "pc_groups.hpp" -#include "achievement.hpp" -#include "clan.hpp" int pc_split_atoui(char* str, unsigned int* val, char sep, int max); diff --git a/src/map/pc.hpp b/src/map/pc.hpp index 00e0ad8c0c..84559725b6 100644 --- a/src/map/pc.hpp +++ b/src/map/pc.hpp @@ -1,6 +1,6 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#pragma once + #ifndef _PC_HPP_ #define _PC_HPP_ @@ -9,16 +9,16 @@ #include "../common/mmo.hpp" // JOB_*, MAX_FAME_LIST, struct fame_list, struct mmo_charstatus #include "../common/strlib.hpp"// StringBuf -#include "map.hpp" // RC_ALL -#include "itemdb.hpp" // MAX_ITEMGROUP -#include "searchstore.hpp" // struct s_search_store_info -#include "vending.hpp" // struct s_vending #include "buyingstore.hpp" // struct s_buyingstore -#include "unit.hpp" // unit_data -#include "status.hpp" // unit_data -#include "script.hpp" // struct script_reg, struct script_regstr -#include "mob.hpp" //e_size #include "clif.hpp" //e_wip_block +#include "itemdb.hpp" // MAX_ITEMGROUP +#include "map.hpp" // RC_ALL +#include "mob.hpp" //e_size +#include "script.hpp" // struct script_reg, struct script_regstr +#include "searchstore.hpp" // struct s_search_store_info +#include "status.hpp" // unit_data +#include "unit.hpp" // unit_data +#include "vending.hpp" // struct s_vending enum AtCommandType : uint8; //enum e_log_chat_type : uint8; diff --git a/src/map/pc_groups.cpp b/src/map/pc_groups.cpp index 608cc8ee85..c225987383 100644 --- a/src/map/pc_groups.cpp +++ b/src/map/pc_groups.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "pc_groups.hpp" @@ -7,8 +7,8 @@ #include "../common/db.hpp" #include "../common/malloc.hpp" #include "../common/showmsg.hpp" -#include "../common/strlib.hpp" // strcmp #include "../common/socket.hpp" +#include "../common/strlib.hpp" // strcmp #include "atcommand.hpp" // AtCommandType #include "pc.hpp" // e_pc_permission diff --git a/src/map/pc_groups.hpp b/src/map/pc_groups.hpp index c4b89ce824..27f00e2fc3 100644 --- a/src/map/pc_groups.hpp +++ b/src/map/pc_groups.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _PC_GROUPS_HPP_ @@ -89,4 +89,4 @@ static const struct s_pcg_permission_name { { "all_permission", PC_PERM_ALLPERMISSION }, }; -#endif // _PC_GROUPS_HPP_ +#endif /* _PC_GROUPS_HPP_ */ diff --git a/src/map/pet.cpp b/src/map/pet.cpp index f7acbe9546..3a143d8c0e 100644 --- a/src/map/pet.cpp +++ b/src/map/pet.cpp @@ -1,33 +1,31 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "pet.hpp" #include - #include -#include "../common/utilities.hpp" - #include "../common/db.hpp" -#include "../common/timer.hpp" -#include "../common/nullpo.hpp" +#include "../common/ers.hpp" #include "../common/malloc.hpp" +#include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" +#include "../common/utilities.hpp" #include "../common/utils.hpp" -#include "../common/ers.hpp" -#include "pc.hpp" -#include "intif.hpp" -#include "chrif.hpp" -#include "npc.hpp" -#include "clif.hpp" -#include "mob.hpp" -#include "battle.hpp" -#include "log.hpp" #include "achievement.hpp" +#include "battle.hpp" +#include "chrif.hpp" +#include "clif.hpp" +#include "intif.hpp" +#include "log.hpp" +#include "mob.hpp" +#include "npc.hpp" +#include "pc.hpp" using namespace rathena; diff --git a/src/map/pet.hpp b/src/map/pet.hpp index eba53c051e..6fc519027d 100644 --- a/src/map/pet.hpp +++ b/src/map/pet.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _PET_HPP_ diff --git a/src/map/quest.cpp b/src/map/quest.cpp index cb2dcb63f3..ff90373747 100644 --- a/src/map/quest.cpp +++ b/src/map/quest.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "quest.hpp" @@ -6,23 +6,23 @@ #include #include "../common/cbasetypes.hpp" -#include "../common/socket.hpp" #include "../common/malloc.hpp" #include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" +#include "../common/socket.hpp" #include "../common/strlib.hpp" -#include "itemdb.hpp" -#include "map.hpp" -#include "pc.hpp" -#include "party.hpp" -#include "chrif.hpp" -#include "intif.hpp" -#include "clif.hpp" -#include "mob.hpp" #include "battle.hpp" +#include "chrif.hpp" +#include "clif.hpp" +#include "intif.hpp" +#include "itemdb.hpp" #include "log.hpp" +#include "map.hpp" +#include "mob.hpp" +#include "party.hpp" +#include "pc.hpp" static DBMap *questdb; static void questdb_free_sub(struct quest_db *quest, bool free); diff --git a/src/map/quest.hpp b/src/map/quest.hpp index a9a8fce886..8a2fb5b577 100644 --- a/src/map/quest.hpp +++ b/src/map/quest.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _QUEST_HPP_ diff --git a/src/map/script.cpp b/src/map/script.cpp index ac209fe65d..f955edef59 100644 --- a/src/map/script.cpp +++ b/src/map/script.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder //#define DEBUG_DISP @@ -9,16 +9,17 @@ #include "script.hpp" -#include -#include // atoi, strtol, strtoll, exit -#include #include +#include +#include +#include // atoi, strtol, strtoll, exit #ifdef PCRE_SUPPORT #include "../../3rdparty/pcre/include/pcre.h" // preg_match #endif #include "../common/cbasetypes.hpp" +#include "../common/ers.hpp" // ers_destroy #include "../common/malloc.hpp" #include "../common/md5calc.hpp" #include "../common/nullpo.hpp" @@ -28,38 +29,37 @@ #include "../common/strlib.hpp" #include "../common/timer.hpp" #include "../common/utils.hpp" -#include "../common/ers.hpp" // ers_destroy -#include "map.hpp" -#include "path.hpp" -#include "clan.hpp" -#include "clif.hpp" -#include "chrif.hpp" -#include "date.hpp" // date type enum, date_get() -#include "itemdb.hpp" -#include "pc.hpp" -#include "pc_groups.hpp" -#include "storage.hpp" -#include "pet.hpp" -#include "mapreg.hpp" -#include "homunculus.hpp" -#include "instance.hpp" -#include "mercenary.hpp" -#include "intif.hpp" -#include "chat.hpp" -#include "battleground.hpp" -#include "party.hpp" -#include "mail.hpp" -#include "quest.hpp" -#include "elemental.hpp" -#include "npc.hpp" -#include "guild.hpp" +#include "achievement.hpp" #include "atcommand.hpp" #include "battle.hpp" -#include "log.hpp" -#include "mob.hpp" +#include "battleground.hpp" #include "channel.hpp" -#include "achievement.hpp" +#include "chat.hpp" +#include "chrif.hpp" +#include "clan.hpp" +#include "clif.hpp" +#include "date.hpp" // date type enum, date_get() +#include "elemental.hpp" +#include "guild.hpp" +#include "homunculus.hpp" +#include "instance.hpp" +#include "intif.hpp" +#include "itemdb.hpp" +#include "log.hpp" +#include "mail.hpp" +#include "map.hpp" +#include "mapreg.hpp" +#include "mercenary.hpp" +#include "mob.hpp" +#include "npc.hpp" +#include "party.hpp" +#include "path.hpp" +#include "pc.hpp" +#include "pc_groups.hpp" +#include "pet.hpp" +#include "quest.hpp" +#include "storage.hpp" struct eri *array_ers; DBMap *st_db; diff --git a/src/map/script.hpp b/src/map/script.hpp index 51b196e1e4..1988762d32 100644 --- a/src/map/script.hpp +++ b/src/map/script.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _SCRIPT_HPP_ diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index 4eb356c564..959376795e 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -1,8 +1,8 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _SCRIPT_CONSTANTS_HPP_ - #define _SCRIPT_CONSTANTS_HPP_ +#define _SCRIPT_CONSTANTS_HPP_ #define export_constant(a) script_set_constant(#a,a,false,false) #define export_constant2(a,b) script_set_constant(a,b,false,false) diff --git a/src/map/searchstore.cpp b/src/map/searchstore.cpp index 412302b121..4df5e5f22a 100644 --- a/src/map/searchstore.cpp +++ b/src/map/searchstore.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "searchstore.hpp" // struct s_search_store_info diff --git a/src/map/searchstore.hpp b/src/map/searchstore.hpp index c072be4cfc..657463eb8d 100644 --- a/src/map/searchstore.hpp +++ b/src/map/searchstore.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _SEARCHSTORE_HPP_ diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 20fb248d16..f724e9b06c 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -1,48 +1,48 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "skill.hpp" +#include #include #include #include #include -#include #include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" -#include "../common/nullpo.hpp" +#include "../common/ers.hpp" #include "../common/malloc.hpp" +#include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" #include "../common/utils.hpp" -#include "../common/ers.hpp" -#include "map.hpp" -#include "path.hpp" -#include "clif.hpp" -#include "pc.hpp" -#include "status.hpp" -#include "pet.hpp" -#include "homunculus.hpp" -#include "mercenary.hpp" -#include "elemental.hpp" -#include "mob.hpp" -#include "npc.hpp" +#include "achievement.hpp" #include "battle.hpp" #include "battleground.hpp" -#include "party.hpp" -#include "itemdb.hpp" -#include "script.hpp" -#include "intif.hpp" -#include "log.hpp" #include "chrif.hpp" -#include "guild.hpp" +#include "clif.hpp" #include "date.hpp" -#include "unit.hpp" -#include "achievement.hpp" +#include "elemental.hpp" +#include "guild.hpp" +#include "homunculus.hpp" +#include "intif.hpp" +#include "itemdb.hpp" +#include "log.hpp" +#include "map.hpp" +#include "mercenary.hpp" +#include "mob.hpp" +#include "npc.hpp" +#include "party.hpp" +#include "path.hpp" +#include "pc.hpp" #include "pc_groups.hpp" +#include "pet.hpp" +#include "script.hpp" +#include "status.hpp" +#include "unit.hpp" #define SKILLUNITTIMER_INTERVAL 100 #define TIMERSKILL_INTERVAL 150 diff --git a/src/map/skill.hpp b/src/map/skill.hpp index 94e511a8fe..5b09829c72 100644 --- a/src/map/skill.hpp +++ b/src/map/skill.hpp @@ -1,12 +1,12 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _SKILL_HPP_ #define _SKILL_HPP_ #include "../common/cbasetypes.hpp" -#include "../common/mmo.hpp" // MAX_SKILL, struct square #include "../common/db.hpp" +#include "../common/mmo.hpp" // MAX_SKILL, struct square #include "map.hpp" // struct block_list diff --git a/src/map/status.cpp b/src/map/status.cpp index 95eb9c7504..7ab69f96af 100644 --- a/src/map/status.cpp +++ b/src/map/status.cpp @@ -1,40 +1,40 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "status.hpp" -#include -#include -#include #include +#include +#include +#include #include #include "../common/cbasetypes.hpp" -#include "../common/timer.hpp" +#include "../common/ers.hpp" +#include "../common/malloc.hpp" #include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/showmsg.hpp" -#include "../common/malloc.hpp" -#include "../common/utils.hpp" -#include "../common/ers.hpp" #include "../common/strlib.hpp" +#include "../common/timer.hpp" +#include "../common/utils.hpp" #include "battle.hpp" +#include "battleground.hpp" +#include "clif.hpp" +#include "elemental.hpp" +#include "guild.hpp" +#include "homunculus.hpp" #include "itemdb.hpp" #include "map.hpp" +#include "mercenary.hpp" +#include "mob.hpp" +#include "npc.hpp" #include "path.hpp" #include "pc.hpp" -#include "pet.hpp" -#include "battleground.hpp" -#include "homunculus.hpp" -#include "mercenary.hpp" -#include "elemental.hpp" -#include "script.hpp" -#include "npc.hpp" -#include "guild.hpp" -#include "clif.hpp" -#include "mob.hpp" #include "pc_groups.hpp" +#include "pet.hpp" +#include "script.hpp" // Regen related flags. enum e_regen { diff --git a/src/map/status.hpp b/src/map/status.hpp index 4a9418d424..793c778f2f 100644 --- a/src/map/status.hpp +++ b/src/map/status.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _STATUS_HPP_ diff --git a/src/map/storage.cpp b/src/map/storage.cpp index f514320681..4894b86a71 100644 --- a/src/map/storage.cpp +++ b/src/map/storage.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "storage.hpp" @@ -8,23 +8,22 @@ #include #include +#include "../common/cbasetypes.hpp" +#include "../common/malloc.hpp" +#include "../common/nullpo.hpp" +#include "../common/showmsg.hpp" #include "../common/utilities.hpp" -#include "../common/cbasetypes.hpp" -#include "../common/nullpo.hpp" -#include "../common/malloc.hpp" -#include "../common/showmsg.hpp" - -#include "map.hpp" // struct map_session_data +#include "battle.hpp" #include "chrif.hpp" -#include "itemdb.hpp" #include "clif.hpp" +#include "guild.hpp" #include "intif.hpp" +#include "itemdb.hpp" +#include "log.hpp" +#include "map.hpp" // struct map_session_data #include "pc.hpp" #include "pc_groups.hpp" -#include "guild.hpp" -#include "log.hpp" -#include "battle.hpp" using namespace rathena; diff --git a/src/map/storage.hpp b/src/map/storage.hpp index 4dfd46c323..f1f2a0c623 100644 --- a/src/map/storage.hpp +++ b/src/map/storage.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _STORAGE_HPP_ diff --git a/src/map/trade.cpp b/src/map/trade.cpp index ff797cbd76..2e3e39dd3c 100644 --- a/src/map/trade.cpp +++ b/src/map/trade.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "trade.hpp" @@ -9,17 +9,17 @@ #include "../common/nullpo.hpp" #include "../common/socket.hpp" +#include "atcommand.hpp" +#include "battle.hpp" +#include "chrif.hpp" #include "clif.hpp" +#include "intif.hpp" #include "itemdb.hpp" +#include "log.hpp" #include "path.hpp" #include "pc.hpp" -#include "chrif.hpp" -#include "storage.hpp" -#include "intif.hpp" -#include "atcommand.hpp" -#include "log.hpp" #include "pc_groups.hpp" -#include "battle.hpp" +#include "storage.hpp" #define TRADE_DISTANCE 2 ///Max distance from traders to enable a trade to take place. diff --git a/src/map/trade.hpp b/src/map/trade.hpp index ff8131af6c..d17b2e7b7f 100644 --- a/src/map/trade.hpp +++ b/src/map/trade.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _TRADE_HPP_ diff --git a/src/map/unit.cpp b/src/map/unit.cpp index d4a51ee839..354197c2e5 100644 --- a/src/map/unit.cpp +++ b/src/map/unit.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "unit.hpp" @@ -6,36 +6,36 @@ #include #include -#include "../common/showmsg.hpp" -#include "../common/timer.hpp" -#include "../common/nullpo.hpp" #include "../common/db.hpp" -#include "../common/malloc.hpp" -#include "../common/random.hpp" -#include "../common/socket.hpp" #include "../common/ers.hpp" // ers_destroy +#include "../common/malloc.hpp" +#include "../common/nullpo.hpp" +#include "../common/random.hpp" +#include "../common/showmsg.hpp" +#include "../common/socket.hpp" +#include "../common/timer.hpp" #include "achievement.hpp" +#include "battle.hpp" +#include "battleground.hpp" +#include "channel.hpp" +#include "chat.hpp" +#include "clif.hpp" +#include "duel.hpp" +#include "elemental.hpp" +#include "guild.hpp" +#include "homunculus.hpp" +#include "intif.hpp" #include "map.hpp" +#include "mercenary.hpp" +#include "mob.hpp" +#include "npc.hpp" +#include "party.hpp" #include "path.hpp" #include "pc.hpp" #include "pet.hpp" -#include "homunculus.hpp" -#include "mercenary.hpp" -#include "elemental.hpp" -#include "channel.hpp" -#include "duel.hpp" -#include "battleground.hpp" -#include "chat.hpp" -#include "trade.hpp" -#include "party.hpp" -#include "intif.hpp" #include "storage.hpp" -#include "guild.hpp" -#include "npc.hpp" -#include "clif.hpp" -#include "mob.hpp" -#include "battle.hpp" +#include "trade.hpp" // Directions values // 1 0 7 diff --git a/src/map/unit.hpp b/src/map/unit.hpp index 9b000fac10..6cf6faadba 100644 --- a/src/map/unit.hpp +++ b/src/map/unit.hpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _UNIT_HPP_ diff --git a/src/map/vending.cpp b/src/map/vending.cpp index eaada323fb..6c696406be 100755 --- a/src/map/vending.cpp +++ b/src/map/vending.cpp @@ -1,28 +1,29 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include "vending.hpp" -#include "../common/nullpo.hpp" + +#include // atoi + #include "../common/malloc.hpp" // aMalloc, aFree +#include "../common/nullpo.hpp" #include "../common/showmsg.hpp" // ShowInfo #include "../common/strlib.hpp" #include "../common/timer.hpp" // DIFF_TICK +#include "achievement.hpp" +#include "atcommand.hpp" +#include "battle.hpp" #include "buyingstore.hpp" +#include "buyingstore.hpp" // struct s_autotrade_entry, struct s_autotrader +#include "chrif.hpp" #include "clif.hpp" #include "itemdb.hpp" -#include "atcommand.hpp" +#include "log.hpp" +#include "npc.hpp" #include "path.hpp" -#include "chrif.hpp" #include "pc.hpp" #include "pc_groups.hpp" -#include "buyingstore.hpp" // struct s_autotrade_entry, struct s_autotrader -#include "npc.hpp" -#include "battle.hpp" -#include "log.hpp" -#include "achievement.hpp" - -#include // atoi static uint32 vending_nextid = 0; ///Vending_id counter static DBMap *vending_db; ///DB holder the vender : charid -> map_session_data diff --git a/src/map/vending.hpp b/src/map/vending.hpp index 63bfa32cb6..9290d61563 100644 --- a/src/map/vending.hpp +++ b/src/map/vending.hpp @@ -1,11 +1,10 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #ifndef _VENDING_HPP_ #define _VENDING_HPP_ #include "../common/cbasetypes.hpp" - #include "../common/db.hpp" struct map_session_data; diff --git a/src/tool/mapcache.cpp b/src/tool/mapcache.cpp index af8a2765b5..72205d464d 100644 --- a/src/tool/mapcache.cpp +++ b/src/tool/mapcache.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL +// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder #include @@ -9,9 +9,9 @@ #include #endif -#include "../common/mmo.hpp" #include "../common/grfio.hpp" #include "../common/malloc.hpp" +#include "../common/mmo.hpp" #include "../common/showmsg.hpp" #include "../common/utils.hpp"