summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-05 15:55:37 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-05 15:55:37 +0000
commit62661b8f478486e970860072d7db86f11c59514d (patch)
tree0609cf2af171d527e56e0bf639e3cd7eb297397d /src/map
parent7fa39d09939706c5ce829c7a44766ba8c101efd2 (diff)
downloadhercules-62661b8f478486e970860072d7db86f11c59514d.tar.gz
hercules-62661b8f478486e970860072d7db86f11c59514d.tar.bz2
hercules-62661b8f478486e970860072d7db86f11c59514d.tar.xz
hercules-62661b8f478486e970860072d7db86f11c59514d.zip
* Job_Battle_Manual and Battle_Manual can be used simultaneously.
* Fixed "sleep" after "attachrid" (a different rid) halts the script.(bugreport:3181) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13846 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/pc.c5
-rw-r--r--src/map/script.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index b1e558bc3..01e683ea0 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3406,10 +3406,13 @@ int pc_isUseitem(struct map_session_data *sd,int n)
case 14532: // Battle_Manual25
case 14533: // Battle_Manual100
case 14545: // Battle_Manual300
- case 14592: // JOB_Battle_Manual
if( sd->sc.data[SC_EXPBOOST] )
return 0;
break;
+ case 14592: // JOB_Battle_Manual
+ if( sd->sc.data[SC_JEXPBOOST] )
+ return 0;
+ break;
// Mercenary Items
diff --git a/src/map/script.c b/src/map/script.c
index b5e00fe55..913682c89 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3203,6 +3203,7 @@ void run_script_main(struct script_state *st)
if(st->sleep.tick > 0) {
//Delay execution
+ sd = map_id2sd(st->rid); // Refresh sd since script might have attached someone while running. [Inkfish]
st->sleep.charid = sd?sd->status.char_id:0;
st->sleep.timer = add_timer(gettick()+st->sleep.tick,
run_script_timer, st->sleep.charid, (intptr)st);