diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | doc/script_commands.txt | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7539962be..430d69bab 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 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] 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] diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 2d00cbbff..5efdaa380 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -1063,7 +1063,7 @@ segment NPC talking, this command is used A LOT. See 'mes'. *close; 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 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; 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. mes "[Woman]"; |