From 14824f235750042aec631fa8ed50022458c1115b Mon Sep 17 00:00:00 2001 From: lempamo Date: Mon, 10 Jul 2017 19:28:42 -0400 Subject: removed testapp --- TimeHACK.Main/OS/Win98/Win98.Designer.cs | 12 ------------ TimeHACK.Main/OS/Win98/Win98.cs | 10 ---------- 2 files changed, 22 deletions(-) (limited to 'TimeHACK.Main/OS/Win98') diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs index d07670b..3762187 100644 --- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs @@ -89,7 +89,6 @@ namespace TimeHACK.OS.Win98 this.WebChatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TimeDistorterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DocumentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.windowManagerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.downloaderTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.installerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -730,7 +729,6 @@ namespace TimeHACK.OS.Win98 this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.DocumentsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.windowManagerTestToolStripMenuItem, this.downloaderTestToolStripMenuItem, this.installerTestToolStripMenuItem, this.storyTest1ToolStripMenuItem}); @@ -742,15 +740,6 @@ namespace TimeHACK.OS.Win98 this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.DocumentsToolStripMenuItem.Text = "Documents"; // - // windowManagerTestToolStripMenuItem - // - this.windowManagerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.windowManagerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("windowManagerTestToolStripMenuItem.BackgroundImage"))); - this.windowManagerTestToolStripMenuItem.Name = "windowManagerTestToolStripMenuItem"; - this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.windowManagerTestToolStripMenuItem.Text = "WindowManagerTest"; - this.windowManagerTestToolStripMenuItem.Click += new System.EventHandler(this.windowManagerTestToolStripMenuItem_Click); - // // downloaderTestToolStripMenuItem // this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; @@ -1261,7 +1250,6 @@ namespace TimeHACK.OS.Win98 internal System.Windows.Forms.ToolStripMenuItem MicrosoftDataLinkToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PropertiesToolStripMenuItem1; internal System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95)); - private System.Windows.Forms.ToolStripMenuItem windowManagerTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem; private System.Windows.Forms.Panel taskbarItems; diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index 175719a..fa3fbfa 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -8,7 +8,6 @@ using TimeHACK.Engine; using TimeHACK.Engine.Template; using TimeHACK.Engine.Template.Taskbars; using TimeHACK.OS.Win95.Win95Apps; -using TimeHACK.WinClassicForms; using TimeHACK.OS.Win95.Win95Apps.Story; namespace TimeHACK.OS.Win98 @@ -195,15 +194,6 @@ namespace TimeHACK.OS.Win98 app.BringToFront(); startmenu.Hide(); } - private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e) - { - TestApp test = new TestApp(); - WinClassic app = wm.StartWin95(test, "TestApp", null, true, true); - AddTaskBarItem(app, app.Tag.ToString(), "TestApp", null); - app.BringToFront(); - startmenu.Hide(); - } - private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicDownloader opendownload = new WinClassicDownloader(); -- cgit v1.2.3 From e75e11bcc81e61ccdef78279aa8d39d91c860f8c Mon Sep 17 00:00:00 2001 From: JayXKanz666 Date: Wed, 12 Jul 2017 23:01:19 +0200 Subject: Added some stuff -Added another story-script (Hack2.cs) -Fixed an issue where the MS-DOS prompt would freeze when displaying text -Added Action Delegate (method/function) as an argument for Time Distorter (optional) --- TimeHACK.Main/OS/Win95/Win95.cs | 5 +- TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs | 55 +++++------ TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack2.cs | 102 +++++++++++++++++++++ TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs | 2 +- .../OS/Win95/Win95Apps/WinClassicTimeDistorter.cs | 11 ++- TimeHACK.Main/OS/Win98/Win98.cs | 2 +- TimeHACK.Main/TimeHACK.Main.csproj | 1 + 7 files changed, 135 insertions(+), 43 deletions(-) create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack2.cs (limited to 'TimeHACK.Main/OS/Win98') diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 7efe5e9..6cae472 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -383,7 +383,7 @@ namespace TimeHACK.OS.Win95 private void storyTest1ToolStripMenuItem_Click(object sender, EventArgs e) { - Hack1.startObjective(); + Hack1.StartObjective(); } private void temp_for_std(object sender, EventArgs e) @@ -429,8 +429,7 @@ namespace TimeHACK.OS.Win95 private void TimeDistorterToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassic app = wm.StartWin95(new WinClassicTimeDistorter("2017", "20XX", 10), "Time Distorter", null, false, true); - + WinClassic app = wm.StartWin95(new WinClassicTimeDistorter("1998", "1999", 160, Hack2.StartObjective), "Time Distorter", null, false, true); AddTaskBarItem(app, app.Tag.ToString(), "Time Distorter", null); app.BringToFront(); startmenu.Hide(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs index 85b14f5..293d4bb 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs @@ -21,25 +21,15 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story static bool devMode = true; // This is the very first story script! - public static void startObjective() + public static void StartObjective() { System.Windows.Forms.Timer tmr = new System.Windows.Forms.Timer(); - - WinClassicTerminal Console = new WinClassicTerminal(true); - WinClassic app = wm.StartWin95(Console, "MS-DOS Prompt", null, true, true); - - Console.WriteLine("telnet> 104.27.135.159 Connecting..."); - tmr.Interval = 1; tmr.Tick += new EventHandler(CheckIfSoundFinished); if (devMode == true) { - Thread contObjective = new Thread(continueObjective); - - app.Close(); - - contObjective.Start(); + ContinueObjective(); } else { @@ -48,40 +38,39 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story } } - public static void continueObjective() + public static async void ContinueObjective() { WinClassicTerminal Console = new WinClassicTerminal(true); - wm.StartWin95(Console, "MS-DOS Prompt", null, true, true); - - Application.DoEvents(); + WinClassic app = wm.StartWin95(Console, "MS-DOS Prompt", null, true, true); + Console.WriteLine("telnet> 104.27.135.159 Connecting..."); + await Task.Delay(2500); Console.WriteLine("telnet> 104.27.135.159 Connected."); - Thread.Sleep(2500); + await Task.Delay(2500); Console.WriteLine("telnet> 104.27.135.159 set hostname to 'TheHiddenHacker'."); - Thread.Sleep(2500); + await Task.Delay(2500); Console.WriteLine("TheHiddenHacker> I see you have access to 12padams.com."); - Thread.Sleep(4500); + await Task.Delay(4500); Console.WriteLine("TheHiddenHacker> Though it doesn't seem obvious, only a very limited amount of people can access the site."); - Thread.Sleep(6000); + await Task.Delay(6000); Console.WriteLine("TheHiddenHacker> 12padams has a secret, and I need you to help me find it."); - Thread.Sleep(3500); + await Task.Delay(3500); Console.WriteLine("TheHiddenHacker> I was snooping around his website, when he blacklisted my IP address."); - Thread.Sleep(4000); - Console.WriteLine("TheHiddenHacker> While I was serching, I noticed a file that I didn't have permission to download. I need you to get it for me."); - Thread.Sleep(6500); - Console.WriteLine("TheHiddenHacker> First, I'll need you to download an FTP client, avalible under the software section of 12padams' website."); - Thread.Sleep(5000); + await Task.Delay(4000); + Console.WriteLine("TheHiddenHacker> While I was searching, I noticed a file that I didn't have permission to download. I need you to get it for me."); + await Task.Delay(6500); + Console.WriteLine("TheHiddenHacker> First, I'll need you to download an FTP client, available under the software section of 12padams' website."); + await Task.Delay(5000); Console.WriteLine("TheHiddenHacker> Once that's downloaded, You'll need to type in a Hostname, Username, and Password."); - Thread.Sleep(4500); + await Task.Delay(4500); Console.WriteLine("TheHiddenHacker> The hostname is 172.68.119.42, and the username is most likely 12padams. I'm not too sure what the password is, however."); - Thread.Sleep(3500); + await Task.Delay(3500); Console.WriteLine("TheHiddenHacker> You'll need to figure out where you can get the password. Try looking for any odd text on the website."); - Thread.Sleep(3500); + await Task.Delay(3500); Console.WriteLine("TheHiddenHacker> I don't have much time to talk - I'd quickly copy down those details into Notepad before this Terminal gets closed."); - Application.DoEvents(); - - Thread.Sleep(36000); + await Task.Delay(36000); + app.Close(); } public static void CheckIfSoundFinished(Object sender, EventArgs e) @@ -91,7 +80,7 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story // Continue from where we were System.Windows.Forms.Timer trm = sender as System.Windows.Forms.Timer; - continueObjective(); + ContinueObjective(); trm.Stop(); } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack2.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack2.cs new file mode 100644 index 0000000..470a240 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack2.cs @@ -0,0 +1,102 @@ +using System; +using System.Threading.Tasks; +using TimeHACK.Engine; +using TimeHACK.Engine.Template; + +namespace TimeHACK.OS.Win95.Win95Apps.Story +{ + public class Hack2 : Object + { + static WindowManager wm = new WindowManager(); + + public static async void StartObjective() + { + WinClassicTerminal Console = new WinClassicTerminal(true); + WinClassic app = wm.StartWin95(Console, "MS-DOS Prompt", null, true, true); + + Console.WriteLine("telnet> 185.152.46.51 Connecting..."); + await Task.Delay(2500); + Console.WriteLine("telnet> 185.152.46.51 Connected."); + await Task.Delay(2500); + Console.WriteLine("telnet> 185.152.46.51 set hostname to '12padams'."); + await Task.Delay(2000); + Console.WriteLine("12padams> WHAT DO YOU THINK YOU'RE DOING??"); + await Task.Delay(3000); + Console.WriteLine("12padams> First you hack my FTP server and download hwcv.exe.."); + await Task.Delay(4500); + Console.WriteLine("12padams> And use it to hack my website.."); + await Task.Delay(3500); + Console.WriteLine("12padams> Oh, and I know you pressed it."); + await Task.Delay(4000); + Console.WriteLine("12padams> I can see your screen right now.."); + await Task.Delay(3500); + Console.WriteLine("12padams> And to prove that I can see it, look at your timer. It says 130 seconds left."); + await Task.Delay(4000); + Console.WriteLine("12padams> Now, in 2 minutes you think you're going to be able to travel to 1999."); + await Task.Delay(3250); + Console.WriteLine("12padams> Well, I am sorry but I just can't let you do that."); + await Task.Delay(5000); + Console.WriteLine("12padams> You see, I have LOTS of power over your computer."); + await Task.Delay(3400); + Console.WriteLine("12padams> Okay, let me show you how easy this is."); + await Task.Delay(1500); + Console.WriteLine("Command> Hide Start Button"); + await Task.Delay(3500); + Console.WriteLine("12padams> See how easy that was?"); + await Task.Delay(3700); + Console.WriteLine("12padams> Now watch this.."); + await Task.Delay(3500); + Console.WriteLine("12padams> Hahaha, having a few errors are we?"); + await Task.Delay(2500); + Console.WriteLine("telnet> 104.27.135.159 Connecting..."); + await Task.Delay(2500); + Console.WriteLine("telnet> 104.27.135.159 Connected."); + await Task.Delay(2500); + Console.WriteLine("telnet> 104.27.135.159 set hostname to 'TheHiddenHacker'."); + await Task.Delay(3000); + Console.WriteLine("The Hidden Hacker> Great, you found the software."); + await Task.Delay(3700); + Console.WriteLine("12padams> How dare you.."); + await Task.Delay(3500); + Console.WriteLine($"The Hidden Hacker> Don't worry {SaveSystem.ProfileName}."); + await Task.Delay(4500); + Console.WriteLine("The Hidden Hacker> I have to say, good job for getting the software."); + await Task.Delay(3900); + Console.WriteLine("12padams> The Hidden Hacker.. I thought my first punishment was enough to get you away."); + await Task.Delay(4500); + Console.WriteLine("The Hidden Hacker> Well, now that I have uncovered your secret, I'm not just gonna go away."); + await Task.Delay(3600); + Console.WriteLine("12padams> If you don't go, I'll make you go!"); + await Task.Delay(3700); + Console.WriteLine($"The Hidden Hacker> Hey {SaveSystem.ProfileName}, don't worry about 12padams. You're about to get away from all this."); + await Task.Delay(3500); + Console.WriteLine("The Hidden Hacker> Let me fix this.."); + await Task.Delay(2500); + Console.WriteLine("Command> Show Start Button"); + await Task.Delay(2900); + Console.WriteLine("12padams> OKAY, NOW YOU'VE DONE IT!"); + await Task.Delay(2500); + Console.WriteLine("Command> Stop Timer"); + await Task.Delay(3000); + Console.WriteLine("12padams> I bet you didn't see that one coming.."); + await Task.Delay(3700); + Console.WriteLine("The Hidden Hacker> Oh but I did.."); + await Task.Delay(5000); + Console.WriteLine("The Hidden Hacker> I converted the stop function to the hide function when I logged on.."); + await Task.Delay(4200); + Console.WriteLine("12padams> NO! That's impossible!"); + await Task.Delay(3000); + Console.WriteLine("The Hidden Hacker> Oh, is it? Well, watch this!"); + await Task.Delay(2500); + Console.WriteLine("Command> Show Timer"); + await Task.Delay(3000); + Console.WriteLine("The Hidden Hacker> And here's one more command for you to learn."); + await Task.Delay(1700); + Console.WriteLine("Command> Disconnect 12padams"); + await Task.Delay(2000); + Console.WriteLine("telnet> 12padams Disconnected."); + await Task.Delay(3000); + Console.WriteLine($"The Hidden Hacker> Good luck {SaveSystem.ProfileName}! I'll see you in the future!"); + } + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs index 81b8504..a9753b6 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs @@ -114,7 +114,7 @@ namespace TimeHACK.OS.Win95.Win95Apps break; case "www.12padams.com": hidePrograms(); - Story.Hack1.startObjective(); + Story.Hack1.StartObjective(); webBrowser1.DocumentText = resources.GetString("padams_HTML"); break; case "www.microsoft.com/internetexplorer4/welcome": diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs index b0542ba..57fa683 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs @@ -1,4 +1,5 @@ using System; +using System.Threading.Tasks; using System.Windows.Forms; using TimeHACK.Engine; using TimeHACK.Engine.Template; @@ -8,9 +9,9 @@ namespace TimeHACK.OS.Win95 public partial class WinClassicTimeDistorter : UserControl { private int _counter; - private Form _action; + private Action _action; - public WinClassicTimeDistorter(string currentYear, string yearToTravel, int counter, Form action = null) + public WinClassicTimeDistorter(string currentYear, string yearToTravel, int counter, Action action = null) { InitializeComponent(); @@ -25,6 +26,8 @@ namespace TimeHACK.OS.Win95 { lblCountDown.Visible = true; btnGo.Enabled = false; + + _action?.Invoke(); countDownTimer.Start(); lblCountDown.Text = $"Preparing to travel... ETA: {_counter.ToString()} seconds"; @@ -37,10 +40,8 @@ namespace TimeHACK.OS.Win95 if (_counter == 0) { countDownTimer.Stop(); - - if (_action != null) - _action.ShowDialog(); } + lblCountDown.Text = $"Preparing to travel... ETA: {_counter.ToString()} seconds"; } } diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index fa3fbfa..a249ba3 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -356,7 +356,7 @@ namespace TimeHACK.OS.Win98 private void storyTest1ToolStripMenuItem_Click(object sender, EventArgs e) { - Hack1.startObjective(); + Hack1.StartObjective(); } private void temp_for_std(object sender, EventArgs e) diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 229b453..f31f9f7 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -146,6 +146,7 @@ GooglePrototype.cs + UserControl -- cgit v1.2.3 From 264deb3774935da3faba95fef55a94227e3f2368 Mon Sep 17 00:00:00 2001 From: JayXKanz666 Date: Thu, 13 Jul 2017 16:46:24 +0200 Subject: Fixed type names -`String` replaced with `string` -`Boolean` replaced with `bool` --- TimeHACK.Engine/FileDialogBoxManager.cs | 12 +-- TimeHACK.Engine/Template/WinClassic.cs | 2 +- TimeHACK.Engine/WindowManager.cs | 6 +- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95.cs | 2 +- TimeHACK.Main/OS/Win95/Win95.resx | 86 +++++++-------- .../FRMWinClassicAddressBookNewContact.cs | 2 +- .../Win95Apps/AddressBook/WinClassicAddressBook.cs | 4 +- .../OS/Win95/Win95Apps/IE4Sites/IE4Start.resx | 120 +++++++++++++++++++++ .../OS/Win95/Win95Apps/WinClassicTerminal.cs | 2 +- .../Win95/Win95Apps/WinClassicWindowsExplorer.cs | 24 ++--- .../OS/Win95/Win95Apps/WinClassicWordPad.cs | 4 +- TimeHACK.Main/OS/Win98/Win98.cs | 2 +- TimeHACK.Main/Program.cs | 4 +- TimeHACK.Main/Properties/Resources.resx | 6 +- TimeHACK.Main/Resources/msdosprompt.png | Bin 0 -> 41974 bytes TimeHACK.Main/SaveDialogs/LoadGameDialog.cs | 2 +- TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs | 6 +- TimeHACK.Main/SaveDialogs/NewGameDialog.cs | 2 +- .../SaveDialogs/SaveFileTroubleShooter.cs | 6 +- TimeHACK.Main/TimeHACK.Main.csproj | 1 + TimeHACK.Main/TitleScreen.cs | 2 +- 22 files changed, 209 insertions(+), 87 deletions(-) create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx create mode 100644 TimeHACK.Main/Resources/msdosprompt.png (limited to 'TimeHACK.Main/OS/Win98') 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/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; diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 144b0c9..15f4feb 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -717,6 +717,7 @@ namespace TimeHACK.OS.Win95 this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; + this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // // TimeDistorterToolStripMenuItem // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index a170f7f..d681c58 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -289,7 +289,7 @@ namespace TimeHACK.OS.Win95 private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text, Image erroricon)!", Properties.Resources.Win95Info); + WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(string title, string text, Image erroricon)!", Properties.Resources.Win95Info); app.BringToFront(); startmenu.Hide(); diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx index ec161c8..ba695aa 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -121,6 +121,48 @@ 17, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME + Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 + NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j + Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m + M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK + 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N @@ -264,41 +306,6 @@ DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ - 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME - Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN - upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 - NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j - Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I - gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m - M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh - EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK - 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC @@ -334,13 +341,6 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= @@ -382,7 +382,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAZgBAQGYAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAbABAQGwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs index fe75e83..482d54c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs @@ -57,7 +57,7 @@ namespace TimeHACK.OS.Win95.Win95Apps txtLast.Text = toSet.LastName; if (toSet.Emails != null) { - foreach (String email in toSet.Emails) + foreach (string email in toSet.Emails) { emails.Items.Add(email); } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs index 24404bf..95ee509 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs @@ -282,12 +282,12 @@ namespace TimeHACK.OS.Win95.Win95Apps public string FirstName; public string MiddleName; public string LastName; - public List Emails = new List(); + public List Emails = new List(); } public class AddressBookContactList { - public String AttachedNode; + public string AttachedNode; public List Contacts = new List(); } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs index 70cd0f9..a754ed0 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs @@ -71,7 +71,7 @@ namespace TimeHACK.OS.Win95.Win95Apps /// Write text to the Terminal. Very similar to the Win32 Console.Write Function. /// /// - public void Write(String Text) + public void Write(string Text) { cmdPrompt.AppendText(Text); cmdPrompt.Update(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index e4f98ff..98dc4ff 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -45,9 +45,9 @@ namespace TimeHACK.OS.Win95.Win95Apps //' Next //'End Sub - String ReadDataFile(String reqDirectory, Boolean returnYesIfProtected = false) { - String Val = ""; - String directoryFileInfo; + string ReadDataFile(string reqDirectory, bool returnYesIfProtected = false) { + string Val = ""; + string directoryFileInfo; directoryFileInfo = File.ReadAllText(Path.Combine(reqDirectory, "_data.info")); FileSystemFolderInfo toRead = new FileSystemFolderInfo(); toRead = JsonConvert.DeserializeObject(directoryFileInfo); @@ -70,14 +70,14 @@ namespace TimeHACK.OS.Win95.Win95Apps try { // Refresh the right listview this.mainView.Items.Clear(); - // For Each drive As String In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders") + // For Each drive As string In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders") // If GetPropetiesForDir(drive)(4) = "isMyDocuments" Then // diskView.Items.Add("", 0) // End If //Next - foreach (String str in Directory.GetDirectories(currentDirectory)) + foreach (string str in Directory.GetDirectories(currentDirectory)) { - String label = ReadDataFile(str, false); + string label = ReadDataFile(str, false); if (label == "") { this.mainView.Items.Add(Path.GetFileName(str)); @@ -87,7 +87,7 @@ namespace TimeHACK.OS.Win95.Win95Apps this.mainView.FindItemWithText(label).Tag = Path.GetFileName(str); } } - foreach (String str in Directory.GetFiles(currentDirectory)) + foreach (string str in Directory.GetFiles(currentDirectory)) { // Get app Icon @@ -96,7 +96,7 @@ namespace TimeHACK.OS.Win95.Win95Apps switch (new FileInfo(str).Extension) { case ".exe": - String contents; + string contents; contents = File.ReadAllText(str); @@ -492,7 +492,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - if ((String)mainView.FocusedItem.Tag != "") { // If it isn't a file + if ((string)mainView.FocusedItem.Tag != "") { // If it isn't a file GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); } else { // If it is a file if (new FileInfo(Path.Combine(currentDirectory, txtSave.Text)).Extension == onlyViewExtension) @@ -547,10 +547,10 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - Boolean OpenFile = false; + bool OpenFile = false; if (mainView.FocusedItem != null) { - if ((String)mainView.FocusedItem.Tag != "") + if ((string)mainView.FocusedItem.Tag != "") { // If it isn't a file GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); } @@ -632,7 +632,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e) { - String setText; + string setText; setText = mainView.FocusedItem.Text; if (setText == "") { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs index bf0cb16..2453abc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -155,7 +155,7 @@ namespace TimeHACK.OS.Win95.Win95Apps void SetSelectedTextFont(string font) { - // The next two lines convert a String to a Font + // The next two lines convert a string to a Font var cvt = new FontConverter(); Font f = cvt.ConvertFromString(font) as Font; @@ -164,7 +164,7 @@ namespace TimeHACK.OS.Win95.Win95Apps void SetSelectedTextSize(string size) { - // The next few lines will ATTEMPT to convert a String to an Integer + // The next few lines will ATTEMPT to convert a string to an Integer int SizeInt = Convert.ToInt32(size); mainText.SelectionFont = new Font(mainText.SelectionFont.FontFamily, SizeInt, mainText.SelectionFont.Style); diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index a249ba3..d65a9ed 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -261,7 +261,7 @@ namespace TimeHACK.OS.Win98 private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text, Image erroricon)!", Properties.Resources.Win95Info); + WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(string title, string text, Image erroricon)!", Properties.Resources.Win95Info); app.BringToFront(); startmenu.Hide(); diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index e2a4be6..3f8d10c 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -51,7 +51,7 @@ namespace TimeHACK //TimeHACK.Engine.GameSave.SaveData MySaveData = new TimeHACK.Engine.GameSave.SaveData() //{ // OS = 60, - // MyStringList = new List + // MystringList = new List // { // "Item1", // "Item2" @@ -69,7 +69,7 @@ namespace TimeHACK Application.Run(title); } - public static String OpenFileExplorerAsDialogAndReturnGivenPath() + public static string OpenFileExplorerAsDialogAndReturnGivenPath() { WinClassicWindowsExplorer we = new WinClassicWindowsExplorer(); diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index bf5c1c6..6cf824c 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -456,9 +456,6 @@ ..\resources\winclassic\winclassicstart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\MS-DOS-logo-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\winclassic\winclassictaskbaritem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -603,4 +600,7 @@ ..\Resources\IE4\start_padamslink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\msdosprompt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/msdosprompt.png b/TimeHACK.Main/Resources/msdosprompt.png new file mode 100644 index 0000000..2f3fe85 Binary files /dev/null and b/TimeHACK.Main/Resources/msdosprompt.png differ diff --git a/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs b/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs index b31bc50..89e875e 100644 --- a/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs +++ b/TimeHACK.Main/SaveDialogs/LoadGameDialog.cs @@ -14,7 +14,7 @@ namespace TimeHACK { public partial class LoadGameDialog : Form { - public Boolean successful = false; + public bool successful = false; public LoadGameDialog() { InitializeComponent(); diff --git a/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs b/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs index 5e1ccf4..10d1a25 100644 --- a/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs +++ b/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs @@ -14,9 +14,9 @@ namespace TimeHACK { public partial class LoadGameProfileItem : UserControl, IMessageFilter { - public Boolean OnceRemoveHeight = false; - public Boolean OnceAddHeight = false; - public Boolean RequestingNewName = false; + public bool OnceRemoveHeight = false; + public bool OnceAddHeight = false; + public bool RequestingNewName = false; public LoadGameProfileItem() { InitializeComponent(); diff --git a/TimeHACK.Main/SaveDialogs/NewGameDialog.cs b/TimeHACK.Main/SaveDialogs/NewGameDialog.cs index 0e6f346..e9af8cb 100644 --- a/TimeHACK.Main/SaveDialogs/NewGameDialog.cs +++ b/TimeHACK.Main/SaveDialogs/NewGameDialog.cs @@ -16,7 +16,7 @@ namespace TimeHACK { public partial class NewGameDialog : Form { - public Boolean Successful = false; + public bool Successful = false; public NewGameDialog() { InitializeComponent(); diff --git a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs index 4ada932..bcd60d1 100644 --- a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs +++ b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs @@ -14,9 +14,9 @@ namespace TimeHACK.SaveDialogs { public partial class SaveFileTroubleShooter : Form { - public String log; + public string log; Save savedata = new Save(); - String json; + string json; public SaveFileTroubleShooter() { InitializeComponent(); @@ -32,7 +32,7 @@ namespace TimeHACK.SaveDialogs BeginScan(); } - void WriteToLog(String toWrite) + void WriteToLog(string toWrite) { log += toWrite + Environment.NewLine; } diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index dca45e5..6533e05 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -471,6 +471,7 @@ + diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 1b7d006..d13fd90 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -31,7 +31,7 @@ namespace TimeHACK // Border stuff - public Boolean max = false; + public bool max = false; public const int WM_NCLBUTTONDOWN = 0xA1; public const int HT_CAPTION = 0x2; -- cgit v1.2.3