summaryrefslogtreecommitdiff
path: root/world/map/npc/042-1
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-09-03 11:36:19 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-09-03 11:36:19 +0200
commitfab305565f4621cbf44912b97276d8ba27501f6d (patch)
tree3a092bac621fb5ada20635853133e56d6a394963 /world/map/npc/042-1
parent658eb67e7875c48e24a9bf7856d38393e43469dc (diff)
downloadserverdata-fab305565f4621cbf44912b97276d8ba27501f6d.tar.gz
serverdata-fab305565f4621cbf44912b97276d8ba27501f6d.tar.bz2
serverdata-fab305565f4621cbf44912b97276d8ba27501f6d.tar.xz
serverdata-fab305565f4621cbf44912b97276d8ba27501f6d.zip
add check of return value from attachrid in several scripts
Diffstat (limited to 'world/map/npc/042-1')
-rw-r--r--world/map/npc/042-1/hasan.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 1d5a67fd..5e9dfdc5 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -193,7 +193,8 @@ OnTimer5000:
goto L_Clean;
set $@ScorpionTimer, $@ScorpionTimer + 5;
if ($@ScorpionTimer >= 300) goto L_Clean;
- attachrid(getcharid(3,$@ScorpionFighter$));
+ if (attachrid(getcharid(3,$@ScorpionFighter$)) == 0)
+ end;
if (PC_DIE_COUNTER > $@ScorpDeath) goto L_Clean;
setnpctimer 0;
end;
@@ -224,11 +225,11 @@ OnInit:
OnTouch:
end;
- if ($@scorp && $@ScorpionFighter$ == strcharinfo(0))
+ if ($@scorp && $@ScorpionFighter$ == strcharinfo(0))
end;
if ((FLAGS & FLAG_TUTORIAL_DONE) || (hasan == 4))
end;
- if ($@scorp && $@ScorpionFighter$ != strcharinfo(0))
+ if ($@scorp && $@ScorpionFighter$ != strcharinfo(0))
goto L_Scared;
L_Normal: