Move the description of string escapes to where the strings now live.

diff --git a/adventure.yaml b/adventure.yaml
index 60177932c5514b59a0795ff6ec2730d922c344d7..629060a40bc2b4868e194cfa845e033c0adffd48 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -77,6 +77,22 @@
 # These correspond to sections 1, 2, 5, 6, 9, 10, 11, 13, and 14 in the old
 # adventure.text format.  Sections 3, 4, 7, and 8 haven't moved yet.
 # Section 12 was obsolete.
+#
+# Message strings may include certain special character sequences to
+# denote that the program must provide parameters to insert into a
+# message when the message is printed.  These sequences are:
+#      %S = The letter 'S' or nothing (if a given value is exactly 1)
+#      %W = A word (up to 10 characters)
+#      %L = A word mapped to lower-case letters
+#      %U = A word mapped to upper-case letters
+#      %C = A word mapped to lower-case, first letter capitalised
+#      %T = Several words of text, ending with a word of -1
+#      %1 = A 1-digit number
+#      %2 = A 2-digit number
+#      ...
+#      %9 = A 9-digit number
+#      %B = Variable number of blanks
+#      %! = The entire message should be suppressed
 
 # FIXME: Hint texts shouldn't be in arbitrary_messages, but inlined here
 hints:

diff --git a/dungeon.c b/dungeon.c
index 00cccd2c9bfa91a527e4dca612b57134c8ab0b85..6c6fcfdf1e9639116c52fce8f3a78a28a64af24a 100644 (file)
--- a/dungeon.c
+++ b/dungeon.c
@@ -71,23 +71,6 @@
  *
  * Other sections are obsolete and ignored */
 
-/*  The various messages (sections 1, 2, 5, 6, etc.) may include certain
- *  special character sequences to denote that the program must provide
- *  parameters to insert into a message when the message is printed.  These
- *  sequences are:
- *     %S = The letter 'S' or nothing (if a given value is exactly 1)
- *     %W = A word (up to 10 characters)
- *     %L = A word mapped to lower-case letters
- *     %U = A word mapped to upper-case letters
- *     %C = A word mapped to lower-case, first letter capitalised
- *     %T = Several words of text, ending with a word of -1
- *     %1 = A 1-digit number
- *     %2 = A 2-digit number
- *     ...
- *     %9 = A 9-digit number
- *     %B = Variable number of blanks
- *     %! = The entire message should be suppressed */
-
 #define LINESIZE 100
 #define CLSMAX 12
 #define LINSIZ 12600