summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-01-23 11:53:52 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-01-23 11:53:52 +0000
commit88c8f196133a694bac6023244774063332987f7b (patch)
tree5855d698d70e415aa8a34fe582d0ce40b3d830f4
parente4b08558c99c63f3147941df3f3864e31dafb576 (diff)
downloadhercules-88c8f196133a694bac6023244774063332987f7b.tar.gz
hercules-88c8f196133a694bac6023244774063332987f7b.tar.bz2
hercules-88c8f196133a694bac6023244774063332987f7b.tar.xz
hercules-88c8f196133a694bac6023244774063332987f7b.zip
Added a missing break; in pc_setstat, messing up LUK increasing (see r13460) (bugreport:2697).
Corrected clif_bladestop(), void function returning a value (see r13471) (bugreport:2698). Fixed npcs with touch area not stopping walk timers (see r6516) (bugreport:2700). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13480 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/npc.c7
-rw-r--r--src/map/pc.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 662cfb580..2759f29ea 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5961,7 +5961,7 @@ void clif_bladestop(struct block_list *src, int dst_id, int active)
{
unsigned char buf[32];
- nullpo_retr(0, src);
+ nullpo_retv(src);
WBUFW(buf,0)=0x1d1;
WBUFL(buf,2)=src->id;
diff --git a/src/map/npc.c b/src/map/npc.c
index 49ffa8e89..37cf06157 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -761,11 +761,12 @@ int npc_touch_areanpc(struct map_session_data* sd, int m, int x, int y)
snprintf(name, ARRAYLENGTH(name), "%s::OnTouch", map[m].npc[i]->exname); // It goes here too. exname being the unique identifier. [Lance]
- if( npc_event(sd,name,0)>0 ) {
- pc_stop_walking(sd,1); //Make it stop walking!
+ if( npc_event(sd,name,0) > 0 )
+ {// failed to run OnTouch event, so just click the npc
npc_click(sd,map[m].npc[i]);
}
- //aFree(name);
+
+ pc_stop_walking(sd,1); //Make it stop walking!
break;
}
}
diff --git a/src/map/pc.c b/src/map/pc.c
index 2c555a810..268a461c0 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4611,7 +4611,7 @@ static int pc_setstat(struct map_session_data* sd, int type, int val)
case SP_VIT: sd->status.vit = val; break;
case SP_INT: sd->status.int_ = val; break;
case SP_DEX: sd->status.dex = val; break;
- case SP_LUK: sd->status.luk = val;
+ case SP_LUK: sd->status.luk = val; break;
default:
return -1;
}