diff options
| -rw-r--r-- | npc/003-1/lieutenantdausen.txt | 4 | ||||
| -rw-r--r-- | npc/functions/siege.txt | 3 |
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 |