summaryrefslogtreecommitdiff
path: root/src/map/map.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/map.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/map.c')
-rw-r--r--src/map/map.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/map.c b/src/map/map.c
index a2ce3dcd5..f7f1f3a49 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -289,7 +289,7 @@ int map_addblock(struct block_list* bl)
{
int m, x, y, pos;
- nullpo_retr(0, bl);
+ nullpo_ret(bl);
if (bl->prev != NULL) {
ShowError("map_addblock: bl->prev != NULL\n");
@@ -337,7 +337,7 @@ int map_addblock(struct block_list* bl)
int map_delblock(struct block_list* bl)
{
int pos;
- nullpo_retr(0, bl);
+ nullpo_ret(bl);
// ?にblocklistから?けている
if (bl->prev == NULL) {
@@ -1373,7 +1373,7 @@ int map_addflooritem(struct item *item_data,int amount,int m,int x,int y,int fir
int r;
struct flooritem_data *fitem=NULL;
- nullpo_retr(0, item_data);
+ nullpo_ret(item_data);
if(!map_searchrandfreecell(m,&x,&y,flags&2?1:0))
return 0;
@@ -2072,7 +2072,7 @@ bool mapit_exists(struct s_mapiterator* mapit)
*------------------------------------------*/
bool map_addnpc(int m,struct npc_data *nd)
{
- nullpo_retr(0, nd);
+ nullpo_ret(nd);
if( m < 0 || m >= map_num )
return false;
@@ -2131,7 +2131,7 @@ void map_spawnmobs(int m)
int map_removemobs_sub(struct block_list *bl, va_list ap)
{
struct mob_data *md = (struct mob_data *)bl;
- nullpo_retr(0, md);
+ nullpo_ret(md);
//When not to remove mob:
// doesn't respawn and is not a slave
@@ -2261,7 +2261,7 @@ uint8 map_calc_dir(struct block_list* src, int x, int y)
unsigned char dir = 0;
int dx, dy;
- nullpo_retr(0, src);
+ nullpo_ret(src);
dx = x-src->x;
dy = y-src->y;
@@ -3355,7 +3355,7 @@ int nick_db_final(DBKey key, void *data, va_list args)
int cleanup_sub(struct block_list *bl, va_list ap)
{
- nullpo_retr(0, bl);
+ nullpo_ret(bl);
switch(bl->type) {
case BL_PC: