From 990bbce43661d7f9d2bd3f510f06761af36203ab Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 29 Apr 2019 11:53:43 -0300
Subject: Remove optional param from siege begin

---
 npc/003-1/lieutenantdausen.txt | 3 ++-
 npc/012-1/guards.txt           | 3 ++-
 npc/functions/siege.txt        | 5 +----
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'npc')

diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 62c9c9628..3856e6829 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -131,7 +131,8 @@ OnMKSiege:
     $@SIEGE_TULIM=rand(1,10);
 OnStartSiege:
     siege_setup("004-1");
-    siege_setup("003-1", "WARNING! WARNING! Siege starting at Tulimshar!!");
+    siege_setup("003-1");
+    kamibroadcast(col("WARNING! WARNING! Siege starting at Tulimshar!!",1));
     siege_cast("014-3", .name$, 0, TP_TULIM);
     initnpctimer;
     end;
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index c79c147e9..b61d65afd 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -604,7 +604,8 @@ OnRespawn:
 // Begin Siege
 OnMKSiege:
     siege_setup("014-3");
-    siege_setup("012-1", "WARNING! WARNING! Siege starting at Hurnscald!!");
+    siege_setup("012-1");
+    kamibroadcast(col("WARNING! WARNING! Siege starting at Hurnscald!!",1));
     $@SIEGE_HURNS=rand(1,10);
     siege_cast("014-3", .name$, 0, TP_HURNS);
     initnpctimer;
diff --git a/npc/functions/siege.txt b/npc/functions/siege.txt
index 6a68450f7..10fa4736f 100644
--- a/npc/functions/siege.txt
+++ b/npc/functions/siege.txt
@@ -132,18 +132,15 @@ function	script	siege_selectmob	{
 
 /////////////////////////////////////////////////////////////
 // Prepare a siege with optional announce
-// siege_setup ( map{, announce} )
+// siege_setup ( map )
 function	script	siege_setup	{
     .@m$=getarg(0);
-    .@msg$=getarg(1, "");
 
     addmapmask .@m$, MASK_MATTACK;
     changemusic .@m$, any("mythica.ogg", "eric_matyas_ghouls.ogg", "misuse.ogg", "Arabesque.ogg");
     disablenpc("Mana Stone");
     pvpon(.@m$);
     setmapflag(.@m$,mf_bexp,rand(120,140)); // 20~40% EXP UP on siege maps
-    if (.@msg$ != "")
-        kamibroadcast(col(.@msg$,1));
     return;
 }
 
-- 
cgit v1.2.3-70-g09d2