Browse Source

Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14439 54d463be-8e91-2dee-dedb-b68131a5f0ec
Paradox924X 14 years ago
parent
commit
03bc90dab7
2 changed files with 6 additions and 5 deletions
  1. 1 0
      Changelog-Trunk.txt
  2. 5 5
      doc/script_commands.txt

+ 1 - 0
Changelog-Trunk.txt

@@ -1,6 +1,7 @@
 Date	Added
 Date	Added
 
 
 2010/11/02
 2010/11/02
+	* Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898) [Paradox924X]
 	* Applied patch by xazax to clean up various bits of code across mapserver code. (bugreport:4512) [Paradox924X]
 	* Applied patch by xazax to clean up various bits of code across mapserver code. (bugreport:4512) [Paradox924X]
 2010/11/01
 2010/11/01
 	* Changed Normal and Cash Food statuses so they do not stack and overwrite the other if the level (val1) is the same or higher. (bugreport:4519) [Paradox924X]
 	* Changed Normal and Cash Food statuses so they do not stack and overwrite the other if the level (val1) is the same or higher. (bugreport:4519) [Paradox924X]

+ 5 - 5
doc/script_commands.txt

@@ -1063,7 +1063,7 @@ segment NPC talking, this command is used A LOT. See 'mes'.
 *close;
 *close;
 
 
 This command will create a 'close' button in the message window for the invoking 
 This command will create a 'close' button in the message window for the invoking 
-character. If no window is currently on screen, it will be created. This is one 
+character. If no window is currently on screen, the script execution will end. This is one 
 of the ways to end a speech from an NPC. Once the button is clicked, the NPC 
 of the ways to end a speech from an NPC. Once the button is clicked, the NPC 
 script execution will end, and the message box will disappear.
 script execution will end, and the message box will disappear.
 
 
@@ -1077,10 +1077,10 @@ script execution will end, and the message box will disappear.
 *close2;
 *close2;
 
 
 This command will create a 'close' button in the message window for the invoking 
 This command will create a 'close' button in the message window for the invoking 
-character. If no window is currently on screen, it will be created. See 'close'. 
-There is one important difference, though - even though the message box will 
-have closed, the script execution will not stop, and commands after 'close2' 
-will still run, meaning an 'end' has to be used to stop the script, unless you 
+character. WARNING: If no window is currently on screen, the script execution will halt 
+indefinitely! See 'close'. There is one important difference, though - even though 
+the message box will have closed, the script execution will not stop, and commands after 
+'close2' will still run, meaning an 'end' has to be used to stop the script, unless you 
 make it stop in some other manner.
 make it stop in some other manner.
 
 
     mes "[Woman]";
     mes "[Woman]";