Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Changed some variables to scope instead of permanent char. (bugreport:3248)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13890 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2009-06-15 03:38:20 +00:00
parent 1bad54ae71
commit 7b835b0b4e
3 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/script_commands.txt
View File

@ -1463,6 +1463,7 @@ generally cleaner:
--------------------------------------- ---------------------------------------
*callsub <label>{,<argument>,...<argument>}; *callsub <label>{,<argument>,...<argument>};
*callsub(<label>{,<argument>,...<argument>})
This command will go to a specified label within the current script (do NOT use This command will go to a specified label within the current script (do NOT use
quotes around it) coming in as if it were a 'callfunc' call, and pass it quotes around it) coming in as if it were a 'callfunc' call, and pass it

36
npc/quests/quests_airship.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
// Samuray22 // Samuray22
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.5 //= 1.6
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena SVN //= eAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -22,6 +22,7 @@
//= 1.3a Corrected a Typo error ";;". [Samuray22] //= 1.3a Corrected a Typo error ";;". [Samuray22]
//= 1.4 Fixed incorrect variable type used. [L0ne_W0lf] //= 1.4 Fixed incorrect variable type used. [L0ne_W0lf]
//= 1.5 Replaced effect numerics with constants. [Samuray22] //= 1.5 Replaced effect numerics with constants. [Samuray22]
//= 1.6 Changed some variables to scope instead of permanent char. [brianluau]
//============================================================ //============================================================
//=======================================================================================================// //=======================================================================================================//
@ -91,7 +92,7 @@ airplane,47,61,1 script Crewman 833,{
close; close;
} else { } else {
mes "["+strcharinfo(0)+"]"; mes "["+strcharinfo(0)+"]";
mes ""+@comment$+"."; mes @comment$+".";
next; next;
mes "[Kain Himere]"; mes "[Kain Himere]";
mes "Hmmmm..."; mes "Hmmmm...";
@ -134,7 +135,7 @@ airplane,47,61,1 script Crewman 833,{
close; close;
} else { } else {
mes "["+strcharinfo(0)+"]"; mes "["+strcharinfo(0)+"]";
mes ""+@comment$+"."; mes @comment$+".";
next; next;
mes "[Kain Himere]"; mes "[Kain Himere]";
mes "Hmmmm..."; mes "Hmmmm...";
@ -829,10 +830,10 @@ function script cherno {
next; next;
mes "["+strcharinfo(0)+"]"; mes "["+strcharinfo(0)+"]";
mes "I am called,"; mes "I am called,";
mes ""+strcharinfo(0)+"."; mes strcharinfo(0)+".";
next; next;
mes "[Tarsha Cherno]"; mes "[Tarsha Cherno]";
mes ""+strcharinfo(0)+","; mes strcharinfo(0)+",";
mes "I appreciate your concerns~ Would you please stay for a cup of tea?"; mes "I appreciate your concerns~ Would you please stay for a cup of tea?";
next; next;
mes "[Tarsha Cherno]"; mes "[Tarsha Cherno]";
@ -1387,16 +1388,16 @@ airplane_01,238,154,5 script Airship Captain#01 873,{
mes "Airship. Did you"; mes "Airship. Did you";
mes "have a question?"; mes "have a question?";
next; next;
if (lght_air >= 0 && lght_air <= 2 || lght_air == 7) { if (lght_air >= 0 && lght_air <= 3 || lght_air == 7) {
set question$, "How does this Airship fly?"; set .@question$, "How does this Airship fly?";
} else if(lght_air == 4) { } else if(lght_air == 4) {
set question$, "I handed the letter to Captain Ferlock."; set .@question$, "I handed the letter to Captain Ferlock.";
} else if(lght_air == 5) { } else if(lght_air == 5) {
set question$, "You finished reading the letter?"; set .@question$, "You finished reading the letter?";
} else if(lght_air == 6) { } else if(lght_air == 6) {
set question$, "Already finished reading?"; set .@question$, "Already finished reading?";
} }
switch( select( "Y-you're a reindeer?!", ""+question$+"", "No, not really." )){ switch( select( "Y-you're a reindeer?!", .@question$, "No, not really." )){
case 1: case 1:
mes "[Tarlock]"; mes "[Tarlock]";
mes "Hm? Oh, that"; mes "Hm? Oh, that";
@ -1977,16 +1978,15 @@ airplane,236,163,5 script Airship Captain#03 873,{
mes "I be of service to you?"; mes "I be of service to you?";
next; next;
if(lght_air == 2) { if(lght_air == 2) {
set question2$, "Give him Tarlock's Letter."; set .@question2$, "Give him Tarlock's Letter.";
set question3$, "Cancel."; set .@question3$, "Cancel.";
} else if(lght_air == 3) { } else if(lght_air == 3) {
set question2$, "Here are the items I've found."; set .@question2$, "Here are the items I've found.";
set question3$, "Cancel."; set .@question3$, "Cancel.";
} else { } else {
set question2$, "Cancel."; set .@question2$, "Cancel.";
set question3$, "";
} }
switch( select( "How does this Airship fly?", ""+question2$+"", ""+question3$+"")) { switch( select( "How does this Airship fly?", .@question2$, .@question3$)) {
case 1: case 1:
mes "[Ferlock]"; mes "[Ferlock]";
mes "I'm sorry, but I can't"; mes "I'm sorry, but I can't";

1
sql-files/upgrade_svn13890.sql Normal file
View File

@ -0,0 +1 @@
DELETE FROM `global_reg_value` WHERE str='question$' OR str='question2$' OR str='question3$';