summaryrefslogtreecommitdiff
path: root/src/map/storage.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-02-04 00:49:50 -0800
committerBen Longbons <b.r.longbons@gmail.com>2013-02-07 12:54:23 -0800
commitc67c2b7435a13d7ce17b2075e22dc5c6036f702a (patch)
treeb84b7b205a361b39d65944a9edb2a353356a9ac9 /src/map/storage.cpp
parentb3a0b3e7c94bce46bc0654528df0748cf0c2a6ac (diff)
downloadtmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.tar.gz
tmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.tar.bz2
tmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.tar.xz
tmwa-c67c2b7435a13d7ce17b2075e22dc5c6036f702a.zip
Remove some more Skill-related stuff
Diffstat (limited to 'src/map/storage.cpp')
-rw-r--r--src/map/storage.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/storage.cpp b/src/map/storage.cpp
index 0f3cd10..bcdf8bc 100644
--- a/src/map/storage.cpp
+++ b/src/map/storage.cpp
@@ -214,7 +214,8 @@ int storage_storageadd(struct map_session_data *sd, int index, int amount)
struct storage *stor;
nullpo_ret(sd);
- nullpo_ret(stor = account2storage2(sd->status.account_id));
+ stor = account2storage2(sd->status.account_id);
+ nullpo_ret(stor);
if ((stor->storage_amount > MAX_STORAGE) || !stor->storage_status)
return 0; // storage full / storage closed
@@ -249,7 +250,8 @@ int storage_storageget(struct map_session_data *sd, int index, int amount)
PickupFail flag;
nullpo_ret(sd);
- nullpo_ret(stor = account2storage2(sd->status.account_id));
+ stor = account2storage2(sd->status.account_id);
+ nullpo_ret(stor);
if (index < 0 || index >= MAX_STORAGE)
return 0;
@@ -277,7 +279,8 @@ int storage_storageclose(struct map_session_data *sd)
struct storage *stor;
nullpo_ret(sd);
- nullpo_ret(stor = account2storage2(sd->status.account_id));
+ stor = account2storage2(sd->status.account_id);
+ nullpo_ret(stor);
clif_storageclose(sd);
if (stor->storage_status)