diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-24 14:13:39 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-24 14:13:39 +0000 |
| commit | 373cfe9bee3f297540d09cb0616e2b5da17463f3 (patch) | |
| tree | 7c525ce072d2ac917fe63ff0ad5805d28acbfd3c /src/map/storage.c | |
| parent | 4b787eb878c4410512ceffb9f92b6f3cd7975bce (diff) | |
| download | hercules-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/storage.c')
| -rw-r--r-- | src/map/storage.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/map/storage.c b/src/map/storage.c index c11ef0993..dd14acfda 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -154,8 +154,7 @@ static int storage_additem(struct map_session_data* sd, struct item* item_data, return 1; stor->items[i].amount += amount; clif_storageitemadded(sd,&stor->items[i],i,amount); - if(log_config.enable_logs & LOG_STORAGE_ITEMS) - log_pick_pc(sd, "R", item_data->nameid, -amount, item_data); + log_pick_pc(sd, LOG_TYPE_STORAGE, item_data->nameid, -amount, item_data); return 0; } } @@ -172,8 +171,7 @@ static int storage_additem(struct map_session_data* sd, struct item* item_data, stor->items[i].amount = amount; clif_storageitemadded(sd,&stor->items[i],i,amount); clif_updatestorageamount(sd,stor->storage_amount); - if(log_config.enable_logs & LOG_STORAGE_ITEMS) - log_pick_pc(sd, "R", item_data->nameid, -amount, item_data); + log_pick_pc(sd, LOG_TYPE_STORAGE, item_data->nameid, -amount, item_data); return 0; } @@ -188,8 +186,7 @@ int storage_delitem(struct map_session_data* sd, int n, int amount) sd->status.storage.items[n].amount -= amount; - if(log_config.enable_logs & LOG_STORAGE_ITEMS) - log_pick_pc(sd, "R", sd->status.storage.items[n].nameid, amount, &sd->status.storage.items[n]); + log_pick_pc(sd, LOG_TYPE_STORAGE, sd->status.storage.items[n].nameid, amount, &sd->status.storage.items[n]); if( sd->status.storage.items[n].amount == 0 ) { @@ -413,8 +410,7 @@ int guild_storage_additem(struct map_session_data* sd, struct guild_storage* sto stor->items[i].amount+=amount; clif_storageitemadded(sd,&stor->items[i],i,amount); stor->dirty = 1; - if(log_config.enable_logs & LOG_GSTORAGE_ITEMS) - log_pick_pc(sd, "G", item_data->nameid, -amount, item_data); + log_pick_pc(sd, LOG_TYPE_GSTORAGE, item_data->nameid, -amount, item_data); return 0; } } @@ -431,8 +427,7 @@ int guild_storage_additem(struct map_session_data* sd, struct guild_storage* sto clif_storageitemadded(sd,&stor->items[i],i,amount); clif_updateguildstorageamount(sd,stor->storage_amount); stor->dirty = 1; - if(log_config.enable_logs & LOG_GSTORAGE_ITEMS) - log_pick_pc(sd, "G", item_data->nameid, -amount, item_data); + log_pick_pc(sd, LOG_TYPE_GSTORAGE, item_data->nameid, -amount, item_data); return 0; } @@ -445,8 +440,7 @@ int guild_storage_delitem(struct map_session_data* sd, struct guild_storage* sto return 1; stor->items[n].amount-=amount; - if(log_config.enable_logs & LOG_GSTORAGE_ITEMS) - log_pick_pc(sd, "G", stor->items[n].nameid, amount, &stor->items[n]); + log_pick_pc(sd, LOG_TYPE_GSTORAGE, stor->items[n].nameid, amount, &stor->items[n]); if(stor->items[n].amount==0){ memset(&stor->items[n],0,sizeof(stor->items[0])); stor->storage_amount--; |