summaryrefslogtreecommitdiff
path: root/src/map/pet.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/pet.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/pet.c')
-rw-r--r--src/map/pet.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/pet.c b/src/map/pet.c
index 76f990455..d02f93446 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -42,7 +42,7 @@ static struct eri *item_drop_list_ers;
int pet_hungry_val(struct pet_data *pd)
{
- nullpo_retr(0, pd);
+ nullpo_ret(pd);
if(pd->pet.hungry > 90)
return 4;
@@ -86,7 +86,7 @@ int pet_create_egg(struct map_session_data *sd, int item_id)
int pet_unlocktarget(struct pet_data *pd)
{
- nullpo_retr(0, pd);
+ nullpo_ret(pd);
pd->target_id=0;
pet_stop_attack(pd);
@@ -174,7 +174,7 @@ int pet_sc_check(struct map_session_data *sd, int type)
{
struct pet_data *pd;
- nullpo_retr(0, sd);
+ nullpo_ret(sd);
pd = sd->pd;
if( pd == NULL
@@ -262,7 +262,7 @@ int search_petDB_index(int key,int type)
int pet_hungry_timer_delete(struct pet_data *pd)
{
- nullpo_retr(0, pd);
+ nullpo_ret(pd);
if(pd->pet_hungry_timer != -1) {
delete_timer(pd->pet_hungry_timer,pet_hungry);
pd->pet_hungry_timer = INVALID_TIMER;
@@ -463,7 +463,7 @@ int pet_recv_petdata(int account_id,struct s_pet *p,int flag)
int pet_select_egg(struct map_session_data *sd,short egg_index)
{
- nullpo_retr(0, sd);
+ nullpo_ret(sd);
if(egg_index < 0 || egg_index >= MAX_INVENTORY)
return 0; //Forged packet!
@@ -478,7 +478,7 @@ int pet_select_egg(struct map_session_data *sd,short egg_index)
int pet_catch_process1(struct map_session_data *sd,int target_class)
{
- nullpo_retr(0, sd);
+ nullpo_ret(sd);
sd->catch_target_class = target_class;
clif_catch_process(sd);
@@ -580,7 +580,7 @@ static int pet_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap);
int pet_menu(struct map_session_data *sd,int menunum)
{
- nullpo_retr(0, sd);
+ nullpo_ret(sd);
if (sd->pd == NULL)
return 1;
@@ -776,7 +776,7 @@ static int pet_randomwalk(struct pet_data *pd,unsigned int tick)
{
const int retrycount=20;
- nullpo_retr(0, pd);
+ nullpo_ret(pd);
Assert((pd->msd == 0) || (pd->msd->pd == pd));