diff options
| author | Kevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-27 09:15:05 +0000 |
|---|---|---|
| committer | Kevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-27 09:15:05 +0000 |
| commit | 55434bd1ddfeb0b66247dbe4c420048863d44446 (patch) | |
| tree | fb053a26628370a14b6f596265fcb89c0475541e /src/map/clif.c | |
| parent | 677598256feaad3bcef53805ad8c70e744a9b7d3 (diff) | |
| download | hercules-55434bd1ddfeb0b66247dbe4c420048863d44446.tar.gz hercules-55434bd1ddfeb0b66247dbe4c420048863d44446.tar.bz2 hercules-55434bd1ddfeb0b66247dbe4c420048863d44446.tar.xz hercules-55434bd1ddfeb0b66247dbe4c420048863d44446.zip | |
Changed the last commit so it must be called with @reloaditemdb2. @reloaditemdb only removes the item_data from the itemdb subsystem. If you don't like my code you can uncomment the macro I_HATE_KEVIN in item_db.c so it isn't even compiled.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12662 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 66a01b867..55e9b1776 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1894,27 +1894,20 @@ void clif_storagelist(struct map_session_data *sd,struct storage *stor) if(stor->storage_[i].nameid<=0) continue; id = itemdb_search(stor->storage_[i].nameid); - if(!id) - { - //Item not found, was probably deleted and then map server reloaded/item db reloaded - storage_delitem(sd, stor, i, stor->storage_[i].amount); - return; - } - else - if(!itemdb_isstackable2(id)) - { //Equippable - WBUFW(bufe,ne*20+4)=i+1; - clif_item_sub(bufe, ne*20+6, &stor->storage_[i], id, id->equip); - clif_addcards(WBUFP(bufe, ne*20+16), &stor->storage_[i]); - ne++; - } else { //Stackable - WBUFW(buf,n*s+4)=i+1; - clif_item_sub(buf, n*s+6, &stor->storage_[i], id,-1); + if(!itemdb_isstackable2(id)) + { //Equippable + WBUFW(bufe,ne*20+4)=i+1; + clif_item_sub(bufe, ne*20+6, &stor->storage_[i], id, id->equip); + clif_addcards(WBUFP(bufe, ne*20+16), &stor->storage_[i]); + ne++; + } else { //Stackable + WBUFW(buf,n*s+4)=i+1; + clif_item_sub(buf, n*s+6, &stor->storage_[i], id,-1); #if PACKETVER >= 5 - clif_addcards(WBUFP(buf,n*s+14), &stor->storage_[i]); + clif_addcards(WBUFP(buf,n*s+14), &stor->storage_[i]); #endif - n++; - } + n++; + } } if(n){ #if PACKETVER < 5 |