diff options
Diffstat (limited to 'src/map/storage.c')
| -rw-r--r-- | src/map/storage.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/map/storage.c b/src/map/storage.c index 49cb18cbe..c999ab07b 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -253,7 +253,11 @@ int storage_storageget(struct map_session_data* sd, int index, int amount) return 0; if( (flag = pc->additem(sd,&sd->status.storage.items[index],amount,LOG_TYPE_STORAGE)) == 0 ) +<<<<<<< HEAD + storage_delitem(sd,index,amount); +======= storage->delitem(sd,index,amount); +>>>>>>> upstream/master else clif->additem(sd,0,0,flag); @@ -310,7 +314,11 @@ int storage_storagegettocart(struct map_session_data* sd, int index, int amount) return 0; if( pc->cart_additem(sd,&sd->status.storage.items[index],amount,LOG_TYPE_STORAGE) == 0 ) +<<<<<<< HEAD + storage_delitem(sd,index,amount); +======= storage->delitem(sd,index,amount); +>>>>>>> upstream/master return 1; } @@ -531,7 +539,11 @@ int storage_guild_storageadd(struct map_session_data* sd, int index, int amount) return 0; } +<<<<<<< HEAD + if(guild_storage_additem(sd,stor,&sd->status.inventory[index],amount)==0) +======= if(gstorage->additem(sd,stor,&sd->status.inventory[index],amount)==0) +>>>>>>> upstream/master pc->delitem(sd,index,amount,0,4,LOG_TYPE_GSTORAGE); return 1; @@ -570,7 +582,11 @@ int storage_guild_storageget(struct map_session_data* sd, int index, int amount) } if((flag = pc->additem(sd,&stor->items[index],amount,LOG_TYPE_GSTORAGE)) == 0) +<<<<<<< HEAD + guild_storage_delitem(sd,stor,index,amount); +======= gstorage->delitem(sd,stor,index,amount); +>>>>>>> upstream/master else //inform fail clif->additem(sd,0,0,flag); // log_fromstorage(sd, index, 1); @@ -604,7 +620,11 @@ int storage_guild_storageaddfromcart(struct map_session_data* sd, int index, int if( amount < 1 || amount > sd->status.cart[index].amount ) return 0; +<<<<<<< HEAD + if(guild_storage_additem(sd,stor,&sd->status.cart[index],amount)==0) +======= if(gstorage->additem(sd,stor,&sd->status.cart[index],amount)==0) +>>>>>>> upstream/master pc->cart_delitem(sd,index,amount,0,LOG_TYPE_GSTORAGE); return 1; @@ -637,7 +657,11 @@ int storage_guild_storagegettocart(struct map_session_data* sd, int index, int a return 0; if(pc->cart_additem(sd,&stor->items[index],amount,LOG_TYPE_GSTORAGE)==0) +<<<<<<< HEAD + guild_storage_delitem(sd,stor,index,amount); +======= gstorage->delitem(sd,stor,index,amount); +>>>>>>> upstream/master return 1; } @@ -768,4 +792,4 @@ void gstorage_defaults(void) { gstorage->pc_quit = storage_guild_storage_quit; gstorage->save = storage_guild_storagesave; gstorage->saved = storage_guild_storagesaved; -}
\ No newline at end of file +} |