- Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).

[16969:16991/trunk/src/] will be re-committed in the next 24 hours.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 55 insertions, 52 deletions

diff --git a/src/map/log.h b/src/map/log.h
index 051e31fc0..a40a3fcf4 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -11,76 +11,79 @@ struct mob_data;
 struct item;
 
 
-typedef enum e_log_chat_type {
-    LOG_CHAT_GLOBAL      = 0x01,
-    LOG_CHAT_WHISPER     = 0x02,
-    LOG_CHAT_PARTY       = 0x04,
-    LOG_CHAT_GUILD       = 0x08,
-    LOG_CHAT_MAINCHAT    = 0x10,
-    // all
-    LOG_CHAT_ALL         = 0xFF,
+typedef enum e_log_chat_type
+{
+	LOG_CHAT_GLOBAL      = 0x01,
+	LOG_CHAT_WHISPER     = 0x02,
+	LOG_CHAT_PARTY       = 0x04,
+	LOG_CHAT_GUILD       = 0x08,
+	LOG_CHAT_MAINCHAT    = 0x10,
+	// all
+	LOG_CHAT_ALL         = 0xFF,
 }
 e_log_chat_type;
 
 
-typedef enum e_log_pick_type {
-    LOG_TYPE_NONE             = 0,
-    LOG_TYPE_TRADE            = 0x00001,
-    LOG_TYPE_VENDING          = 0x00002,
-    LOG_TYPE_PICKDROP_PLAYER  = 0x00004,
-    LOG_TYPE_PICKDROP_MONSTER = 0x00008,
-    LOG_TYPE_NPC              = 0x00010,
-    LOG_TYPE_SCRIPT           = 0x00020,
-    LOG_TYPE_STEAL            = 0x00040,
-    LOG_TYPE_CONSUME          = 0x00080,
-    LOG_TYPE_PRODUCE          = 0x00100,
-    LOG_TYPE_MVP              = 0x00200,
-    LOG_TYPE_COMMAND          = 0x00400,
-    LOG_TYPE_STORAGE          = 0x00800,
-    LOG_TYPE_GSTORAGE         = 0x01000,
-    LOG_TYPE_MAIL             = 0x02000,
-    LOG_TYPE_AUCTION          = 0x04000,
-    LOG_TYPE_BUYING_STORE     = 0x08000,
-    LOG_TYPE_OTHER            = 0x10000,
-    // combinations
-    LOG_TYPE_LOOT             = LOG_TYPE_PICKDROP_MONSTER|LOG_TYPE_CONSUME,
-    // all
-    LOG_TYPE_ALL              = 0xFFFFF,
+typedef enum e_log_pick_type
+{
+	LOG_TYPE_NONE             = 0,
+	LOG_TYPE_TRADE            = 0x00001,
+	LOG_TYPE_VENDING          = 0x00002,
+	LOG_TYPE_PICKDROP_PLAYER  = 0x00004,
+	LOG_TYPE_PICKDROP_MONSTER = 0x00008,
+	LOG_TYPE_NPC              = 0x00010,
+	LOG_TYPE_SCRIPT           = 0x00020,
+	LOG_TYPE_STEAL            = 0x00040,
+	LOG_TYPE_CONSUME          = 0x00080,
+	LOG_TYPE_PRODUCE          = 0x00100,
+	LOG_TYPE_MVP              = 0x00200,
+	LOG_TYPE_COMMAND          = 0x00400,
+	LOG_TYPE_STORAGE          = 0x00800,
+	LOG_TYPE_GSTORAGE         = 0x01000,
+	LOG_TYPE_MAIL             = 0x02000,
+	LOG_TYPE_AUCTION          = 0x04000,
+	LOG_TYPE_BUYING_STORE     = 0x08000,
+	LOG_TYPE_OTHER            = 0x10000,
+	// combinations
+	LOG_TYPE_LOOT             = LOG_TYPE_PICKDROP_MONSTER|LOG_TYPE_CONSUME,
+	// all
+	LOG_TYPE_ALL              = 0xFFFFF,
 }
 e_log_pick_type;
 
 
 /// new logs
-void log_pick_pc(struct map_session_data *sd, e_log_pick_type type, int amount, struct item *itm);
-void log_pick_mob(struct mob_data *md, e_log_pick_type type, int amount, struct item *itm);
-void log_zeny(struct map_session_data *sd, e_log_pick_type type, struct map_session_data *src_sd, int amount);
+void log_pick_pc(struct map_session_data* sd, e_log_pick_type type, int amount, struct item* itm);
+void log_pick_mob(struct mob_data* md, e_log_pick_type type, int amount, struct item* itm);
+void log_zeny(struct map_session_data* sd, e_log_pick_type 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);
+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);
+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(const char *cfgName);
+int log_config_read(const char* cfgName);
 
-extern struct Log_Config {
-    e_log_pick_type enable_logs;
-    int filter;
-    bool sql_logs;
-    bool log_chat_woe_disable;
-    int rare_items_log,refine_items_log,price_items_log,amount_items_log; //for filter
-    int branch, mvpdrop, zeny, commands, npc, chat;
-    char log_branch[64], log_pick[64], log_zeny[64], log_mvpdrop[64], log_gm[64], log_npc[64], log_chat[64];
+extern struct Log_Config
+{
+	e_log_pick_type enable_logs;
+	int filter;
+	bool sql_logs;
+	bool log_chat_woe_disable;
+	int rare_items_log,refine_items_log,price_items_log,amount_items_log; //for filter
+	int branch, mvpdrop, zeny, commands, npc, chat;
+	char log_branch[64], log_pick[64], log_zeny[64], log_mvpdrop[64], log_gm[64], log_npc[64], log_chat[64];
 }
 log_config;
 
 #ifdef BETA_THREAD_TEST
-struct {
-    char **entry;
-    int count;
-} logThreadData;
+	struct {
+		char** entry;
+		int count;
+	} logThreadData;
 #endif
 
 #endif /* _LOG_H_ */