diff --git a/src/char/char.hpp b/src/char/char.hpp index 6921f0db40..02a869eae1 100644 --- a/src/char/char.hpp +++ b/src/char/char.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CHAR_HPP_ -#define _CHAR_HPP_ +#ifndef CHAR_HPP +#define CHAR_HPP #include @@ -330,4 +330,4 @@ const char* char_msg_txt(int msg_number); void char_do_final_msg(void); bool char_config_read(const char* cfgName, bool normal); -#endif /* _CHAR_HPP_ */ +#endif /* CHAR_HPP */ diff --git a/src/char/char_clif.hpp b/src/char/char_clif.hpp index 13c7cf9e1d..944cf500cd 100644 --- a/src/char/char_clif.hpp +++ b/src/char/char_clif.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CHAR_CLIF_HPP_ -#define _CHAR_CLIF_HPP_ +#ifndef CHAR_CLIF_HPP +#define CHAR_CLIF_HPP #include "../common/cbasetypes.hpp" #include "../common/timer.hpp" //time_t @@ -53,5 +53,4 @@ void chclif_block_character( int fd, struct char_session_data* sd); int chclif_parse(int fd); -#endif /* _CHAR_CLIF_HPP_ */ - +#endif /* CHAR_CLIF_HPP */ diff --git a/src/char/char_cnslif.hpp b/src/char/char_cnslif.hpp index 0d4979296d..d3596147c7 100644 --- a/src/char/char_cnslif.hpp +++ b/src/char/char_cnslif.hpp @@ -1,12 +1,11 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CHAR_CNSLIF_HPP_ -#define _CHAR_CNSLIF_HPP_ +#ifndef CHAR_CNSLIF_HPP +#define CHAR_CNSLIF_HPP int cnslif_parse(const char* buf); void do_init_chcnslif(void); -#endif /* _CHAR_CNSLIF_HPP_ */ - +#endif /* CHAR_CNSLIF_HPP */ diff --git a/src/char/char_logif.hpp b/src/char/char_logif.hpp index 7a6a696061..7c6bb543f3 100644 --- a/src/char/char_logif.hpp +++ b/src/char/char_logif.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CHAR_LOGIF_HPP_ -#define _CHAR_LOGIF_HPP_ +#ifndef CHAR_LOGIF_HPP +#define CHAR_LOGIF_HPP #include "../common/cbasetypes.hpp" #include "../common/timer.hpp" @@ -55,5 +55,4 @@ void do_final_chlogif(void); #define loginif_check(a) { if(!chlogif_isconnected()) return a; } -#endif /* _CHAR_LOGIF_HPP_ */ - +#endif /* CHAR_LOGIF_HPP */ diff --git a/src/char/char_mapif.hpp b/src/char/char_mapif.hpp index 1df3edb297..294f5aedbe 100644 --- a/src/char/char_mapif.hpp +++ b/src/char/char_mapif.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef CHAR_MAPIF_HPP +#define CHAR_MAPIF_HPP #include "../common/cbasetypes.hpp" @@ -57,5 +57,4 @@ void chmapif_server_reset(int id); void chmapif_on_disconnect(int id); void do_final_chmapif(void); -#endif /* _CHAR_MAPIF_HPP_ */ - +#endif /* CHAR_MAPIF_HPP */ diff --git a/src/char/int_achievement.hpp b/src/char/int_achievement.hpp index e3d63c9d4e..45bb4cdef0 100644 --- a/src/char/int_achievement.hpp +++ b/src/char/int_achievement.hpp @@ -1,9 +1,9 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_ACHIEVEMENT_HPP_ -#define _INT_ACHIEVEMENT_HPP_ +#ifndef INT_ACHIEVEMENT_HPP +#define INT_ACHIEVEMENT_HPP int inter_achievement_parse_frommap(int fd); -#endif /* _INT_ACHIEVEMENT_HPP_ */ +#endif /* INT_ACHIEVEMENT_HPP */ diff --git a/src/char/int_auction.hpp b/src/char/int_auction.hpp index 3ddb9f720d..512d4dae99 100644 --- a/src/char/int_auction.hpp +++ b/src/char/int_auction.hpp @@ -1,12 +1,12 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_AUCTION_HPP_ -#define _INT_AUCTION_HPP_ +#ifndef INT_AUCTION_HPP +#define INT_AUCTION_HPP int inter_auction_parse_frommap(int fd); int inter_auction_sql_init(void); void inter_auction_sql_final(void); -#endif /* _INT_AUCTION_HPP_ */ +#endif /* INT_AUCTION_HPP */ diff --git a/src/char/int_clan.hpp b/src/char/int_clan.hpp index 6d2b30fe28..b387653557 100644 --- a/src/char/int_clan.hpp +++ b/src/char/int_clan.hpp @@ -1,11 +1,11 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_CLAN_HPP_ -#define _INT_CLAN_HPP_ +#ifndef INT_CLAN_HPP +#define INT_CLAN_HPP int inter_clan_parse_frommap( int fd ); int inter_clan_init(void); void inter_clan_final(void); -#endif /* _INT_CLAN_HPP_ */ +#endif /* INT_CLAN_HPP */ diff --git a/src/char/int_elemental.hpp b/src/char/int_elemental.hpp index ac4f4a5b59..b611448da3 100644 --- a/src/char/int_elemental.hpp +++ b/src/char/int_elemental.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_ELEMENTAL_HPP_ -#define _INT_ELEMENTAL_HPP_ +#ifndef INT_ELEMENTAL_HPP +#define INT_ELEMENTAL_HPP struct s_elemental; @@ -12,4 +12,4 @@ int inter_elemental_parse_frommap(int fd); bool mapif_elemental_delete(int ele_id); -#endif /* _INT_ELEMENTAL_HPP_ */ +#endif /* INT_ELEMENTAL_HPP */ diff --git a/src/char/int_guild.hpp b/src/char/int_guild.hpp index 4271090b96..35aa29ad87 100644 --- a/src/char/int_guild.hpp +++ b/src/char/int_guild.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_GUILD_HPP_ -#define _INT_GUILD_HPP_ +#ifndef INT_GUILD_HPP +#define INT_GUILD_HPP #include "../common/cbasetypes.hpp" @@ -37,4 +37,4 @@ int inter_guild_CharOnline(uint32 char_id, int guild_id); int inter_guild_CharOffline(uint32 char_id, int guild_id); uint16 inter_guild_storagemax(int guild_id); -#endif /* _INT_GUILD_HPP_ */ +#endif /* INT_GUILD_HPP */ diff --git a/src/char/int_homun.hpp b/src/char/int_homun.hpp index afcf430906..a2bf777081 100644 --- a/src/char/int_homun.hpp +++ b/src/char/int_homun.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_HOMUN_HPP_ -#define _INT_HOMUN_HPP_ +#ifndef INT_HOMUN_HPP +#define INT_HOMUN_HPP #include "../common/cbasetypes.hpp" @@ -17,4 +17,4 @@ bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd); bool mapif_homunculus_delete(int homun_id); bool mapif_homunculus_rename(char *name); -#endif /* _INT_HOMUN_HPP_ */ +#endif /* INT_HOMUN_HPP */ diff --git a/src/char/int_mail.hpp b/src/char/int_mail.hpp index f0b802f524..928cff5019 100644 --- a/src/char/int_mail.hpp +++ b/src/char/int_mail.hpp @@ -1,15 +1,14 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_MAIL_HPP_ -#define _INT_MAIL_HPP_ +#ifndef INT_MAIL_HPP +#define INT_MAIL_HPP #include "../common/cbasetypes.hpp" #include "../common/timer.hpp" struct mail_message; - TIMER_FUNC(mail_return_timer); TIMER_FUNC(mail_delete_timer); @@ -22,6 +21,4 @@ void inter_mail_sql_final(void); int mail_savemessage(struct mail_message* msg); void mapif_Mail_new(struct mail_message *msg); - - -#endif /* _INT_MAIL_HPP_ */ +#endif /* INT_MAIL_HPP */ diff --git a/src/char/int_mercenary.hpp b/src/char/int_mercenary.hpp index 3feaf28e27..c7359c48cd 100644 --- a/src/char/int_mercenary.hpp +++ b/src/char/int_mercenary.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_MERCENARY_HPP_ -#define _INT_MERCENARY_HPP_ +#ifndef INT_MERCENARY_HPP +#define INT_MERCENARY_HPP #include "../common/cbasetypes.hpp" @@ -18,4 +18,4 @@ bool mercenary_owner_delete(uint32 char_id); bool mapif_mercenary_delete(int merc_id); -#endif /* _INT_MERCENARY_HPP_ */ +#endif /* INT_MERCENARY_HPP */ diff --git a/src/char/int_party.hpp b/src/char/int_party.hpp index d347bc9eb7..02f7512367 100644 --- a/src/char/int_party.hpp +++ b/src/char/int_party.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_PARTY_HPP_ -#define _INT_PARTY_HPP_ +#ifndef INT_PARTY_HPP +#define INT_PARTY_HPP #include "../common/cbasetypes.hpp" @@ -26,4 +26,4 @@ int inter_party_charname_changed(int party_id, uint32 char_id, char *name); int inter_party_CharOnline(uint32 char_id, int party_id); int inter_party_CharOffline(uint32 char_id, int party_id); -#endif /* _INT_PARTY_HPP_ */ +#endif /* INT_PARTY_HPP */ diff --git a/src/char/int_pet.hpp b/src/char/int_pet.hpp index c0c6061a3f..bb38480306 100644 --- a/src/char/int_pet.hpp +++ b/src/char/int_pet.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_PET_HPP_ -#define _INT_PET_HPP_ +#ifndef INT_PET_HPP +#define INT_PET_HPP #include "../common/cbasetypes.hpp" @@ -19,4 +19,4 @@ int inter_pet_sql_init(void); int inter_pet_tosql(int pet_id, struct s_pet *p); -#endif /* _INT_PET_HPP_ */ +#endif /* INT_PET_HPP */ diff --git a/src/char/int_quest.hpp b/src/char/int_quest.hpp index d402d7ede6..14197abc8e 100644 --- a/src/char/int_quest.hpp +++ b/src/char/int_quest.hpp @@ -1,10 +1,9 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_QUEST_HPP_ -#define _INT_QUEST_HPP_ +#ifndef INT_QUEST_HPP +#define INT_QUEST_HPP int inter_quest_parse_frommap(int fd); -#endif /* _INT_QUEST_HPP_ */ - +#endif /* INT_QUEST_HPP */ diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp index 89d27b2160..f9dc82a79c 100644 --- a/src/char/int_storage.hpp +++ b/src/char/int_storage.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INT_STORAGE_HPP_ -#define _INT_STORAGE_HPP_ +#ifndef INT_STORAGE_HPP +#define INT_STORAGE_HPP #include "../common/cbasetypes.hpp" @@ -20,4 +20,4 @@ bool inter_storage_parse_frommap(int fd); bool guild_storage_tosql(int guild_id, struct s_storage *p); -#endif /* _INT_STORAGE_HPP_ */ +#endif /* INT_STORAGE_HPP */ diff --git a/src/char/inter.hpp b/src/char/inter.hpp index bf043832eb..f3715ab980 100644 --- a/src/char/inter.hpp +++ b/src/char/inter.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INTER_HPP_ -#define _INTER_HPP_ +#ifndef INTER_HPP +#define INTER_HPP #include #include @@ -40,4 +40,4 @@ extern Sql* lsql_handle; void inter_savereg(uint32 account_id, uint32 char_id, const char *key, unsigned int index, intptr_t val, bool is_string); int inter_accreg_fromsql(uint32 account_id, uint32 char_id, int fd, int type); -#endif /* _INTER_HPP_ */ +#endif /* INTER_HPP */ diff --git a/src/common/cbasetypes.hpp b/src/common/cbasetypes.hpp index ac92314d38..1565ce45da 100644 --- a/src/common/cbasetypes.hpp +++ b/src/common/cbasetypes.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CBASETYPES_HPP_ -#define _CBASETYPES_HPP_ +#ifndef CBASETYPES_HPP +#define CBASETYPES_HPP /* +--------+-----------+--------+---------+ * | ILP32 | LP64 | ILP64 | (LL)P64 | @@ -438,4 +438,4 @@ static inline uint32 u32min(uint32 a, uint32 b){ return (a < b) ? a : b; } static inline uint64 u64min(uint64 a, uint64 b){ return (a < b) ? a : b; } static inline size_t zmin(size_t a, size_t b){ return (a < b) ? a : b; } -#endif /* _CBASETYPES_HPP_ */ +#endif /* CBASETYPES_HPP */ diff --git a/src/common/cli.hpp b/src/common/cli.hpp index 7810ce590b..9a520de8a2 100644 --- a/src/common/cli.hpp +++ b/src/common/cli.hpp @@ -1,8 +1,8 @@ // 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" #include "timer.hpp" @@ -34,5 +34,4 @@ int cli_get_options(int argc, char ** argv); TIMER_FUNC(parse_console_timer); extern int parse_console(const char* buf); //particular for each serv -#endif /* _CLI_HPP_ */ - +#endif /* CLI_HPP */ diff --git a/src/common/conf.hpp b/src/common/conf.hpp index 95ff68fffb..e5a0bbe3d2 100644 --- a/src/common/conf.hpp +++ b/src/common/conf.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CONF_HPP_ -#define _CONF_HPP_ +#ifndef CONF_HPP +#define CONF_HPP #include "../../3rdparty/libconfig/libconfig.h" @@ -11,4 +11,4 @@ int conf_read_file(config_t *config, const char *config_filename); int config_setting_copy(config_setting_t *parent, const config_setting_t *src); -#endif // _CONF_HPP_ +#endif /* CONF_HPP */ diff --git a/src/common/core.hpp b/src/common/core.hpp index 8d2d3affca..6bfb64a42f 100644 --- a/src/common/core.hpp +++ b/src/common/core.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CORE_HPP_ -#define _CORE_HPP_ +#ifndef CORE_HPP +#define CORE_HPP /* so that developers with --enable-debug can raise signals from any section of the code they'd like */ #ifdef DEBUG @@ -53,4 +53,4 @@ enum E_CORE_ST /// If NULL, runflag is set to CORE_ST_STOP instead. extern void (*shutdown_callback)(void); -#endif /* _CORE_HPP_ */ +#endif /* CORE_HPP */ diff --git a/src/common/db.hpp b/src/common/db.hpp index 94afa2378f..4d48bd47f0 100644 --- a/src/common/db.hpp +++ b/src/common/db.hpp @@ -39,8 +39,8 @@ * @encoding US-ASCII * * @see common#db.cpp * \*****************************************************************************/ -#ifndef _DB_HPP_ -#define _DB_HPP_ +#ifndef DB_HPP +#define DB_HPP #include @@ -1655,4 +1655,4 @@ void linkdb_foreach (struct linkdb_node** head, LinkDBFunc func, ...); /// @return negative if v1 is top, positive if v2 is top, 0 if equal #define BHEAP_MAXTOPCMP(v1,v2) ( v1 == v2 ? 0 : v1 > v2 ? -1 : 1 ) -#endif /* _DB_HPP_ */ +#endif /* DB_HPP */ diff --git a/src/common/des.hpp b/src/common/des.hpp index 333e69a99a..5802727953 100644 --- a/src/common/des.hpp +++ b/src/common/des.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _DES_HPP_ -#define _DES_HPP_ +#ifndef DES_HPP +#define DES_HPP #include "cbasetypes.hpp" @@ -12,4 +12,4 @@ 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_ +#endif /* DES_HPP */ diff --git a/src/common/ers.hpp b/src/common/ers.hpp index 0d4e9798b6..2b22105e92 100644 --- a/src/common/ers.hpp +++ b/src/common/ers.hpp @@ -37,8 +37,8 @@ * @author Flavio @ Amazon Project * * @encoding US-ASCII * \*****************************************************************************/ -#ifndef _ERS_HPP_ -#define _ERS_HPP_ +#ifndef ERS_HPP +#define ERS_HPP #include "cbasetypes.hpp" @@ -177,4 +177,4 @@ void ers_report(void); void ers_final(void); #endif /* DISABLE_ERS / not DISABLE_ERS */ -#endif /* _ERS_HPP_ */ +#endif /* ERS_HPP */ diff --git a/src/common/grfio.hpp b/src/common/grfio.hpp index f053d4dc66..38f196dd62 100644 --- a/src/common/grfio.hpp +++ b/src/common/grfio.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _GRFIO_HPP_ -#define _GRFIO_HPP_ +#ifndef GRFIO_HPP +#define GRFIO_HPP void grfio_init(const char* fname); void grfio_final(void); @@ -14,4 +14,4 @@ unsigned long grfio_crc32(const unsigned char *buf, unsigned int len); int decode_zip(void* dest, unsigned long* destLen, const void* source, unsigned long sourceLen); int encode_zip(void* dest, unsigned long* destLen, const void* source, unsigned long sourceLen); -#endif /* _GRFIO_HPP_ */ +#endif /* GRFIO_HPP */ diff --git a/src/common/malloc.hpp b/src/common/malloc.hpp index 128818d7e4..383659c30c 100644 --- a/src/common/malloc.hpp +++ b/src/common/malloc.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _MALLOC_HPP_ -#define _MALLOC_HPP_ +#ifndef MALLOC_HPP +#define MALLOC_HPP #include "cbasetypes.hpp" @@ -89,4 +89,4 @@ size_t malloc_usage (void); void malloc_init (void); void malloc_final (void); -#endif /* _MALLOC_HPP_ */ +#endif /* MALLOC_HPP */ diff --git a/src/common/mapindex.hpp b/src/common/mapindex.hpp index 95db177c0e..2d39d41722 100644 --- a/src/common/mapindex.hpp +++ b/src/common/mapindex.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _MAPINDEX_HPP_ -#define _MAPINDEX_HPP_ +#ifndef MAPINDEX_HPP +#define MAPINDEX_HPP #include "../common/mmo.hpp" @@ -69,4 +69,4 @@ void mapindex_check_mapdefault(const char *mapname); void mapindex_init(void); void mapindex_final(void); -#endif /* _MAPINDEX_HPP_ */ +#endif /* MAPINDEX_HPP */ diff --git a/src/common/md5calc.hpp b/src/common/md5calc.hpp index 7f4619a913..ce1f5c41b4 100644 --- a/src/common/md5calc.hpp +++ b/src/common/md5calc.hpp @@ -1,11 +1,11 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _MD5CALC_HPP_ -#define _MD5CALC_HPP_ +#ifndef MD5CALC_HPP +#define MD5CALC_HPP void MD5_String(const char * string, char * output); void MD5_Binary(const char * string, unsigned char * output); void MD5_Salt(unsigned int len, char * output); -#endif /* _MD5CALC_HPP_ */ +#endif /* MD5CALC_HPP */ diff --git a/src/common/mmo.hpp b/src/common/mmo.hpp index 6d07f195a9..5af592b643 100644 --- a/src/common/mmo.hpp +++ b/src/common/mmo.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _MMO_HPP_ -#define _MMO_HPP_ +#ifndef MMO_HPP +#define MMO_HPP #include @@ -1049,4 +1049,4 @@ struct clan{ #define MAX_CARTS 5 #endif -#endif /* _MMO_HPP_ */ +#endif /* MMO_HPP */ diff --git a/src/common/msg_conf.hpp b/src/common/msg_conf.hpp index f26d4dba14..f200d50fae 100644 --- a/src/common/msg_conf.hpp +++ b/src/common/msg_conf.hpp @@ -39,4 +39,3 @@ const char* msg_langtype2langstr(int langtype); int msg_checklangtype(int lang, bool display); #endif /* MSG_CONF_HPP */ - diff --git a/src/common/nullpo.hpp b/src/common/nullpo.hpp index 046de58d1d..19a0ad2238 100644 --- a/src/common/nullpo.hpp +++ b/src/common/nullpo.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _NULLPO_HPP_ -#define _NULLPO_HPP_ +#ifndef NULLPO_HPP +#define NULLPO_HPP #include "cbasetypes.hpp" @@ -207,4 +207,4 @@ void nullpo_info_f(const char *file, int line, const char *func, const char *fmt, ...) __attribute__((format(printf,4,5))); -#endif /* _NULLPO_HPP_ */ +#endif /* NULLPO_HPP */ diff --git a/src/common/random.hpp b/src/common/random.hpp index 2946bf97cd..4b51b87096 100644 --- a/src/common/random.hpp +++ b/src/common/random.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _RANDOM_HPP_ -#define _RANDOM_HPP_ +#ifndef RANDOM_HPP +#define RANDOM_HPP #include "cbasetypes.hpp" @@ -11,4 +11,4 @@ void rnd_init(void); int32 rnd(void);// [0, SINT32_MAX] int32 rnd_value(int32 min, int32 max);// [min, max] -#endif /* _RANDOM_HPP_ */ +#endif /* RANDOM_HPP */ diff --git a/src/common/showmsg.hpp b/src/common/showmsg.hpp index e99f1b1c3a..aa71ee842b 100644 --- a/src/common/showmsg.hpp +++ b/src/common/showmsg.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _SHOWMSG_HPP_ -#define _SHOWMSG_HPP_ +#ifndef SHOWMSG_HPP +#define SHOWMSG_HPP #include "../../3rdparty/libconfig/libconfig.h" @@ -97,4 +97,4 @@ extern void ShowError(const char *, ...); extern void ShowFatalError(const char *, ...); extern void ShowConfigWarning(config_setting_t *config, const char *string, ...); -#endif /* _SHOWMSG_HPP_ */ +#endif /* SHOWMSG_HPP */ diff --git a/src/common/socket.hpp b/src/common/socket.hpp index c36294cf6e..4b0df74bae 100644 --- a/src/common/socket.hpp +++ b/src/common/socket.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _SOCKET_HPP_ -#define _SOCKET_HPP_ +#ifndef SOCKET_HPP +#define SOCKET_HPP #ifdef WIN32 #include "winapi.hpp" @@ -181,4 +181,4 @@ void send_shortlist_add_fd(int fd); void send_shortlist_do_sends(); #endif -#endif /* _SOCKET_HPP_ */ +#endif /* SOCKET_HPP */ diff --git a/src/common/sql.hpp b/src/common/sql.hpp index 31ce4398e0..dc695e7b06 100644 --- a/src/common/sql.hpp +++ b/src/common/sql.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef SQL_HPP +#define SQL_HPP #include // va_list @@ -347,4 +347,4 @@ void SqlStmt_Free(SqlStmt* self); void Sql_Init(void); -#endif /* _COMMON_SQL_HPP_ */ +#endif /* SQL_HPP */ diff --git a/src/common/strlib.hpp b/src/common/strlib.hpp index 0c86188077..a3f04d054c 100644 --- a/src/common/strlib.hpp +++ b/src/common/strlib.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _STRLIB_HPP_ -#define _STRLIB_HPP_ +#ifndef STRLIB_HPP +#define STRLIB_HPP #include @@ -159,4 +159,4 @@ void StringBuf_Clear(StringBuf* self); void StringBuf_Destroy(StringBuf* self); void StringBuf_Free(StringBuf* self); -#endif /* _STRLIB_HPP_ */ +#endif /* STRLIB_HPP */ diff --git a/src/common/timer.hpp b/src/common/timer.hpp index 4dfb5c6e31..a19903b99a 100644 --- a/src/common/timer.hpp +++ b/src/common/timer.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _TIMER_HPP_ -#define _TIMER_HPP_ +#ifndef TIMER_HPP +#define TIMER_HPP #include @@ -62,4 +62,4 @@ int do_timer(unsigned int tick); void timer_init(void); void timer_final(void); -#endif /* _TIMER_HPP_ */ +#endif /* TIMER_HPP */ diff --git a/src/common/utilities.hpp b/src/common/utilities.hpp index 5765b55e80..24fc021464 100644 --- a/src/common/utilities.hpp +++ b/src/common/utilities.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _UTILILITIES_HPP_ -#define _UTILILITIES_HPP_ +#ifndef UTILILITIES_HPP +#define UTILILITIES_HPP #include #include @@ -92,4 +92,4 @@ namespace rathena { } } -#endif /* _UTILILITIES_HPP_ */ +#endif /* UTILILITIES_HPP */ diff --git a/src/common/utils.hpp b/src/common/utils.hpp index c6b749f07b..ca946ec949 100644 --- a/src/common/utils.hpp +++ b/src/common/utils.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _UTILS_HPP_ -#define _UTILS_HPP_ +#ifndef UTILS_HPP +#define UTILS_HPP #include // FILE* @@ -47,4 +47,4 @@ extern uint32 GetULong(const unsigned char* buf); extern int32 GetLong(const unsigned char* buf); extern float GetFloat(const unsigned char* buf); -#endif /* _UTILS_HPP_ */ +#endif /* UTILS_HPP */ diff --git a/src/common/winapi.hpp b/src/common/winapi.hpp index b26cdf5389..f43cd4af1d 100644 --- a/src/common/winapi.hpp +++ b/src/common/winapi.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _WINAPI_HPP_ -#define _WINAPI_HPP_ +#ifndef WINAPI_HPP +#define WINAPI_HPP #ifndef NTDDI_VERSION #define NTDDI_VERSION 0x05000000 // Windows 2000 @@ -51,4 +51,4 @@ bool IsCurrentUserLocalAdministrator(void); -#endif /* _WINAPI_HPP_ */ +#endif /* WINAPI_HPP */ diff --git a/src/config/classes/general.hpp b/src/config/classes/general.hpp index dfad8091e6..23ab005268 100644 --- a/src/config/classes/general.hpp +++ b/src/config/classes/general.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef CONFIG_GENERAL_HPP +#define CONFIG_GENERAL_HPP /** * rAthena configuration file (http://rathena.org) @@ -21,4 +21,4 @@ * No settings past this point **/ -#endif // _CONFIG_GENERAL_HPP_ +#endif /* CONFIG_GENERAL_HPP */ diff --git a/src/config/const.hpp b/src/config/const.hpp index 0a0879cd93..64e58d04ac 100644 --- a/src/config/const.hpp +++ b/src/config/const.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef CONFIG_CONST_H +#define CONFIG_CONST_H /** * rAthena configuration file (http://rathena.org) @@ -112,4 +112,4 @@ /** * End of File **/ -#endif // _CONFIG_CONST_H_ +#endif /* CONFIG_CONST_H */ diff --git a/src/config/core.hpp b/src/config/core.hpp index e332f27752..a9b53a13d7 100644 --- a/src/config/core.hpp +++ b/src/config/core.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef CONFIG_CORE_HPP +#define CONFIG_CORE_HPP /** * rAthena configuration file (http://rathena.org) @@ -83,4 +83,4 @@ #include "../custom/defines_post.hpp" -#endif // _CONFIG_CORE_HPP_ +#endif /* CONFIG_CORE_HPP */ diff --git a/src/config/packets.hpp b/src/config/packets.hpp index 30932fb6a6..b81e814c28 100644 --- a/src/config/packets.hpp +++ b/src/config/packets.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef CONFIG_PACKETS_HPP +#define CONFIG_PACKETS_HPP /** * rAthena configuration file (http://rathena.org) @@ -70,4 +70,4 @@ /// Check if the specified packetvresion supports the cashshop sale system #define PACKETVER_SUPPORTS_SALES PACKETVER >= 20131223 -#endif // _CONFIG_PACKETS_HPP_ +#endif /* CONFIG_PACKETS_HPP */ diff --git a/src/config/renewal.hpp b/src/config/renewal.hpp index 080fea23b2..bb47ca2b52 100644 --- a/src/config/renewal.hpp +++ b/src/config/renewal.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef CONFIG_RENEWAL_HPP +#define CONFIG_RENEWAL_HPP //quick option to disable all renewal option, used by ./configure //#define PRERE @@ -75,4 +75,4 @@ #endif -#endif // _CONFIG_RENEWAL_HPP_ +#endif /* CONFIG_RENEWAL_HPP */ diff --git a/src/config/secure.hpp b/src/config/secure.hpp index 6b42219567..97dd678484 100644 --- a/src/config/secure.hpp +++ b/src/config/secure.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef CONFIG_SECURE_HPP +#define CONFIG_SECURE_HPP /** * rAthena configuration file (http://rathena.org) @@ -47,4 +47,4 @@ **/ #define SECURE_NPCTIMEOUT_INTERVAL 1 -#endif // _CONFIG_SECURE_HPP_ +#endif /* CONFIG_SECURE_HPP */ diff --git a/src/custom/defines_post.hpp b/src/custom/defines_post.hpp index f5ac873a2a..253b8cdbfe 100644 --- a/src/custom/defines_post.hpp +++ b/src/custom/defines_post.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef CONFIG_CUSTOM_DEFINES_POST_HPP +#define CONFIG_CUSTOM_DEFINES_POST_HPP /** * rAthena configuration file (http://rathena.org) @@ -11,4 +11,4 @@ -#endif // _CONFIG_CUSTOM_DEFINES_POST_HPP_ +#endif /* CONFIG_CUSTOM_DEFINES_POST_HPP */ diff --git a/src/custom/defines_pre.hpp b/src/custom/defines_pre.hpp index 2fb9e2db0e..93b1780dc5 100644 --- a/src/custom/defines_pre.hpp +++ b/src/custom/defines_pre.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef CONFIG_CUSTOM_DEFINES_PRE_HPP +#define CONFIG_CUSTOM_DEFINES_PRE_HPP /** * rAthena configuration file (http://rathena.org) @@ -11,4 +11,4 @@ -#endif // _CONFIG_CUSTOM_DEFINES_PRE_HPP_ +#endif /* CONFIG_CUSTOM_DEFINES_PRE_HPP */ diff --git a/src/login/account.hpp b/src/login/account.hpp index d67ed752a8..bc9c6f3d7c 100644 --- a/src/login/account.hpp +++ b/src/login/account.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _ACCOUNT_HPP_ -#define _ACCOUNT_HPP_ +#ifndef ACCOUNT_HPP +#define ACCOUNT_HPP #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" // ACCOUNT_REG2_NUM @@ -135,5 +135,4 @@ struct AccountDB { void mmo_send_global_accreg(AccountDB* self, int fd, int account_id, int char_id); void mmo_save_global_accreg(AccountDB* self, int fd, int account_id, int char_id); - -#endif /* _ACCOUNT_HPP_ */ +#endif /* ACCOUNT_HPP */ diff --git a/src/login/ipban.hpp b/src/login/ipban.hpp index 7ee5fb678b..3925e2a7ad 100644 --- a/src/login/ipban.hpp +++ b/src/login/ipban.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _IPBAN_HPP_ -#define _IPBAN_HPP_ +#ifndef IPBAN_HPP +#define IPBAN_HPP #include "../common/cbasetypes.hpp" @@ -40,4 +40,4 @@ void ipban_init(void); */ void ipban_final(void); -#endif /* _IPBAN_HPP_ */ +#endif /* IPBAN_HPP */ diff --git a/src/login/login.hpp b/src/login/login.hpp index deed610bd5..aeb51e9403 100644 --- a/src/login/login.hpp +++ b/src/login/login.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _LOGIN_HPP_ -#define _LOGIN_HPP_ +#ifndef LOGIN_HPP +#define LOGIN_HPP #include @@ -228,5 +228,4 @@ int login_mmo_auth_new(const char* userid, const char* pass, const char sex, con */ int login_mmo_auth(struct login_session_data* sd, bool isServer); - -#endif /* _LOGIN_HPP_ */ +#endif /* LOGIN_HPP */ diff --git a/src/login/loginchrif.hpp b/src/login/loginchrif.hpp index 8720074659..bb8fe6f45d 100644 --- a/src/login/loginchrif.hpp +++ b/src/login/loginchrif.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _LOGINCHRIF_HPP_ -#define _LOGINCHRIF_HPP_ +#ifndef LOGINCHRIF_HPP +#define LOGINCHRIF_HPP #include "../common/cbasetypes.hpp" @@ -40,6 +40,4 @@ void do_shutdown_loginchrif(void); */ void do_final_loginchrif(void); - -#endif /* _LOGINCHRIF_HPP_ */ - +#endif /* LOGINCHRIF_HPP */ diff --git a/src/login/loginclif.hpp b/src/login/loginclif.hpp index 7351b45772..19fc5607c8 100644 --- a/src/login/loginclif.hpp +++ b/src/login/loginclif.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _LOGINCLIF_HPP_ -#define _LOGINCLIF_HPP_ +#ifndef LOGINCLIF_HPP +#define LOGINCLIF_HPP /** * Entry point from client to log-server. @@ -24,5 +24,4 @@ void do_init_loginclif(void); */ void do_final_loginclif(void); -#endif /* _LOGINCLIF_HPP_ */ - +#endif /* LOGINCLIF_HPP */ diff --git a/src/login/logincnslif.hpp b/src/login/logincnslif.hpp index 197021bcb2..23978a509d 100644 --- a/src/login/logincnslif.hpp +++ b/src/login/logincnslif.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _LOGINCNSLIF_HPP_ -#define _LOGINCNSLIF_HPP_ +#ifndef LOGINCNSLIF_HPP +#define LOGINCNSLIF_HPP /** * Console Command Parser @@ -33,6 +33,4 @@ void do_init_logincnslif(void); */ void do_final_logincnslif(void); - -#endif /* _LOGINCNSLIF_HPP_ */ - +#endif /* LOGINCNSLIF_HPP */ diff --git a/src/login/loginlog.hpp b/src/login/loginlog.hpp index 74d57575b6..6fd39fc0fa 100644 --- a/src/login/loginlog.hpp +++ b/src/login/loginlog.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _LOGINLOG_HPP_ -#define _LOGINLOG_HPP_ +#ifndef LOGINLOG_HPP +#define LOGINLOG_HPP #include @@ -48,5 +48,4 @@ bool loginlog_init(void); */ bool loginlog_final(void); - -#endif /* _LOGINLOG_HPP_ */ +#endif /* LOGINLOG_HPP */ diff --git a/src/map/achievement.hpp b/src/map/achievement.hpp index 54ca33a527..3bf1cce19f 100644 --- a/src/map/achievement.hpp +++ b/src/map/achievement.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _ACHIEVEMENT_HPP_ -#define _ACHIEVEMENT_HPP_ +#ifndef ACHIEVEMENT_HPP +#define ACHIEVEMENT_HPP #include #include @@ -123,4 +123,4 @@ const char *av_parse_simpleexpr(const char *p, std::shared_ptr condition, struct map_session_data *sd, const int *count); void achievement_script_free(std::shared_ptr condition); -#endif /* _ACHIEVEMENT_HPP_ */ +#endif /* ACHIEVEMENT_HPP */ diff --git a/src/map/atcommand.hpp b/src/map/atcommand.hpp index fbcaffe510..615bc38c70 100644 --- a/src/map/atcommand.hpp +++ b/src/map/atcommand.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _ATCOMMAND_HPP_ -#define _ATCOMMAND_HPP_ +#ifndef ATCOMMAND_HPP +#define ATCOMMAND_HPP #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" @@ -45,4 +45,4 @@ struct atcmd_binding_data { extern struct atcmd_binding_data** atcmd_binding; struct atcmd_binding_data* get_atcommandbind_byname(const char* name); -#endif /* _ATCOMMAND_HPP_ */ +#endif /* ATCOMMAND_HPP */ diff --git a/src/map/battle.hpp b/src/map/battle.hpp index 0dfefdbfaf..a67f101dce 100644 --- a/src/map/battle.hpp +++ b/src/map/battle.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _BATTLE_HPP_ -#define _BATTLE_HPP_ +#ifndef BATTLE_HPP +#define BATTLE_HPP #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" @@ -666,4 +666,4 @@ struct block_list* battle_getenemyarea(struct block_list *src, int x, int y, int **/ int battle_damage_area( struct block_list *bl, va_list ap); -#endif /* _BATTLE_HPP_ */ +#endif /* BATTLE_HPP */ diff --git a/src/map/battleground.hpp b/src/map/battleground.hpp index 65bee90594..9ee9165b81 100644 --- a/src/map/battleground.hpp +++ b/src/map/battleground.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _BATTLEGROUND_HPP_ -#define _BATTLEGROUND_HPP_ +#ifndef BATTLEGROUND_HPP +#define BATTLEGROUND_HPP #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" // struct party @@ -42,4 +42,4 @@ int bg_team_warp(int bg_id, unsigned short mapindex, short x, short y); int bg_member_respawn(struct map_session_data *sd); int bg_send_message(struct map_session_data *sd, const char *mes, int len); -#endif /* _BATTLEGROUND_HPP_ */ +#endif /* BATTLEGROUND_HPP */ diff --git a/src/map/buyingstore.hpp b/src/map/buyingstore.hpp index 2737de9eec..0c052d4722 100644 --- a/src/map/buyingstore.hpp +++ b/src/map/buyingstore.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _BUYINGSTORE_HPP_ -#define _BUYINGSTORE_HPP_ +#ifndef BUYINGSTORE_HPP +#define BUYINGSTORE_HPP #include "../common/cbasetypes.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.hpp b/src/map/cashshop.hpp index b0ef4c9bf0..a7c3530286 100644 --- a/src/map/cashshop.hpp +++ b/src/map/cashshop.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CASHSHOP_HPP_ -#define _CASHSHOP_HPP_ +#ifndef CASHSHOP_HPP +#define CASHSHOP_HPP #include "../common/cbasetypes.hpp" // uint16, uint32 #include "../common/timer.hpp" // ShowWarning, ShowStatus @@ -95,4 +95,4 @@ bool sale_remove_item(uint16 nameid); void sale_notify_login( struct map_session_data* sd ); #endif -#endif /* _CASHSHOP_HPP_ */ +#endif /* CASHSHOP_HPP */ diff --git a/src/map/channel.hpp b/src/map/channel.hpp index e19bcbae7a..642640b7c9 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_HPP_ -#define _CHANNEL_HPP_ +#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_HPP_ */ +#endif /* CHANNEL_HPP */ diff --git a/src/map/chat.hpp b/src/map/chat.hpp index 2a323e89a6..28787f3596 100644 --- a/src/map/chat.hpp +++ b/src/map/chat.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CHAT_HPP_ -#define _CHAT_HPP_ +#ifndef CHAT_HPP +#define CHAT_HPP #include "map.hpp" // struct block_list, CHATROOM_TITLE_SIZE @@ -43,4 +43,4 @@ int chat_npckickall(struct chat_data* cd); int chat_npckickchat(struct chat_data* cd, const char* kickusername); -#endif /* _CHAT_HPP_ */ +#endif /* CHAT_HPP */ diff --git a/src/map/chrif.hpp b/src/map/chrif.hpp index 5e7bd188f8..7c625f8c80 100644 --- a/src/map/chrif.hpp +++ b/src/map/chrif.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CHRIF_HPP_ -#define _CHRIF_HPP_ +#ifndef CHRIF_HPP +#define CHRIF_HPP #include @@ -92,4 +92,4 @@ void do_init_chrif(void); int chrif_flush_fifo(void); -#endif /* _CHRIF_HPP_ */ +#endif /* CHRIF_HPP */ diff --git a/src/map/clan.hpp b/src/map/clan.hpp index f2b90ab804..7066ba6ba3 100644 --- a/src/map/clan.hpp +++ b/src/map/clan.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CLAN_HPP_ -#define _CLAN_HPP_ +#ifndef CLAN_HPP +#define CLAN_HPP #include "../common/mmo.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_HPP_ */ +#endif /* CLAN_HPP */ diff --git a/src/map/clif.hpp b/src/map/clif.hpp index ba1170011f..67c6fc50b7 100644 --- a/src/map/clif.hpp +++ b/src/map/clif.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CLIF_HPP_ -#define _CLIF_HPP_ +#ifndef CLIF_HPP +#define CLIF_HPP #include @@ -1091,4 +1091,4 @@ void clif_attendence_response( struct map_session_data *sd, int32 data ); void clif_weight_limit( struct map_session_data* sd ); -#endif /* _CLIF_HPP_ */ +#endif /* CLIF_HPP */ diff --git a/src/map/clif_obfuscation.hpp b/src/map/clif_obfuscation.hpp index 953131f9bd..f45da8880e 100644 --- a/src/map/clif_obfuscation.hpp +++ b/src/map/clif_obfuscation.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CLIF_OBFUSCATION_HPP_ -#define _CLIF_OBFUSCATION_HPP_ +#ifndef CLIF_OBFUSCATION_HPP +#define CLIF_OBFUSCATION_HPP #if defined(PACKET_OBFUSCATION) || defined(PACKET_OBFUSCATION_WARN) #define packet_keys(a,b,c) static unsigned int clif_cryptKey[] = { a, b, c }; @@ -427,4 +427,4 @@ #undef packet_keys #endif -#endif /* _CLIF_OBFUSCATION_HPP_ */ +#endif /* CLIF_OBFUSCATION_HPP */ diff --git a/src/map/clif_packetdb.hpp b/src/map/clif_packetdb.hpp index 6fbaadaf53..86936597d8 100644 --- a/src/map/clif_packetdb.hpp +++ b/src/map/clif_packetdb.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CLIF_PACKETDB_HPP_ -#define _CLIF_PACKETDB_HPP_ +#ifndef CLIF_PACKETDB_HPP +#define CLIF_PACKETDB_HPP #define packet(cmd,length) packetdb_addpacket(cmd,length,NULL,0) #define parseable_packet(cmd,length,func,...) packetdb_addpacket(cmd,length,func,__VA_ARGS__,0) @@ -2402,4 +2402,4 @@ packet(0x0A4C,28); #endif -#endif /* _CLIF_PACKETDB_HPP_ */ +#endif /* CLIF_PACKETDB_HPP */ diff --git a/src/map/clif_shuffle.hpp b/src/map/clif_shuffle.hpp index baea719e54..27caa58732 100644 --- a/src/map/clif_shuffle.hpp +++ b/src/map/clif_shuffle.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _CLIF_SHUFFLE_HPP_ -#define _CLIF_SHUFFLE_HPP_ +#ifndef CLIF_SHUFFLE_HPP +#define CLIF_SHUFFLE_HPP // 2013-05-15aRagexe #if PACKETVER == 20130515 @@ -4752,4 +4752,4 @@ parseable_packet(0x083C,12,clif_parse_SearchStoreInfoListItemClick,2,6,10); #endif -#endif /* _CLIF_SHUFFLE_HPP_ */ +#endif /* CLIF_SHUFFLE_HPP */ diff --git a/src/map/date.hpp b/src/map/date.hpp index 46cd0c7114..d627f9225a 100644 --- a/src/map/date.hpp +++ b/src/map/date.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _DATE_HPP_ -#define _DATE_HPP_ +#ifndef DATE_HPP +#define DATE_HPP #include "../common/cbasetypes.hpp" @@ -61,4 +61,4 @@ bool is_day_of_sun(void); bool is_day_of_moon(void); bool is_day_of_star(void); -#endif /* _DATE_HPP_ */ +#endif /* DATE_HPP */ diff --git a/src/map/duel.hpp b/src/map/duel.hpp index 2589db8cc5..bfbeef709a 100644 --- a/src/map/duel.hpp +++ b/src/map/duel.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#pragma once -#ifndef _DUEL_HPP_ -#define _DUEL_HPP_ + +#ifndef DUEL_HPP +#define DUEL_HPP #include "../common/cbasetypes.hpp" @@ -30,5 +30,4 @@ bool duel_check_player_limit( struct duel& pDuel ); void do_init_duel(void); void do_final_duel(void); - -#endif /* _DUEL_HPP_ */ +#endif /* DUEL_HPP */ diff --git a/src/map/elemental.hpp b/src/map/elemental.hpp index d86ac3208b..406772bc45 100644 --- a/src/map/elemental.hpp +++ b/src/map/elemental.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _ELEMENTAL_HPP_ -#define _ELEMENTAL_HPP_ +#ifndef ELEMENTAL_HPP +#define ELEMENTAL_HPP #include "../common/mmo.hpp" @@ -113,4 +113,4 @@ void reload_elemental_skilldb(void); void do_init_elemental(void); void do_final_elemental(void); -#endif /* _ELEMENTAL_HPP_ */ +#endif /* ELEMENTAL_HPP */ diff --git a/src/map/guild.hpp b/src/map/guild.hpp index 39e8cef5be..164bf49a11 100644 --- a/src/map/guild.hpp +++ b/src/map/guild.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _GUILD_HPP_ -#define _GUILD_HPP_ +#ifndef GUILD_HPP +#define GUILD_HPP #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" @@ -118,4 +118,4 @@ void guild_retrieveitembound(uint32 char_id,uint32 account_id,int guild_id); void do_final_guild(void); -#endif /* _GUILD_HPP_ */ +#endif /* GUILD_HPP */ diff --git a/src/map/homunculus.hpp b/src/map/homunculus.hpp index e6fb9c1ef7..9b95f41444 100644 --- a/src/map/homunculus.hpp +++ b/src/map/homunculus.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _HOMUNCULUS_HPP_ -#define _HOMUNCULUS_HPP_ +#ifndef HOMUNCULUS_HPP +#define HOMUNCULUS_HPP #include "../common/cbasetypes.hpp" @@ -193,4 +193,4 @@ short hom_skill_get_index(uint16 skill_id); void do_final_homunculus(void); void do_init_homunculus(void); -#endif /* _HOMUNCULUS_HPP_ */ +#endif /* HOMUNCULUS_HPP */ diff --git a/src/map/instance.hpp b/src/map/instance.hpp index 8988b5faaa..59ac747616 100644 --- a/src/map/instance.hpp +++ b/src/map/instance.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INSTANCE_HPP_ -#define _INSTANCE_HPP_ +#ifndef INSTANCE_HPP +#define INSTANCE_HPP #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" // struct point @@ -100,4 +100,4 @@ void do_final_instance(void); #error Too many maps per instance defined! Please adjust MAX_MAP_PER_INSTANCE to a lower value. #endif -#endif /* _INSTANCE_HPP_ */ +#endif /* INSTANCE_HPP */ diff --git a/src/map/intif.hpp b/src/map/intif.hpp index ab1647db6d..7bd164fa91 100644 --- a/src/map/intif.hpp +++ b/src/map/intif.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _INTIF_HPP_ -#define _INTIF_HPP_ +#ifndef INTIF_HPP +#define INTIF_HPP #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" @@ -129,4 +129,4 @@ bool intif_storage_save(struct map_session_data *sd, struct s_storage *stor); int CheckForCharServer(void); -#endif /* _INTIF_HPP_ */ +#endif /* INTIF_HPP */ diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index a45114468d..2f4f71bd13 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _ITEMDB_HPP_ -#define _ITEMDB_HPP_ +#ifndef ITEMDB_HPP +#define ITEMDB_HPP #include "../common/db.hpp" #include "../common/mmo.hpp" // ITEM_NAME_LENGTH @@ -962,4 +962,4 @@ void itemdb_reload(void); void do_final_itemdb(void); void do_init_itemdb(void); -#endif /* _ITEMDB_HPP_ */ +#endif /* ITEMDB_HPP */ diff --git a/src/map/log.hpp b/src/map/log.hpp index 45c8ba92e3..488ead18f1 100644 --- a/src/map/log.hpp +++ b/src/map/log.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _LOG_HPP_ -#define _LOG_HPP_ +#ifndef LOG_HPP +#define LOG_HPP #include "../common/cbasetypes.hpp" @@ -99,4 +99,4 @@ extern struct Log_Config char log_feeding[64]; } log_config; -#endif /* _LOG_HPP_ */ +#endif /* LOG_HPP */ diff --git a/src/map/mail.hpp b/src/map/mail.hpp index d1d1ed0733..45afa099d4 100644 --- a/src/map/mail.hpp +++ b/src/map/mail.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _MAIL_HPP_ -#define _MAIL_HPP_ +#ifndef MAIL_HPP +#define MAIL_HPP #include "../common/mmo.hpp" @@ -33,4 +33,4 @@ bool mail_invalid_operation(struct map_session_data *sd); void mail_send(struct map_session_data *sd, const char *dest_name, const char *title, const char *body_msg, int body_len); void mail_refresh_remaining_amount( struct map_session_data* sd ); -#endif /* _MAIL_HPP_ */ +#endif /* MAIL_HPP */ diff --git a/src/map/map.hpp b/src/map/map.hpp index e570dc21f0..669918aea9 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _MAP_HPP_ -#define _MAP_HPP_ +#ifndef MAP_HPP +#define MAP_HPP #include #include @@ -1172,4 +1172,4 @@ extern char roulette_table[32]; void do_shutdown(void); -#endif /* _MAP_HPP_ */ +#endif /* MAP_HPP */ diff --git a/src/map/mapreg.hpp b/src/map/mapreg.hpp index 49b0e65288..c9f0041d8d 100644 --- a/src/map/mapreg.hpp +++ b/src/map/mapreg.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _MAPREG_HPP_ -#define _MAPREG_HPP_ +#ifndef MAPREG_HPP +#define MAPREG_HPP #include "../common/cbasetypes.hpp" #include "../common/db.hpp" @@ -31,4 +31,4 @@ bool mapreg_setreg(int64 uid, int val); bool mapreg_setregstr(int64 uid, const char* str); int mapreg_destroyreg(DBKey key, DBData *data, va_list ap); -#endif /* _MAPREG_HPP_ */ +#endif /* MAPREG_HPP */ diff --git a/src/map/mercenary.hpp b/src/map/mercenary.hpp index eff865fdaf..e921168ae1 100644 --- a/src/map/mercenary.hpp +++ b/src/map/mercenary.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _MERCENARY_HPP_ -#define _MERCENARY_HPP_ +#ifndef MERCENARY_HPP +#define MERCENARY_HPP #include "../common/cbasetypes.hpp" @@ -92,4 +92,4 @@ void mercenary_read_skilldb(void); void do_init_mercenary(void); void do_final_mercenary(void); -#endif /* _MERCENARY_HPP_ */ +#endif /* MERCENARY_HPP */ diff --git a/src/map/mob.hpp b/src/map/mob.hpp index 200b319154..7c61030522 100644 --- a/src/map/mob.hpp +++ b/src/map/mob.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _MOB_HPP_ -#define _MOB_HPP_ +#ifndef MOB_HPP +#define MOB_HPP #include @@ -368,4 +368,4 @@ void mob_setdropitem_option(struct item *itm, struct s_mob_drop *mobdrop); #define CHK_MOBSIZE(size) ((size) >= SZ_SMALL && (size) < SZ_MAX) /// Check valid Monster Size -#endif /* _MOB_HPP_ */ +#endif /* MOB_HPP */ diff --git a/src/map/npc.hpp b/src/map/npc.hpp index 08f37db97c..ca79159d1a 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _NPC_HPP_ -#define _NPC_HPP_ +#ifndef NPC_HPP +#define NPC_HPP #include "../common/timer.hpp" @@ -1223,4 +1223,4 @@ int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const c bool npc_unloadfile( const char* path ); -#endif /* _NPC_HPP_ */ +#endif /* NPC_HPP */ diff --git a/src/map/party.hpp b/src/map/party.hpp index 40916a1f2a..d27633db7d 100644 --- a/src/map/party.hpp +++ b/src/map/party.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _PARTY_HPP_ -#define _PARTY_HPP_ +#ifndef PARTY_HPP +#define PARTY_HPP #include @@ -99,4 +99,4 @@ void party_booking_update(struct map_session_data *sd, short* job); void party_booking_search(struct map_session_data *sd, short level, short mapid, short job, unsigned long lastindex, short resultcount); bool party_booking_delete(struct map_session_data *sd); -#endif /* _PARTY_HPP_ */ +#endif /* PARTY_HPP */ diff --git a/src/map/path.hpp b/src/map/path.hpp index 73165d4221..7efb843ff1 100644 --- a/src/map/path.hpp +++ b/src/map/path.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _PATH_HPP_ -#define _PATH_HPP_ +#ifndef PATH_HPP +#define PATH_HPP #include "../common/cbasetypes.hpp" @@ -74,4 +74,4 @@ bool direction_diagonal( enum directions direction ); void do_init_path(); void do_final_path(); -#endif /* _PATH_HPP_ */ +#endif /* PATH_HPP */ diff --git a/src/map/pc.hpp b/src/map/pc.hpp index e2609b5eb0..c23a235e29 100644 --- a/src/map/pc.hpp +++ b/src/map/pc.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _PC_HPP_ -#define _PC_HPP_ +#ifndef PC_HPP +#define PC_HPP #include @@ -1345,4 +1345,4 @@ bool pc_attendance_enabled(); int32 pc_attendance_counter( struct map_session_data* sd ); void pc_attendance_claim_reward( struct map_session_data* sd ); -#endif /* _PC_HPP_ */ +#endif /* PC_HPP */ diff --git a/src/map/pc_groups.hpp b/src/map/pc_groups.hpp index 6420442988..a5c9b68674 100644 --- a/src/map/pc_groups.hpp +++ b/src/map/pc_groups.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _PC_GROUPS_HPP_ -#define _PC_GROUPS_HPP_ +#ifndef PC_GROUPS_HPP +#define PC_GROUPS_HPP #include "../common/cbasetypes.hpp" @@ -91,4 +91,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.hpp b/src/map/pet.hpp index 9712c823f9..732c2f7479 100644 --- a/src/map/pet.hpp +++ b/src/map/pet.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _PET_HPP_ -#define _PET_HPP_ +#ifndef PET_HPP +#define PET_HPP #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" @@ -164,4 +164,4 @@ void read_petdb(void); void do_init_pet(void); void do_final_pet(void); -#endif /* _PET_HPP_ */ +#endif /* PET_HPP */ diff --git a/src/map/quest.hpp b/src/map/quest.hpp index 8a2fb5b577..17ed05f241 100644 --- a/src/map/quest.hpp +++ b/src/map/quest.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _QUEST_HPP_ -#define _QUEST_HPP_ +#ifndef QUEST_HPP +#define QUEST_HPP #include "../common/cbasetypes.hpp" #include "../common/strlib.hpp" @@ -63,4 +63,4 @@ void do_init_quest(void); void do_final_quest(void); void do_reload_quest(void); -#endif /* _QUEST_HPP_ */ +#endif /* QUEST_HPP */ diff --git a/src/map/script.hpp b/src/map/script.hpp index 9445601707..cbfac014d0 100644 --- a/src/map/script.hpp +++ b/src/map/script.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _SCRIPT_HPP_ -#define _SCRIPT_HPP_ +#ifndef SCRIPT_HPP +#define SCRIPT_HPP #include "../common/cbasetypes.hpp" #include "../common/db.hpp" @@ -1983,4 +1983,4 @@ unsigned int *script_array_cpy_list(struct script_array *sa); bool script_check_RegistryVariableLength(int pType, const char *val, size_t* vlen); -#endif /* _SCRIPT_HPP_ */ +#endif /* SCRIPT_HPP */ diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index f81a824c48..186a3a25c8 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -1,8 +1,8 @@ // 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_ +#ifndef 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) @@ -7287,4 +7287,4 @@ #undef export_deprecated_constant #undef export_deprecated_constant2 -#endif /* _SCRIPT_CONSTANTS_HPP_ */ +#endif /* SCRIPT_CONSTANTS_HPP */ diff --git a/src/map/searchstore.hpp b/src/map/searchstore.hpp index 657463eb8d..75645b8e9c 100644 --- a/src/map/searchstore.hpp +++ b/src/map/searchstore.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _SEARCHSTORE_HPP_ -#define _SEARCHSTORE_HPP_ +#ifndef SEARCHSTORE_HPP +#define SEARCHSTORE_HPP #include "../common/cbasetypes.hpp" #include "../common/mmo.hpp" @@ -56,4 +56,4 @@ bool searchstore_queryremote(struct map_session_data* sd, uint32 account_id); void searchstore_clearremote(struct map_session_data* sd); bool searchstore_result(struct map_session_data* sd, int store_id, uint32 account_id, const char* store_name, unsigned short nameid, unsigned short amount, unsigned int price, const unsigned short* card, unsigned char refine); -#endif /* _SEARCHSTORE_HPP_ */ +#endif /* SEARCHSTORE_HPP */ diff --git a/src/map/skill.hpp b/src/map/skill.hpp index ee17bb56b0..a2e628f120 100644 --- a/src/map/skill.hpp +++ b/src/map/skill.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _SKILL_HPP_ -#define _SKILL_HPP_ +#ifndef SKILL_HPP +#define SKILL_HPP #include "../common/cbasetypes.hpp" #include "../common/db.hpp" @@ -2226,4 +2226,4 @@ void skill_reveal_trap_inarea(struct block_list *src, int range, int x, int y); #define SKILL_CHK_ELEM(skill_id) ( (skill_id) >= EL_SKILLBASE && (skill_id) < EL_SKILLBASE+MAX_ELEMENTALSKILL ) #define SKILL_CHK_GUILD(skill_id) ( (skill_id) >= GD_SKILLBASE && (skill_id) < GD_SKILLBASE+MAX_GUILDSKILL ) -#endif /* _SKILL_HPP_ */ +#endif /* SKILL_HPP */ diff --git a/src/map/status.hpp b/src/map/status.hpp index 0123619078..7b3c850aa0 100644 --- a/src/map/status.hpp +++ b/src/map/status.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _STATUS_HPP_ -#define _STATUS_HPP_ +#ifndef STATUS_HPP +#define STATUS_HPP #include "../common/mmo.hpp" #include "../common/timer.hpp" @@ -3434,4 +3434,4 @@ int status_readdb(void); int do_init_status(void); void do_final_status(void); -#endif /* _STATUS_HPP_ */ +#endif /* STATUS_HPP */ diff --git a/src/map/storage.hpp b/src/map/storage.hpp index a698bfeb3b..329cef6053 100644 --- a/src/map/storage.hpp +++ b/src/map/storage.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _STORAGE_HPP_ -#define _STORAGE_HPP_ +#ifndef STORAGE_HPP +#define STORAGE_HPP #include "../common/cbasetypes.hpp" @@ -73,4 +73,4 @@ void storage_premiumStorage_quit(struct map_session_data *sd); int compare_item(struct item *a, struct item *b); -#endif /* _STORAGE_HPP_ */ +#endif /* STORAGE_HPP */ diff --git a/src/map/trade.hpp b/src/map/trade.hpp index d17b2e7b7f..deef5b680a 100644 --- a/src/map/trade.hpp +++ b/src/map/trade.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _TRADE_HPP_ -#define _TRADE_HPP_ +#ifndef TRADE_HPP +#define TRADE_HPP struct map_session_data; @@ -14,4 +14,4 @@ void trade_tradeok(struct map_session_data *sd); void trade_tradecancel(struct map_session_data *sd); void trade_tradecommit(struct map_session_data *sd); -#endif /* _TRADE_HPP_ */ +#endif /* TRADE_HPP */ diff --git a/src/map/unit.hpp b/src/map/unit.hpp index 74484dd586..3feeb7ac5d 100644 --- a/src/map/unit.hpp +++ b/src/map/unit.hpp @@ -1,8 +1,8 @@ // Copyright (c) rAthena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#ifndef _UNIT_HPP_ -#define _UNIT_HPP_ +#ifndef UNIT_HPP +#define UNIT_HPP #include "../common/cbasetypes.hpp" #include "../common/timer.hpp" @@ -170,4 +170,4 @@ int unit_changetarget(struct block_list *bl,va_list ap); void do_init_unit(void); void do_final_unit(void); -#endif /* _UNIT_HPP_ */ +#endif /* UNIT_HPP */