summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-19 20:05:58 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-19 20:05:58 +0300
commit250f998af4e96080978f589e44d16b7f0d95f158 (patch)
treef01db2210b74e73568220da7196fa3599c7dbe97
parent9dbe2872d4ab59c39b3d94a6c840d5f98e8f064a (diff)
downloadserverdata-250f998af4e96080978f589e44d16b7f0d95f158.tar.gz
serverdata-250f998af4e96080978f589e44d16b7f0d95f158.tar.bz2
serverdata-250f998af4e96080978f589e44d16b7f0d95f158.tar.xz
serverdata-250f998af4e96080978f589e44d16b7f0d95f158.zip
Add timer for check is marriage registration list is actual.
-rw-r--r--npc/functions/marriage.txt16
-rw-r--r--npc/test/npcmarriage.txt6
2 files changed, 22 insertions, 0 deletions
diff --git a/npc/functions/marriage.txt b/npc/functions/marriage.txt
index 8cf8a297..54ee429f 100644
--- a/npc/functions/marriage.txt
+++ b/npc/functions/marriage.txt
@@ -275,3 +275,19 @@ function script marriagemain {
return;
}
+
+// check registration list by timer
+function script marriagecheck {
+ .@name$ = getvariableofnpc(.maleName$, strnpcinfo(3));
+ if (.@name$ != "" && marriagecheckname(.@name) == false)
+ {
+ set getvariableofnpc(.maleName$, strnpcinfo(3)), "";
+ set getvariableofnpc(.maleName_partner$, strnpcinfo(3)), "";
+ }
+ .@name$ = getvariableofnpc(.femaleName$, strnpcinfo(3));
+ if (.@name$ != "" && marriagecheckname(.@name) == false)
+ {
+ set getvariableofnpc(.femaleName$, strnpcinfo(3)), "";
+ set getvariableofnpc(.femaleName_partner$, strnpcinfo(3)), "";
+ }
+}
diff --git a/npc/test/npcmarriage.txt b/npc/test/npcmarriage.txt
index 32b0751b..3a5219e3 100644
--- a/npc/test/npcmarriage.txt
+++ b/npc/test/npcmarriage.txt
@@ -11,7 +11,13 @@ test,25,14,0 script marriage1 NPC_PLAYER,{
marriagemain();
close;
+
+OnTimer30000:
+ marriagecheck();
+ end;
+
OnInit:
.sex = G_MALE;
.distance = 3;
+ initnpctimer;
}