Merge branch 'master' into jesusalva/innsjesusalva/inns

3 files changed, 2 insertions, 26 deletions

diff --git a/npc/test/_import.txt b/npc/test/_import.txt
index 6c7f7e71..69324674 100644
--- a/npc/test/_import.txt
+++ b/npc/test/_import.txt
@@ -8,6 +8,5 @@
 "npc/test/npc4.txt",
 "npc/test/npc5.txt",
 "npc/test/npc6.txt",
-"npc/test/npcmarriage.txt",
 "npc/test/test1.txt",
 "npc/test/test2.txt",
diff --git a/npc/test/npc1.txt b/npc/test/npc1.txt
index 38a03142..4754e4ed 100644
--- a/npc/test/npc1.txt
+++ b/npc/test/npc1.txt
@@ -704,14 +704,10 @@ OnWhisperGlobal:
     mes "cmd: " + @whispervar0$;
     close;
 
-OnSkillInvoke:
-    skillInvoke[@skillId] = skillInvoke[@skillId] + 1;
-    end;
-
 OnReadyCheck:
-    debugmes "OnReadyCheck";
+    consolemes(CONSOLEMES_DEBUG, "OnReadyCheck");
     $@bgid1 = waitingroom2bg("testbg", 10, 10, "bgnpc1::OnLogout","bgnpc1:OnDie");
-    debugmes "bgid=" + str($@bgid1);
+    consolemes(CONSOLEMES_DEBUG, "bgid=" + str($@bgid1));
     setbgteam $@bgid1, 1;
     bg_warp $@bgid1, "testbg", 10, 10;
 }
diff --git a/npc/test/npcmarriage.txt b/npc/test/npcmarriage.txt
deleted file mode 100644
index 1b7497bd..00000000
--- a/npc/test/npcmarriage.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-// Evol scripts.
-// Author:
-//    4144
-// Description:
-//    npc marriage
-
-test,25,14,0	script	marriage1	NPC_PLAYER,{
-    marriagemain();
-    close;
-
-OnTimer30000:
-    marriagecheck();
-    end;
-
-OnInit:
-    .sex = G_MALE;
-    .distance = 3;
-    initnpctimer;
-}