summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-24 13:29:53 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-24 13:29:53 +0000
commitab3193f6888edebcbe0b434297b808150416a824 (patch)
tree1fd58fb9967f9fbe326eea49c995693d9d9f0a15
parentf10037484b587881908c535e53b65e3477d99f08 (diff)
downloadhercules-ab3193f6888edebcbe0b434297b808150416a824.tar.gz
hercules-ab3193f6888edebcbe0b434297b808150416a824.tar.bz2
hercules-ab3193f6888edebcbe0b434297b808150416a824.tar.xz
hercules-ab3193f6888edebcbe0b434297b808150416a824.zip
* Merged changes up to eAthena 15039.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15243 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/log.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/map/log.h b/src/map/log.h
index 72804009e..2b3d82e14 100644
--- a/src/map/log.h
+++ b/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;