diff options
| author | lempamo <[email protected]> | 2017-03-31 21:32:54 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-03-31 21:32:54 -0400 |
| commit | 3eaa9e1400f086b3bbeb08738aa48a36743c8b10 (patch) | |
| tree | 8512e8f97b3966c2870f854a33e55fd30df78de2 /TimeHACK.Main/OS | |
| parent | a2c51ec4bc6c25a32388fe652bf5d6275df9cb8a (diff) | |
| parent | 6ecb36cc462081895a92ff7fb5b23f3259fc1f1e (diff) | |
| download | histacom2-3eaa9e1400f086b3bbeb08738aa48a36743c8b10.tar.gz histacom2-3eaa9e1400f086b3bbeb08738aa48a36743c8b10.tar.bz2 histacom2-3eaa9e1400f086b3bbeb08738aa48a36743c8b10.zip | |
Merge pull request #23 from lempamo/master
webchat1998 messages are working
Diffstat (limited to 'TimeHACK.Main/OS')
5 files changed, 26 insertions, 16 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index b849893..545a796 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -58,6 +58,7 @@ // Chat // this.Chat.Interval = 15000; + this.Chat.Tick += new System.EventHandler(this.Chat_Tick); // // listBox1 // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 94179d6..fa0837f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -14,6 +14,9 @@ namespace TimeHACK.OS.Win95.Win95Apps { public partial class WebChat1998 : UserControl { + int chat_index = 0; + WCMessageParser wcmp = new WCMessageParser(); + public WebChat1998() { InitializeComponent(); @@ -36,23 +39,30 @@ namespace TimeHACK.OS.Win95.Win95Apps TitleScreen.username = txtscreenname.Text; login.Hide(); listBox1.Items.Add(TitleScreen.username); - chatLoop(); + history.Text = "System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine; + Chat.Start(); } - private void chatLoop() + private void Chat_Tick(object sender, EventArgs e) { - WCMessageParser wcmp = new WCMessageParser(); - Thread.Sleep(15000); - for (int i = 0; i < 200; i++) + history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; + switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) { - 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)); + case "addsh": + listBox1.Items.Add("SkyHigh"); + break; + case "nameguess": + typechat.Hide(); + button2.Hide(); + button3.Show(); + button4.Show(); + Chat.Stop(); + break; + default: + break; } + Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + chat_index++; } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index db61d93..6734aab 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -161,7 +161,7 @@ }, { "user": "SkyHigh", - "delay": 500, + "delay": 1000, "message": "ill make 2 buttons pop up, you click the one you want to guess", "special": "nameguess", "userchat": true diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs index cd0b55c..fd182fa 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { partial class WinClassicDownloader { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs index 9df4811..418444a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs @@ -1,8 +1,7 @@ using System; using System.Windows.Forms; -using TimeHACK.OS.Win95; -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { public partial class WinClassicDownloader : UserControl { |