diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-01-23 11:53:52 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-01-23 11:53:52 +0000 |
| commit | 88c8f196133a694bac6023244774063332987f7b (patch) | |
| tree | 5855d698d70e415aa8a34fe582d0ce40b3d830f4 /src/map/npc.c | |
| parent | e4b08558c99c63f3147941df3f3864e31dafb576 (diff) | |
| download | hercules-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
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 7 |
1 files changed, 4 insertions, 3 deletions
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; } } |