From: Eric S. Raymond <esr@thyrsus.com>
Date: Sat, 24 Jun 2017 16:49:25 +0000 (-0400)
Subject: Move the description of string escapes to where the strings now live.
X-Git-Tag: 1.1~128
X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=2755eed5a2a2d161e6c369109b410ecbd7f57f16

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

diff --git a/adventure.yaml b/adventure.yaml
index 6017793..629060a 100644
--- 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 00cccd2..6c6fcfd 100644
--- 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