Merge branch 'master' of https://github.com/tws2xa/EventCreator

tws2xa · tws2xa · commit ce697de206ab · 2014-11-08T17:28:55.000-05:00
diff --git a/Form1.cs b/Form1.cs
@@ -61,10 +61,9 @@ internal static List<string> getRequiredParty()
             return new List<string>();
         }
 
-        internal static string getIntroText()
+        internal string getIntroText()
         {
-            //TODO Return the intro text
-            return "";
+            return introDescInput.Text;
         }
 
         internal static bool getSelectPlayer()

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,9 @@ internal static List<string> getRequiredParty()`
`61`	`61`	`return new List<string>();`
`62`	`62`	`}`
`63`	`63`
`64`		`- internal static string getIntroText()`
	`64`	`+ internal string getIntroText()`
`65`	`65`	`{`
`66`		`- //TODO Return the intro text`
`67`		`- return "";`
	`66`	`+ return introDescInput.Text;`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`internal static bool getSelectPlayer()`