summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-30 23:18:21 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-30 23:18:21 +0000
commitc32c61173aa710994aa9cfdb72cac62f3c4b88e1 (patch)
treead4a3fce9d3a9cb5b6a115dee7f1cfffec71b832 /npc
parent369157fd2e7e885eab19f5ab34fbee02d836e13e (diff)
downloadhercules-c32c61173aa710994aa9cfdb72cac62f3c4b88e1.tar.gz
hercules-c32c61173aa710994aa9cfdb72cac62f3c4b88e1.tar.bz2
hercules-c32c61173aa710994aa9cfdb72cac62f3c4b88e1.tar.xz
hercules-c32c61173aa710994aa9cfdb72cac62f3c4b88e1.zip
- Fixed some 'input' max value checks not working after r12192. (bugreport:3436)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13982 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/custom/banks/kafra_bank.txt6
-rw-r--r--npc/kafras/functions_kafras.txt9
2 files changed, 6 insertions, 9 deletions
diff --git a/npc/custom/banks/kafra_bank.txt b/npc/custom/banks/kafra_bank.txt
index a8a178b1f..04d762985 100644
--- a/npc/custom/banks/kafra_bank.txt
+++ b/npc/custom/banks/kafra_bank.txt
@@ -46,10 +46,9 @@ L_NoIncomeToday:
mes"[Maniss]";
mes "Please, tell me how much zeny you would like to deposit.";
next;
- input @kafrabank;
+ if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT;
if(@kafrabank<1000) goto L_LESS_1000;
- if(@kafrabank>10000000) goto L_TOO_BIG_AMOUNT;
if(@kafrabank>zeny) goto L_NOT_ENOUGH;
set zeny,zeny-@kafrabank;
set #kafrabank,#kafrabank+@kafrabank;
@@ -65,10 +64,9 @@ M_WITHDRAW:
mes "Your account: ^135445" + #kafrabank + "^000000 zeny.";
mes "How much zeny would you like to withdraw?";
next;
- input @kafrabank;
+ if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT;
if(@kafrabank<1) goto B_EXIT2;
- if(@kafrabank>10000000) goto L_TOO_BIG_AMOUNT;
if(@kafrabank>#kafrabank) goto L_NOT_ENOUGH;
set #kafrabank,#kafrabank-@kafrabank;
set zeny,zeny+@kafrabank;
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 83994d87c..268b54f64 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -665,13 +665,12 @@ function script F_EntKafCode {
set @kafcode_try,0;
logmes "Hack: Tried to fit storage password.";
}
- input @code_;
- if(@code_<1000) {
- mes "You shouldn't use such short password.";
+ if(input(@code_) == 1) {
+ mes "You can't use such big password.";
return 0;
}
- if(@code_>10000000) {
- mes "You can't use such big password.";
+ if(@code_<1000) {
+ mes "You shouldn't use such short password.";
return 0;
}
return @code_;