* Merged changes up to eAthena 15039.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15243 54d463be-8e91-2dee-dedb-b68131a5f0ec

src/map/log.h

@@ -21,21 +21,6 @@ typedef enum e_log_chat_type
 e_log_chat_type;
 
 
-//New logs
-void log_pick_pc(struct map_session_data *sd, const char *type, int nameid, int amount, struct item *itm);
-void log_pick_mob(struct mob_data *md, const char *type, int nameid, int amount, struct item *itm);
-void log_zeny(struct map_session_data *sd, char *type, struct map_session_data *src_sd, int amount);
-
-void log_npc(struct map_session_data *sd, const char *message);
-void log_chat(e_log_chat_type type, int type_id, int src_charid, int src_accid, const char* map, int x, int y, const char* dst_charname, const char* message);
-void log_atcommand(struct map_session_data *sd, const char *message);
-
-//Old, but useful logs
-void log_branch(struct map_session_data *sd);
-void log_mvpdrop(struct map_session_data *sd, int monster_id, int *log_mvp);
-
-int log_config_read(char *cfgName);
-
 typedef enum log_what
 {
 	LOG_ALL                 = 0xFFFF,
@@ -57,6 +42,21 @@ typedef enum log_what
 log_what;
 
 
+//New logs
+void log_pick_pc(struct map_session_data *sd, const char *type, int nameid, int amount, struct item *itm);
+void log_pick_mob(struct mob_data *md, const char *type, int nameid, int amount, struct item *itm);
+void log_zeny(struct map_session_data *sd, char *type, struct map_session_data *src_sd, int amount);
+
+void log_npc(struct map_session_data *sd, const char *message);
+void log_chat(e_log_chat_type type, int type_id, int src_charid, int src_accid, const char* map, int x, int y, const char* dst_charname, const char* message);
+void log_atcommand(struct map_session_data *sd, const char *message);
+
+//Old, but useful logs
+void log_branch(struct map_session_data *sd);
+void log_mvpdrop(struct map_session_data *sd, int monster_id, int *log_mvp);
+
+int log_config_read(char *cfgName);
+
 extern struct Log_Config
 {
 	enum log_what enable_logs;