Synchronized source file headers (#3212)

* Alphabetically sorted includes.
* Updated copyright and license text to match across all files.
* Removed pragma once define in header files in lieu of ifdef guards.

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 <time.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #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

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

src/char/char_clif.cpp

@@ -6,20 +6,21 @@
 #include <stdlib.h>
 #include <string.h>
 
+#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 );

src/char/char_cnslif.cpp

@@ -6,11 +6,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../common/socket.hpp"
+#include "../common/cli.hpp"
+#include "../common/ers.hpp"
 #include "../common/showmsg.hpp"
+#include "../common/socket.hpp"
 #include "../common/timer.hpp"
-#include "../common/ers.hpp"
-#include "../common/cli.hpp"
 
 #include "char.hpp"
 

src/char/char_logif.cpp

@@ -6,18 +6,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#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);

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 <stdlib.h>
 #include <string.h> //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

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_

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 <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "../common/db.hpp"
 #include "../common/malloc.hpp"

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_

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 <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
-#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"

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_

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"

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_

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 <string.h>
 
 #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"

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_

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 <string.h>
 
 #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"
 

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_

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 <string.h>
 
 #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"

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_

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"

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_

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 <string.h>
 
 #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"

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_

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 <string.h>
 
 #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"

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_

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 <stdlib.h>
 #include <string.h>
 
-#include "../common/mmo.hpp"
 #include "../common/malloc.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"
 #include "../common/utils.hpp"
-#include "../common/sql.hpp"
 
 #include "char.hpp"
 #include "inter.hpp"

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_

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 <stdlib.h>
 #include <string.h>
 
-#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"

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_

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"
 

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_

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 <string.h>
 #include <stdlib.h>
-#include <sys/stat.h> // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool]
-#include <yaml-cpp/yaml.h>
+#include <string.h>
 #include <string>
+#include <sys/stat.h> // for stat/lstat/fstat - [Dekamaster/Ultimate GM Tool]
 #include <vector>
-#include <stdlib.h>
+#include <yaml-cpp/yaml.h>
 
 #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_achievement.hpp"
+#include "int_auction.hpp"
+#include "int_clan.hpp"
+#include "int_elemental.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_mercenary.hpp"
+#include "int_party.hpp"
+#include "int_pet.hpp"
 #include "int_quest.hpp"
-#include "int_elemental.hpp"
-#include "int_clan.hpp"
-#include "int_achievement.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

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 <memory>
 #include <string>
 #include <unordered_map>
 
+#include "../common/cbasetypes.hpp"
+#include "../common/sql.hpp"
+
 struct s_storage_table;
 struct Inter_Config {
 	std::string cfgFile; ///< Inter-Config file

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_
 

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 <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+
 #ifdef WIN32
 	#include <conio.h>
 #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;

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_ */
 

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)

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);
 

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 <direct.h> // _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;

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_

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 <stdio.h>
+#include <stdlib.h>
+
 #include "ers.hpp"
 #include "malloc.hpp"
 #include "mmo.hpp"
 #include "showmsg.hpp"
 #include "strlib.hpp"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 /*****************************************************************************\
  *  (1) Private typedefs, enums, structures, defines and global variables of *
  *  the database system.                                                     *

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:                                  *

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.

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_

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                     *
  *                                                                           *
  *  <H1>Entry Reusage System</H1>                                            *
@@ -40,16 +40,16 @@
  * @see common#ers.hpp                                                         *
 \*****************************************************************************/
 
+#include "ers.hpp"
+
+#include <stdlib.h>
+#include <string.h>
 
 #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 <stdlib.h>
-#include <string.h>
-
 #ifndef DISABLE_ERS
 
 #define ERS_BLOCK_ENTRIES 2048

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                     *
  *                                                                           *
  *  <H1>Entry Reusage System</H1>                                            *

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 <stdlib.h>
+#include <zlib.h>
+
 #include "cbasetypes.hpp"
 #include "des.hpp"
 #include "malloc.hpp"
 #include "showmsg.hpp"
 #include "strlib.hpp"
 #include "utils.hpp"
-#include "grfio.hpp"
-
-#include <stdlib.h>
-#include <zlib.h>
 
 //----------------------------
 //	file entry table struct

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_

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 <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include "core.hpp"
+#include "showmsg.hpp"
+
 #define FREED_POINTER 0xdeadbeafL
 
 ////////////// Memory Libraries //////////////////

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_

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 <stdlib.h>
 
