summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-05-29 09:47:05 -0300
committerJesusaves <cpntb1@ymail.com>2019-05-29 09:47:05 -0300
commit27c0fdf5c96e9195a82355d516b19c77fe8443a4 (patch)
treed0854d1bde64dc5e7abfe8bf1b96b67d2591163c /npc
parent28fda30f68182b841413f69f7e63a25a09d1d009 (diff)
downloadserverdata-27c0fdf5c96e9195a82355d516b19c77fe8443a4.tar.gz
serverdata-27c0fdf5c96e9195a82355d516b19c77fe8443a4.tar.bz2
serverdata-27c0fdf5c96e9195a82355d516b19c77fe8443a4.tar.xz
serverdata-27c0fdf5c96e9195a82355d516b19c77fe8443a4.zip
Fix the bugs related to Tulimshar siege. Sorry.
Diffstat (limited to 'npc')
-rw-r--r--npc/003-1/lieutenantdausen.txt4
-rw-r--r--npc/functions/siege.txt3
2 files changed, 5 insertions, 2 deletions
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 9c7ebe81e..7f0569819 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -134,14 +134,14 @@ OnGuardDeath:
OnMKSiege:
OnStartSiege:
kamibroadcast(col("WARNING! WARNING! Monster Army marching towards Tulimshar!!",1));
- do_siege("003-1", "004-3", "TULIM", TP_TULIM, .name$, .siegetime);
+ do_siege("003-1", "004-1", "TULIM", TP_TULIM, .name$, .siegetime);
initnpctimer;
end;
// Timers
OnTimer5000:
.siegetime+=5;
- do_siege("003-1", "004-3", "TULIM", TP_TULIM, .name$, .siegetime);
+ do_siege("003-1", "004-1", "TULIM", TP_TULIM, .name$, .siegetime);
switch (.siegetime) {
// Monster Army arrives in town
case 60:
diff --git a/npc/functions/siege.txt b/npc/functions/siege.txt
index f6aac1e16..8d9d3cab6 100644
--- a/npc/functions/siege.txt
+++ b/npc/functions/siege.txt
@@ -153,6 +153,9 @@ function script siege_setup {
.@m$=getarg(0);
// Save old map zone
+ if (getmapinfo(MAPINFO_ID, .@m$) < 1) {
+ return Exception("SIEGE ERROR, INVALID MAP ID: "+.@m$, RB_ISFATAL|RB_DEBUGMES|RB_IRCBROADCAST|RB_GLOBALANNOUNCE);
+ }
//$@MZONE$[getmapinfo(MAPINFO_ID, .@m$)]=getmapinfo(MAPINFO_ZONE, .@m$);
// Apply changes