Updated my fork!

Conflicts:
	Histacom2/TitleScreen.Designer.cs
	Histacom2/TitleScreen.cs

1 files changed, 65 insertions, 82 deletions

diff --git a/Histacom2/TitleScreen.cs b/Histacom2/TitleScreen.cs
index d39ba45..4108204 100644
--- a/Histacom2/TitleScreen.cs
+++ b/Histacom2/TitleScreen.cs
@@ -57,66 +57,61 @@ namespace Histacom2
 
         public void StartGame()
         {
-            if (Convert.ToInt32(VM_Width.Text) == 1337 && Convert.ToInt32(VM_Height.Text) == 1337) leet();
-            else
-            {
-                // Time to decide which OS to start up!
-
-                switch (CurrentSave.CurrentOS)
-                {
-                    case "95":
-                        frm95 = new Windows95();
-                        frm95.TopMost = true;
-                        frm95.FormBorderStyle = FormBorderStyle.None;
-                        frm95.WindowState = FormWindowState.Maximized;
-                        //if (vm_mode.Checked)
-                        //{
-                        //    frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text));
-                        //    frm95.FormBorderStyle = FormBorderStyle.Fixed3D;
-                        //}
-                        frm95.Show();
-                        Hide();
-
-                        break;
-                    case "98":
-                        frm98 = new Windows98();
-                        frm98.TopMost = true;
-                        frm98.FormBorderStyle = FormBorderStyle.None;
-                        frm98.WindowState = FormWindowState.Maximized;
-                        //if (vm_mode.Checked)
-                        //{
-                        //    frm98.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text));
-                        //    frm98.FormBorderStyle = FormBorderStyle.Fixed3D;
-                        //}
-                        frm98.Show();
-                        Hide();
-
-                        break;
-                    case "xpbad":
-                        frmBadXP = new WindowsXPBad();
-                        frmBadXP.TopMost = true;
-                        frmBadXP.FormBorderStyle = FormBorderStyle.None;
-                        frmBadXP.WindowState = FormWindowState.Maximized;
-                        //if (vm_mode.Checked)
-                        //{
-                        //    frm98.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text));
-                        //    frm98.FormBorderStyle = FormBorderStyle.Fixed3D;
-                        //}
-                        frmBadXP.Show();
-                        Hide();
-
-                        break;
-                    default:
-                        MessageBox.Show("WARNING! It looks like this save is corrupt!");
-                        MessageBox.Show("We will now open the Save troubleshooter");
-
-                        SaveFileTroubleShooter troubleshooter = new SaveFileTroubleShooter();
-
-                        troubleshooter.ShowDialog();
-                        break;
-                }
-
-            }
+            // Time to decide which OS to start up!
+
+			switch (CurrentSave.CurrentOS)
+			{
+				case "95":
+					frm95 = new Windows95();
+					frm95.TopMost = true;
+					frm95.FormBorderStyle = FormBorderStyle.None;
+					frm95.WindowState = FormWindowState.Maximized;
+					//if (vm_mode.Checked)
+					//{
+					//    frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text));
+					//    frm95.FormBorderStyle = FormBorderStyle.Fixed3D;
+					//}
+					frm95.Show();
+					Hide();
+
+					break;
+				case "98":
+					frm98 = new Windows98();
+					frm98.TopMost = true;
+					frm98.FormBorderStyle = FormBorderStyle.None;
+					frm98.WindowState = FormWindowState.Maximized;
+					//if (vm_mode.Checked)
+					//{
+					//    frm98.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text));
+					//    frm98.FormBorderStyle = FormBorderStyle.Fixed3D;
+					//}
+					frm98.Show();
+					Hide();
+
+					break;
+				case "xpbad":
+					frmBadXP = new WindowsXPBad();
+					frmBadXP.TopMost = true;
+					frmBadXP.FormBorderStyle = FormBorderStyle.None;
+					frmBadXP.WindowState = FormWindowState.Maximized;
+					//if (vm_mode.Checked)
+					//{
+					//    frm98.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text));
+					//    frm98.FormBorderStyle = FormBorderStyle.Fixed3D;
+					//}
+					frmBadXP.Show();
+					Hide();
+
+					break;
+				default:
+					MessageBox.Show("WARNING! It looks like this save is corrupt!");
+					MessageBox.Show("We will now open the Save troubleshooter");
+
+					SaveFileTroubleShooter troubleshooter = new SaveFileTroubleShooter();
+
+					troubleshooter.ShowDialog();
+					break;
+			}
         }
 
         private void VM_WidthHeight_KeyPress(object sender, KeyPressEventArgs e)
@@ -155,6 +150,7 @@ namespace Histacom2
             ShutdownToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
         }
 
+<<<<<<< HEAD
         private static void leet()
         {
             WindowManager wm = new WindowManager();
@@ -168,6 +164,8 @@ namespace Histacom2
             wm.Init(leet, "Thank You", null, true, true);
         }
 
+=======
+>>>>>>> 382f0167714bbcad00ab710fe7dcfa05eaeb88ac
         #region Menu Buttons
 
         #region NewGame
@@ -200,28 +198,13 @@ namespace Histacom2
 
                 }
 
-                // If VM Mode is not enabled
-                if (vm_mode.Checked != true)
-                {
-                    // Generate fullscreen desktop
-                    frm95 = new Windows95();
-                    frm95.TopMost = true;
-                    frm95.FormBorderStyle = FormBorderStyle.None;
-                    frm95.WindowState = FormWindowState.Maximized;
-                    frm95.Show();
-                    Hide();
-                }
-                // If VM Mode is enabled
-                else
-                {
-                    // Generate desktop with size entered by user
-                    frm95 = new Windows95();
-                    frm95.FormBorderStyle = FormBorderStyle.None;
-                    frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text));
-                    frm95.FormBorderStyle = FormBorderStyle.Fixed3D;
-                    frm95.Show();
-                    Hide();
-                }
+                // Generate fullscreen desktop
+                frm95 = new Windows95();
+                frm95.TopMost = true;
+                frm95.FormBorderStyle = FormBorderStyle.None;
+                frm95.WindowState = FormWindowState.Maximized;
+                frm95.Show();
+                Hide();
             }
         }
         #endregion