+#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

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_

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 <string.h>
+
 #include <stdio.h>
+#include <string.h>
+
+#include "../common/random.hpp"
 
 #ifndef UINT_MAX
 #define UINT_MAX 4294967295U

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_
 

src/common/mmo.hpp

@@ -1,13 +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	_MMO_HPP_
 #define	_MMO_HPP_
 
-#include "cbasetypes.hpp"
+#include <time.h>
+
 #include "../config/core.hpp"
+
+#include "cbasetypes.hpp"
 #include "db.hpp"
-#include <time.h>
 
 #ifndef PACKETVER
 	#error Please define PACKETVER in src/config/packets.hpp

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 <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "malloc.hpp"
-#include "msg_conf.hpp"
 #include "showmsg.hpp"
 
 /*

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

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 <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#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);

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_

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"

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_

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 <time.h>
 #include <stdlib.h> // atexit
+#include <time.h>
 
 #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:

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_

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 <stdlib.h>
@@ -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)
 /////////////////////////////////////////////////////////////////////

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 <sys/socket.h>
 	#include <netinet/in.h>
 #endif
-
 #include <time.h>
 
+#include "cbasetypes.hpp"
+
 #define FIFOSIZE_SERVERLINK 256*1024
 
 // socket I/O macros

src/common/sql.cpp

@@ -1,19 +1,21 @@
-// 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 "timer.hpp"
 #include "sql.hpp"
 
 #ifdef WIN32
 #include "winapi.hpp"
 #endif
+
 #include <mysql.h>
 #include <stdlib.h>// strtoul
 
+#include "cbasetypes.hpp"
+#include "malloc.hpp"
+#include "showmsg.hpp"
+#include "strlib.hpp"
+#include "timer.hpp"
+
 // MySQL 8.0 or later removed my_bool typedef.
 // Reintroduce it as a bandaid fix.
 // See https://bugs.mysql.com/?id=87337

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 <stdarg.h>// va_list
 
+#include "cbasetypes.hpp"
+
 // Return codes
 #define SQL_ERROR -1
 #define SQL_SUCCESS 0

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 <stdlib.h>
 
+#include "cbasetypes.hpp"
+#include "malloc.hpp"
+#include "showmsg.hpp"
 
 #define J_MAX_MALLOC_SIZE 65535
 

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 <stdarg.h>
 
+#include "cbasetypes.hpp"
+
 #if !defined(__USE_GNU)
 #define __USE_GNU  // required to enable strnlen on some platforms
 #define __USED_GNU

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 <stdlib.h>
@@ -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,

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 <time.h>
 
+#include "cbasetypes.hpp"
+
 #define DIFF_TICK(a,b) ((int)((a)-(b)))
 
 #define INVALID_TIMER -1

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 <chrono>
-#include <string>
 #include <algorithm>
+#include <chrono>
 #include <iostream>
 #include <numeric> //iota
+#include <string>
 
 struct cScopeTimer::sPimpl {
     std::chrono::steady_clock::time_point start;

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 <memory>
 #include <string>
 #include <map>
@@ -26,3 +31,5 @@ namespace rathena {
 		}
 	}
 }
+
+#endif /* _UTILILITIES_HPP_ */

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 <math.h> // floor()
 #include <stdlib.h>
 #include <string.h>
-#include <math.h> // floor()
 
 #ifdef WIN32
 	#include "winapi.hpp"
@@ -21,6 +18,9 @@
 	#include <sys/stat.h>
 #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)

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 <stdio.h> // 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);

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

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 <sdkddkver.h>
+#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_ */

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_
 

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_
 

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_
 

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_
 

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_
 

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_
 

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
 
 /**

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
 
 /**

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
 
 /**

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
 
 /**

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_
 

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_
 

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
 
 /**

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
 
 /**

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 <algorithm> //min / max
 #include <stdlib.h>
 #include <string.h>
-#include <algorithm> //min / max
 
 #include "../common/malloc.hpp"
 #include "../common/mmo.hpp"

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
- */
-
-#pragma once
+// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
+// For more information, see LICENCE in the main folder
+
 #ifndef _ACCOUNT_HPP_
 #define _ACCOUNT_HPP_
 

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"
 

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_
 

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 <string.h>
 #include <string>
 
+#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

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 <memory>
 
-#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"
 

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 <stdlib.h>
 #include <string.h>
 
-#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"

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_
 

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 <stdlib.h>
 #include <string.h>
 
-#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.