summaryrefslogtreecommitdiff
path: root/src/map/storage.c
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-10-09 01:57:04 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-10-09 01:57:04 +0000
commit46afaed6555abf5cfdb979e7b1e0b3a619ee36ae (patch)
tree825b8e97cad9ee3c416d327c1e5f54b1ba1204d3 /src/map/storage.c
parent5ab81c08011abb8af9a1001e7835c72c6de96142 (diff)
downloadhercules-46afaed6555abf5cfdb979e7b1e0b3a619ee36ae.tar.gz
hercules-46afaed6555abf5cfdb979e7b1e0b3a619ee36ae.tar.bz2
hercules-46afaed6555abf5cfdb979e7b1e0b3a619ee36ae.tar.xz
hercules-46afaed6555abf5cfdb979e7b1e0b3a619ee36ae.zip
Replaced all nullpo_retr() calls which returned 0 with nullpo_ret() calls.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14414 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/storage.c')
-rw-r--r--src/map/storage.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/map/storage.c b/src/map/storage.c
index 1c06dfb70..8960f7203 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -92,7 +92,7 @@ void do_reconnect_storage(void)
*------------------------------------------*/
int storage_storageopen(struct map_session_data *sd)
{
- nullpo_retr(0, sd);
+ nullpo_ret(sd);
if(sd->state.storage_flag)
return 1; //Already open?
@@ -207,7 +207,7 @@ int storage_delitem(struct map_session_data* sd, int n, int amount)
*------------------------------------------*/
int storage_storageadd(struct map_session_data* sd, int index, int amount)
{
- nullpo_retr(0, sd);
+ nullpo_ret(sd);
if( sd->status.storage.storage_amount > MAX_STORAGE )
return 0; // storage full
@@ -256,7 +256,7 @@ int storage_storageget(struct map_session_data* sd, int index, int amount)
*------------------------------------------*/
int storage_storageaddfromcart(struct map_session_data* sd, int index, int amount)
{
- nullpo_retr(0, sd);
+ nullpo_ret(sd);
if( sd->status.storage.storage_amount > MAX_STORAGE )
return 0; // storage full / storage closed
@@ -281,7 +281,7 @@ int storage_storageaddfromcart(struct map_session_data* sd, int index, int amoun
*------------------------------------------*/
int storage_storagegettocart(struct map_session_data* sd, int index, int amount)
{
- nullpo_retr(0, sd);
+ nullpo_ret(sd);
if( index < 0 || index >= MAX_STORAGE )
return 0;
@@ -358,7 +358,7 @@ int storage_guild_storageopen(struct map_session_data* sd)
{
struct guild_storage *gstor;
- nullpo_retr(0, sd);
+ nullpo_ret(sd);
if(sd->status.guild_id <= 0)
return 2;
@@ -460,8 +460,8 @@ int storage_guild_storageadd(struct map_session_data* sd, int index, int amount)
{
struct guild_storage *stor;
- nullpo_retr(0, sd);
- nullpo_retr(0, stor=guild2storage2(sd->status.guild_id));
+ nullpo_ret(sd);
+ nullpo_ret(stor=guild2storage2(sd->status.guild_id));
if( !stor->storage_status || stor->storage_amount > MAX_GUILD_STORAGE )
return 0;
@@ -487,8 +487,8 @@ int storage_guild_storageget(struct map_session_data* sd, int index, int amount)
struct guild_storage *stor;
int flag;
- nullpo_retr(0, sd);
- nullpo_retr(0, stor=guild2storage2(sd->status.guild_id));
+ nullpo_ret(sd);
+ nullpo_ret(stor=guild2storage2(sd->status.guild_id));
if(!stor->storage_status)
return 0;
@@ -515,8 +515,8 @@ int storage_guild_storageaddfromcart(struct map_session_data* sd, int index, int
{
struct guild_storage *stor;
- nullpo_retr(0, sd);
- nullpo_retr(0, stor=guild2storage2(sd->status.guild_id));
+ nullpo_ret(sd);
+ nullpo_ret(stor=guild2storage2(sd->status.guild_id));
if( !stor->storage_status || stor->storage_amount > MAX_GUILD_STORAGE )
return 0;
@@ -540,8 +540,8 @@ int storage_guild_storagegettocart(struct map_session_data* sd, int index, int a
{
struct guild_storage *stor;
- nullpo_retr(0, sd);
- nullpo_retr(0, stor=guild2storage2(sd->status.guild_id));
+ nullpo_ret(sd);
+ nullpo_ret(stor=guild2storage2(sd->status.guild_id));
if(!stor->storage_status)
return 0;
@@ -595,8 +595,8 @@ int storage_guild_storageclose(struct map_session_data* sd)
{
struct guild_storage *stor;
- nullpo_retr(0, sd);
- nullpo_retr(0, stor=guild2storage2(sd->status.guild_id));
+ nullpo_ret(sd);
+ nullpo_ret(stor=guild2storage2(sd->status.guild_id));
clif_storageclose(sd);
if (stor->storage_status)
@@ -616,8 +616,8 @@ int storage_guild_storage_quit(struct map_session_data* sd, int flag)
{
struct guild_storage *stor;
- nullpo_retr(0, sd);
- nullpo_retr(0, stor=guild2storage2(sd->status.guild_id));
+ nullpo_ret(sd);
+ nullpo_ret(stor=guild2storage2(sd->status.guild_id));
if(flag)
{ //Only during a guild break flag is 1 (don't save storage)