summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorevera <evera@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-18 07:21:05 +0000
committerevera <evera@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-18 07:21:05 +0000
commit95c8fd6d82e5f8888c5ac2ad0b9f5abc1432696a (patch)
tree2ee698b94ccfc6cc7e5e63b92eeb65298d1d6e58
parent6a3e9e120c684f418171da79f6de9f4f6096a0dc (diff)
downloadhercules-95c8fd6d82e5f8888c5ac2ad0b9f5abc1432696a.tar.gz
hercules-95c8fd6d82e5f8888c5ac2ad0b9f5abc1432696a.tar.bz2
hercules-95c8fd6d82e5f8888c5ac2ad0b9f5abc1432696a.tar.xz
hercules-95c8fd6d82e5f8888c5ac2ad0b9f5abc1432696a.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6636 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/guild/gldfunc_kafra.txt2
-rw-r--r--npc/kafras/functions_kafras.txt9
2 files changed, 6 insertions, 5 deletions
diff --git a/npc/guild/gldfunc_kafra.txt b/npc/guild/gldfunc_kafra.txt
index e1113aa7f..0c806bc6c 100644
--- a/npc/guild/gldfunc_kafra.txt
+++ b/npc/guild/gldfunc_kafra.txt
@@ -33,6 +33,6 @@ L_StartG:
set @wrpP[0], 0;
set @wrpD$[0], getarg(1);
setarray @wrpC$[0], @wrpD$[0], "Cancel", "", "", "","";
- callfunc "F_Kafra",2;
+ callfunc "F_Kafra",2,0,0;
end;
}
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 4b440d9f9..0bd55246e 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -74,11 +74,7 @@ function script F_Kafra {
next;
M_Menu:
- //Guilds Kafra
cleararray @K_Menu0$[0],"",7;
- if(getarg(0)==2) {
- setarray @K_Menu0$[0],"-Use Storage","-Use Guild Storage","-Rent a Cart","-Use Teleport Service","-Cancel";
- }
switch(getarg(1)){
//only Save & Storage
case 1:
@@ -105,6 +101,11 @@ function script F_Kafra {
setarray @K_Menu0$[0],"-Save","-Use Storage","-Use Teleport Service","-Rent a Cart","-Kafra Pass","-Other Information Check","-Cancel";
break;
}
+ if(getarg(0)==2) {
+ //Guilds Kafra
+ cleararray @K_Menu0$[0],"",7;
+ setarray @K_Menu0$[0],"-Use Storage","-Use Guild Storage","-Rent a Cart","-Use Teleport Service","-Cancel";
+ }
menu @K_Menu0$[0],K_Menu0,@K_Menu0$[1],K_Menu1,@K_Menu0$[2],K_Menu2,
@K_Menu0$[3],K_Menu3,@K_Menu0$[4],K_Menu4,@K_Menu0$[5],K_Menu5,
@K_Menu0$[6],K_Menu6,@K_Menu0$[7],K_Menu7;