diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-24 17:08:58 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-24 17:08:58 +0000 |
| commit | f762bfba6e4e3e29db6898f1c61023f662330270 (patch) | |
| tree | e0809191f340d0c1f4ce5315a3d19b6540d03e64 /src/map/storage.c | |
| parent | d8b857ad9db40f4e6345419c8d3659b7914519e7 (diff) | |
| download | hercules-f762bfba6e4e3e29db6898f1c61023f662330270.tar.gz hercules-f762bfba6e4e3e29db6898f1c61023f662330270.tar.bz2 hercules-f762bfba6e4e3e29db6898f1c61023f662330270.tar.xz hercules-f762bfba6e4e3e29db6898f1c61023f662330270.zip | |
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@779 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/storage.c')
| -rw-r--r-- | src/map/storage.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/map/storage.c b/src/map/storage.c index eb9da1539..bc97b1390 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -144,12 +144,7 @@ int storage_additem(struct map_session_data *sd,struct storage *stor,struct item if(!itemdb_isequip2(data)){ // 装備品ではないので、既所有品なら個数のみ変化させる for(i=0;i<MAX_STORAGE;i++){ - if( stor->storage[i].nameid == item_data->nameid && - stor->storage[i].identify == item_data->identify && - stor->storage[i].refine == item_data->refine && - stor->storage[i].attribute == item_data->attribute && - stor->storage[i].card[0] == item_data->card[0] && stor->storage[i].card[1] == item_data->card[1] && - stor->storage[i].card[2] == item_data->card[2] && stor->storage[i].card[3] == item_data->card[3]){ + if( compare_item (&stor->storage[i], item_data)) { if(stor->storage[i].amount+amount > MAX_AMOUNT) return 1; stor->storage[i].amount+=amount; @@ -434,9 +429,7 @@ int guild_storage_additem(struct map_session_data *sd,struct guild_storage *stor if(!itemdb_isequip2(data)){ // 装備品ではないので、既所有品なら個数のみ変化させる for(i=0;i<MAX_GUILD_STORAGE;i++){ - if(stor->storage[i].nameid == item_data->nameid && - stor->storage[i].card[0] == item_data->card[0] && stor->storage[i].card[1] == item_data->card[1] && - stor->storage[i].card[2] == item_data->card[2] && stor->storage[i].card[3] == item_data->card[3]){ + if(compare_item(&stor->storage[i], item_data)) { if(stor->storage[i].amount+amount > MAX_AMOUNT) return 1; stor->storage[i].amount+=amount; |