summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-29 06:00:05 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-29 06:00:05 +0000
commit04fca41114ed5266a9bdbec60cad4bcdf4541be8 (patch)
tree48f42bb85193af20e8c6a19fdc117d624c781f16 /src/map/script.c
parent7845b8fdccdea16d271580f43c5206365ff7719a (diff)
downloadhercules-04fca41114ed5266a9bdbec60cad4bcdf4541be8.tar.gz
hercules-04fca41114ed5266a9bdbec60cad4bcdf4541be8.tar.bz2
hercules-04fca41114ed5266a9bdbec60cad4bcdf4541be8.tar.xz
hercules-04fca41114ed5266a9bdbec60cad4bcdf4541be8.zip
Random assortment of various small corrections and tweaks.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12894 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 4eb2e6324..8781aaa92 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4312,8 +4312,7 @@ BUILDIN_FUNC(areawarp)
else if(!(index=mapindex_name2id(str)))
return 0;
- map_foreachinarea(buildin_areawarp_sub,
- m,x0,y0,x1,y1,BL_PC, index,x,y );
+ map_foreachinarea(buildin_areawarp_sub, m,x0,y0,x1,y1,BL_PC, index,x,y);
return 0;
}
@@ -7558,8 +7557,7 @@ BUILDIN_FUNC(killmonsterall)
}
}
- map_foreachinmap(buildin_killmonsterall_sub_strip,
- m,BL_MOB);
+ map_foreachinmap(buildin_killmonsterall_sub_strip,m,BL_MOB);
return 0;
}
@@ -11794,10 +11792,10 @@ BUILDIN_FUNC(setnpcdisplay)
name = script_getstr(st,2);
data = script_getdata(st,3);
- if( script_hasdata(st,5) )
- size = script_getnum(st,5);
if( script_hasdata(st,4) )
class_ = script_getnum(st,4);
+ if( script_hasdata(st,5) )
+ size = script_getnum(st,5);
get_val(st, data);
if( data_isstring(data) )