Update My Fork PART 2!!!

5 files changed, 20 insertions, 10 deletions

diff --git a/TimeHACK.Engine/FileDialogBoxManager.cs b/TimeHACK.Engine/FileDialogBoxManager.cs
index 334ebdd..f6d30ae 100644
--- a/TimeHACK.Engine/FileDialogBoxManager.cs
+++ b/TimeHACK.Engine/FileDialogBoxManager.cs
@@ -10,24 +10,24 @@ namespace TimeHACK.Engine
 {
     public static class FileDialogBoxManager
     {
-        public static Boolean IsInOpenDialog = false;
-        public static Boolean IsInSaveDialog = false;
-        public static String OnlyViewExtension = "";
-        public static void ActivateOpenFileDialog(String ExtensionToView)
+        public static bool IsInOpenDialog = false;
+        public static bool IsInSaveDialog = false;
+        public static string OnlyViewExtension = "";
+        public static void ActivateOpenFileDialog(string ExtensionToView)
         {
             IsInOpenDialog = true;
             IsInSaveDialog = false;
             OnlyViewExtension = ExtensionToView;
         }
 
-        public static void ActivateSaveFileDialog(String ExtensionToView)
+        public static void ActivateSaveFileDialog(string ExtensionToView)
         {
             IsInOpenDialog = false;
             IsInSaveDialog = true;
             OnlyViewExtension = ExtensionToView;
         }
 
-        public static String ReadTextFile(String path)
+        public static string ReadTextFile(string path)
         {
             try
             {
diff --git a/TimeHACK.Engine/MessageParser.cs b/TimeHACK.Engine/MessageParser.cs
index 168ab8d..6a13ae6 100644
--- a/TimeHACK.Engine/MessageParser.cs
+++ b/TimeHACK.Engine/MessageParser.cs
@@ -13,6 +13,7 @@ namespace TimeHACK.Engine
         {
             JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString());
             string newmsg = message["message"].ToString().Replace("@user", user);
+            if (!message["special"].ToString().StartsWith(".")) newmsg += Environment.NewLine;
             if (message["userchat"].ToObject<bool>()) return message["user"].ToString() + ": " + newmsg;
             else return newmsg;
         }
diff --git a/TimeHACK.Engine/Paintbrush.cs b/TimeHACK.Engine/Paintbrush.cs
index 1b442bc..026e5d8 100644
--- a/TimeHACK.Engine/Paintbrush.cs
+++ b/TimeHACK.Engine/Paintbrush.cs
@@ -19,5 +19,14 @@ namespace TimeHACK.Engine
                 SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset,
                 SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset);
         }
+
+        public static void PaintClassicBordersIndented(object sender, PaintEventArgs e, int borderwidth)
+        {
+            ControlPaint.DrawBorder(e.Graphics, ((Control)sender).ClientRectangle,
+                SystemColors.ControlDarkDark, borderwidth, ButtonBorderStyle.Inset,
+                SystemColors.ControlDarkDark, borderwidth, ButtonBorderStyle.Inset,
+                SystemColors.ControlDarkDark, borderwidth, ButtonBorderStyle.Inset,
+                SystemColors.ControlDarkDark, borderwidth, ButtonBorderStyle.Inset);
+        }
     }
 }
diff --git a/TimeHACK.Engine/Template/WinClassic.cs b/TimeHACK.Engine/Template/WinClassic.cs
index f5737aa..554d6be 100644
--- a/TimeHACK.Engine/Template/WinClassic.cs
+++ b/TimeHACK.Engine/Template/WinClassic.cs
@@ -39,7 +39,7 @@ namespace TimeHACK.Engine.Template
             if (!closeDisabled) this.Close();
         }
 
-           public Boolean max = false;
+           public bool max = false;
 
         private void maximizebutton_Click(object sender, EventArgs e)
         {
diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs
index 9e96673..156da2f 100644
--- a/TimeHACK.Engine/WindowManager.cs
+++ b/TimeHACK.Engine/WindowManager.cs
@@ -10,7 +10,7 @@ namespace TimeHACK.Engine
     {
         public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection();
 
-        public WinClassic StartWin95(UserControl content, String title, Image icon, Boolean MaxButton, Boolean MinButton, Boolean ShowApplicationAsDialog = false)
+        public WinClassic StartWin95(UserControl content, string title, Image icon, bool MaxButton, bool MinButton, bool ShowApplicationAsDialog = false)
         {
             // Setup Window
             WinClassic app = new WinClassic();
@@ -72,7 +72,7 @@ namespace TimeHACK.Engine
             return app;
         }
 
-        public WinClassic StartInfobox95(String title, String text, Image erroricon)
+        public WinClassic StartInfobox95(string title, string text, Image erroricon)
         {
             Infobox95 app = new Infobox95();
             app.infoText.Text = text;
@@ -82,7 +82,7 @@ namespace TimeHACK.Engine
             return StartWin95(app, title, null, false, false);
         }
 
-        public WinClassic StartAboutBox95(String shortname, String longname, Image appicon)
+        public WinClassic StartAboutBox95(string shortname, string longname, Image appicon)
         {
             AboutBox95 uc = new AboutBox95();
             uc.pictureBox1.Image = appicon;