summaryrefslogtreecommitdiff
path: root/src/map/log.h
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-24 14:13:39 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-24 14:13:39 +0000
commit373cfe9bee3f297540d09cb0616e2b5da17463f3 (patch)
tree7c525ce072d2ac917fe63ff0ad5805d28acbfd3c /src/map/log.h
parent4b787eb878c4410512ceffb9f92b6f3cd7975bce (diff)
downloadhercules-373cfe9bee3f297540d09cb0616e2b5da17463f3.tar.gz
hercules-373cfe9bee3f297540d09cb0616e2b5da17463f3.tar.bz2
hercules-373cfe9bee3f297540d09cb0616e2b5da17463f3.tar.xz
hercules-373cfe9bee3f297540d09cb0616e2b5da17463f3.zip
* Merged changes up to eAthena 15040.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15245 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/log.h')
-rw-r--r--src/map/log.h50
1 files changed, 29 insertions, 21 deletions
diff --git a/src/map/log.h b/src/map/log.h
index 2b3d82e14..4d726e038 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -17,39 +17,47 @@ typedef enum e_log_chat_type
LOG_CHAT_PARTY = 0x04,
LOG_CHAT_GUILD = 0x08,
LOG_CHAT_MAINCHAT = 0x10,
+ // all
+ LOG_CHAT_ALL = 0xFF,
}
e_log_chat_type;
-typedef enum log_what
+typedef enum e_log_pick_type
{
- LOG_ALL = 0xFFFF,
- LOG_TRADES = 0x0002,
- LOG_VENDING = 0x0004,
- LOG_PLAYER_ITEMS = 0x0008, // dropped/picked
- LOG_MONSTER_ITEMS = 0x0010, // dropped/looted
- LOG_NPC_TRANSACTIONS = 0x0020, // npc shops?
- LOG_SCRIPT_TRANSACTIONS = 0x0040,
- LOG_STOLEN_ITEMS = 0x0080, // stolen from mobs
- LOG_USED_ITEMS = 0x0100, // used by player
- LOG_MVP_PRIZE = 0x0200,
- LOG_COMMAND_ITEMS = 0x0400, // created/deleted through @/# commands
- LOG_STORAGE_ITEMS = 0x0800, // placed/retrieved from storage
- LOG_GSTORAGE_ITEMS = 0x1000, // placed/retrieved from guild storage
- LOG_MAILS = 0x2000, // mail system transactions
- LOG_BUYING_STORE = 0x4000, // buying store transactions
+ LOG_TYPE_TRADE = 0x0001,
+ LOG_TYPE_VENDING = 0x0002,
+ LOG_TYPE_PICKDROP_PLAYER = 0x0004,
+ LOG_TYPE_PICKDROP_MONSTER = 0x0008,
+ LOG_TYPE_NPC = 0x0010,
+ LOG_TYPE_SCRIPT = 0x0020,
+ //LOG_TYPE_STEAL = 0x0040,
+ LOG_TYPE_CONSUME = 0x0080,
+ //LOG_TYPE_PRODUCE = 0x0100,
+ //LOG_TYPE_MVP = 0x0200,
+ LOG_TYPE_COMMAND = 0x0400,
+ LOG_TYPE_STORAGE = 0x0800,
+ LOG_TYPE_GSTORAGE = 0x1000,
+ LOG_TYPE_MAIL = 0x2000,
+ //LOG_TYPE_AUCTION = 0x4000,
+ LOG_TYPE_BUYING_STORE = 0x8000,
+ // combinations
+ LOG_TYPE_LOOT = LOG_TYPE_PICKDROP_MONSTER|LOG_TYPE_CONSUME,
+ // all
+ LOG_TYPE_ALL = 0xFFFF,
}
-log_what;
+e_log_pick_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_pick_pc(struct map_session_data *sd, e_log_pick_type type, int nameid, int amount, struct item *itm);
+void log_pick_mob(struct mob_data *md, e_log_pick_type type, int nameid, int amount, struct item *itm);
+void log_pick(struct block_list* bl, e_log_pick_type type, int nameid, 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_atcommand(struct map_session_data *sd, int cmdlvl, const char *message);
//Old, but useful logs
void log_branch(struct map_session_data *sd);