Moved 'goodbye' from usdf.txt to usdf_zdoom.txt

I have undone all my changes to usdf.txt. It should look like how it did before commit 0df6ba6
Gutawer · Oct 30, 2016 · 4fc5d52 · 4fc5d52
1 parent 7c1f7aa
commit 4fc5d52
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/specs/usdf.txt b/specs/usdf.txt
@@ -87,16 +87,14 @@ conversation // Starts a dialog.
 
     page // Starts a new page.  Pages are automatically numbered starting at 1.
     {
-        name    = <string>;  // Name that goes in the upper left hand corner
-        panel   = <string>;  // Name of lump to render as the background.
-        voice   = <string>;  // Narration sound lump.
-        dialog  = <string>;  // Dialog of the page.
-	goodbye = <string>;  // Custom goodbye message. If omitted then the
-                             // generic goodbyes will be displayed instead.
-        drop    = <integer>; // mobj for the object to drop if the actor is 
-                             // killed.
-        link    = <integer>; // Page to jump to if all ifitem conditions are
-                             // satisified.
+        name   = <string>;  // Name that goes in the upper left hand corner
+        panel  = <string>;  // Name of lump to render as the background.
+        voice  = <string>;  // Narration sound lump.
+        dialog = <string>;  // Dialog of the page.
+        drop   = <integer>; // mobj for the object to drop if the actor is 
+                            // killed.
+        link   = <integer>; // Page to jump to if all ifitem conditions are
+                            // satisified.
 
         // jumps to the specified page if the player has the specified amount 
         // or more of item in their inventory.  This can be repeated as many

diff --git a/specs/usdf_zdoom.txt b/specs/usdf_zdoom.txt
@@ -89,6 +89,9 @@ conversation // Starts a dialog.
 
     page
     {
+        goodbye = <string>; // Custom goodbye message. If omitted then the
+                            // generic goodbyes will be displayed instead.
+
         choice
         {
             // The amount of an item needed for this option to become available.
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,6 +89,9 @@ conversation // Starts a dialog. @@
         page
         {
+            goodbye = <string>; // Custom goodbye message. If omitted then the
+                                // generic goodbyes will be displayed instead.
             choice
             {
                 // The amount of an item needed for this option to become available.
@@ Expand Down @@