summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-16 19:42:46 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-16 19:42:46 +0000
commit36b0b52d1327b61b7184d67a08effdba5fb4bd61 (patch)
tree149bc2533581ffeddeedff8646dd50531e8478c8
parent429b8e904a6c118e8ffe560b75ff5aa0afcab1f2 (diff)
downloadhercules-36b0b52d1327b61b7184d67a08effdba5fb4bd61.tar.gz
hercules-36b0b52d1327b61b7184d67a08effdba5fb4bd61.tar.bz2
hercules-36b0b52d1327b61b7184d67a08effdba5fb4bd61.tar.xz
hercules-36b0b52d1327b61b7184d67a08effdba5fb4bd61.zip
Fixed wrong label name in adoption NPC
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9234 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/custom/adoption.txt7
2 files changed, 5 insertions, 3 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 9a1208828..5724c5b0d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,6 +34,7 @@ KarLaeda
Date Added
======
11/16
+ * Fixed wrong label name in adoption NPC [KarLaeda]
* Added official Ninja Job quest! Thanks to Legionaire for translation [Lupus]
Don't forget to update your other\Global_Functions.txt
- Removed name duplicates
diff --git a/npc/custom/adoption.txt b/npc/custom/adoption.txt
index 828299cd0..a027a437a 100644
--- a/npc/custom/adoption.txt
+++ b/npc/custom/adoption.txt
@@ -3,6 +3,7 @@
//===== By ================================================
//= Fredzilla with help from Kamari,Acky
//===== Version ===========================================
+//= 1.6a Fixed wrong label name [KarLaeda]
//= 1.6 Removed call to function Is_Taekwon_Class in favor of baseClass == Job_Taekwon [Silentdragon]
//= 1.5 Added GM menu to reset current adoption [Lupus]
//= 1.4 Got rid of useless "event_adoptXXX" variables [Lupus]
@@ -332,7 +333,7 @@ A_CantBeAdopted:
callfunc "AdoptReset","the person that would be adopted has a job that can't be adopted";
close;
A_ParentOneEnd:
- if (@regged>1) goto AlreadyReged;
+ if (@regged>1) goto A_AlreadyReged;
if ($@ParentOne$==$@ParentTwo$) goto A_SameFail;
mes "[Inanna]";
mes "Nice to talk to you again "+$@ParentOne$;
@@ -364,7 +365,7 @@ A_FinalYesP:
if ($@checkall==3) goto THEEND;
close;
A_ParentTwoEnd:
- if (@regged>1) goto AlreadyReged;
+ if (@regged>1) goto A_AlreadyReged;
mes "[Inanna]";
mes "Nice to talk to you again "+$@ParentTwo$;
mes "This is you last chance to back out";
@@ -386,7 +387,7 @@ A_AlreadyReged:
mes "Please wait for the others to talk to me";
close;
A_BabyEnd:
- if (@regged>1) goto AlreadyReged;
+ if (@regged>1) goto A_AlreadyReged;
mes "[Inanna]";
mes "Nice to talk to you again "+$@Baby$;
mes "This is you last chance to back out";