diff options
| -rw-r--r-- | .vs/TimeHACK/v14/.suo | bin | 131584 -> 131072 bytes | |||
| -rw-r--r-- | TimeHACK.Engine/WCMessageParser.cs | 2 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95.Designer.cs | 1 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95.cs | 8 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs | 3 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 24 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 16 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs | 2 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs | 2 | ||||
| -rw-r--r-- | TimeHACK.Main/TitleScreen.cs | 1 |
10 files changed, 53 insertions, 6 deletions
diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo Binary files differindex 930f2b8..dc49232 100644 --- a/.vs/TimeHACK/v14/.suo +++ b/.vs/TimeHACK/v14/.suo diff --git a/TimeHACK.Engine/WCMessageParser.cs b/TimeHACK.Engine/WCMessageParser.cs index 44c9002..ef7efd0 100644 --- a/TimeHACK.Engine/WCMessageParser.cs +++ b/TimeHACK.Engine/WCMessageParser.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace TimeHACK.Engine { - class WCMessageParser + public class WCMessageParser { public string ParseMessage(string json, int index, string user) { diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 0bacc55..2d58db3 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -322,6 +322,7 @@ this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem"; this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; + this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // // MultimediaToolStripMenuItem // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index f0e9174..260d909 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -4,6 +4,7 @@ using System.IO; using System.Media; using System.Windows.Forms; using TimeHACK.Engine; +using TimeHACK.OS.Win95.Win95Apps; using TimeHACK.WinClassicForms; namespace TimeHACK.OS.Win95 @@ -185,6 +186,13 @@ namespace TimeHACK.OS.Win95 { 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)!"); } + private void WebChatToolStripMenuItem_Click(object sender, EventArgs e) + { + WebChat1998 wc = new WebChat1998(); + Engine.Template.WinClassic app = wm.startWin95(wc, "Web Chat 1998", null, true, true); + app.BringToFront(); + startmenu.Hide(); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index 2b8a48d..b849893 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998)); + this.resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998)); this.Chat = new System.Windows.Forms.Timer(this.components); this.listBox1 = new System.Windows.Forms.ListBox(); this.label1 = new System.Windows.Forms.Label(); @@ -302,5 +302,6 @@ private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; private System.Windows.Forms.Button button4; + private System.ComponentModel.ComponentResourceManager resources; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 8df610f..94179d6 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using TimeHACK.Engine; +using System.Threading; namespace TimeHACK.OS.Win95.Win95Apps { @@ -29,7 +30,28 @@ namespace TimeHACK.OS.Win95.Win95Apps if (txtscreenname.Text == "") { WindowManager wm = new WindowManager(); - wm.startInfobox95("test", "test"); + wm.startInfobox95("Invalid Username", "Your username cannot be blank."); + return; + } + TitleScreen.username = txtscreenname.Text; + login.Hide(); + listBox1.Items.Add(TitleScreen.username); + chatLoop(); + } + + private void chatLoop() + { + WCMessageParser wcmp = new WCMessageParser(); + Thread.Sleep(15000); + for (int i = 0; i < 200; i++) + { + history.Text = wcmp.ParseMessage(resources.GetString("convo"), i, TitleScreen.username); + switch (wcmp.GetSpecial(resources.GetString("convo"), i)) + { + default: + break; + } + Thread.Sleep(wcmp.GetMessageDelay(resources.GetString("convo"), i)); } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index cb2c52a..db61d93 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -148,9 +148,23 @@ { "user": "SkyHigh", "delay": 6000, - "message": "hmm... how about we play a game while we wait for my friend to come", + "message": "hmm... how about we play a game while we wait for my friend to come?", "special": null, "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "alright, go ahead and guess what my name is!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 500, + "message": "ill make 2 buttons pop up, you click the one you want to guess", + "special": "nameguess", + "userchat": true } ] }</value> diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs index 1445e04..1e9affc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { partial class WinClassicIE4 { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs index 2b2fc4e..912fc8f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; using TimeHACK.Engine; -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { public partial class WinClassicIE4 : UserControl { diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 8f3a3aa..4cd9043 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -11,6 +11,7 @@ namespace TimeHACK { public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); public static Windows95 frm95; + public static string username; public TitleScreen() { |
