aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlempamo <[email protected]>2017-10-30 21:31:56 -0400
committerlempamo <[email protected]>2017-10-30 21:31:56 -0400
commit572da0f8f37a16754aec6f08031862b73826bb00 (patch)
tree3da80072840d8855706f836dbff160d7916a45fb
parentc29dcdaed4c3e224b1f670f9fe7192a6678d3fb3 (diff)
downloadhistacom2-572da0f8f37a16754aec6f08031862b73826bb00.tar.gz
histacom2-572da0f8f37a16754aec6f08031862b73826bb00.tar.bz2
histacom2-572da0f8f37a16754aec6f08031862b73826bb00.zip
webchat is working now
-rw-r--r--Histacom2.Engine/Properties/Resources.resx14
-rw-r--r--Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs1
-rw-r--r--Histacom2/OS/Win95/Win95Apps/WebChat1998.cs12
-rw-r--r--Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs5
-rw-r--r--Histacom2/Properties/Resources.resx7
-rw-r--r--Histacom2/Properties/Resources1.Designer.cs3
6 files changed, 27 insertions, 15 deletions
diff --git a/Histacom2.Engine/Properties/Resources.resx b/Histacom2.Engine/Properties/Resources.resx
index e41840c..e00c4f2 100644
--- a/Histacom2.Engine/Properties/Resources.resx
+++ b/Histacom2.Engine/Properties/Resources.resx
@@ -119,25 +119,25 @@
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="WinClassicBottomLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\winclassic\window\bottomleft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\WinClassic\Window\BottomLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WinClassicBottomRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\winclassic\window\bottomright.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\WinClassic\Window\BottomRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WinClassicBottomSide" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\winclassic\window\bottomside.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\WinClassic\Window\BottomSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WinClassicLeftSide" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\winclassic\window\leftside.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\WinClassic\Window\LeftSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="LeviWindows" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\winclassic\window\leviwindows.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>..\Resources\WinClassic\Window\LeviWindows.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="LeviWindows1" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\winclassic\window\leviwindows.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>..\Resources\WinClassic\Window\LeviWindows.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="nullIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\winclassic\window\nullicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\WinClassic\Window\nullicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WinClassicRightSide" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\winclassic\window\rightside.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
index 41f7c35..2c12029 100644
--- a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -40,6 +40,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
{
WinClassicTerminal Console = new WinClassicTerminal(true);
WinClassic app = wm.Init(Console, "MS-DOS Prompt", null, true, true);
+ TitleScreen.frm95.AddTaskBarItem(app, app.Tag.ToString(), "MS-DOS Prompt", null);
Console.WriteLine("telnet> 104.27.135.159 Connecting...");
await Task.Delay(2500);
diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs b/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs
index c986b23..5956276 100644
--- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs
@@ -70,9 +70,9 @@ namespace Histacom2.OS.Win95.Win95Apps
{
if (!guessing)
{
- if (history.ScrollBars != ScrollBars.None) history.AppendText(wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username));
- else history.Text = wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username);
- switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index))
+ if (history.ScrollBars != ScrollBars.None) history.AppendText(wcmp.ParseMessage(Properties.Resources.webchat1998_convo, chat_index, TitleScreen.username));
+ else history.Text = wcmp.ParseMessage(Properties.Resources.webchat1998_convo, chat_index, TitleScreen.username);
+ switch (wcmp.GetSpecial(Properties.Resources.webchat1998_convo, chat_index))
{
case "addsh":
listBox1.Items.Add("SkyHigh");
@@ -208,8 +208,8 @@ namespace Histacom2.OS.Win95.Win95Apps
if (msgsound) receive.Play();
break;
}
- if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index) / 2;
- else Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index);
+ if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index) / 2;
+ else Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index);
}
else
{
@@ -223,7 +223,7 @@ namespace Histacom2.OS.Win95.Win95Apps
}
guessing = false;
receive.Play();
- Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index);
+ Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index);
}
chat_index++;
}
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index 4502cd1..2542eba 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -292,7 +292,7 @@ namespace Histacom2.OS.Win95.Win95Apps
break;
case "web chat setup":
Win95Installer inst = new Win95Installer("Web Chat 1998");
- inst.InstallCompleted += (sendr, args) => { TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; CurrentSave.installed95[0] = true; };
+ inst.InstallCompleted += (sendr, args) => { TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; CurrentSave.installed95[0] = true; SaveGame(); };
WinClassic appInstaller = wm.Init(inst, "Web Chat Setup", null, true, true);
Program.AddTaskbarItem(appInstaller, appInstaller.Tag.ToString(), "Web Chat Setup", null);
appInstaller.BringToFront();
@@ -307,6 +307,7 @@ namespace Histacom2.OS.Win95.Win95Apps
CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "FTP Client"), "ftpclint.exe", "ftp client", 19, 58395);
TitleScreen.frm95.FTPClientToolStripMenuItem.Visible = true;
CurrentSave.installed95[1] = true;
+ SaveGame();
};
WinClassic appFtp = wm.Init(instFtp, "FTP Client Setup", null, true, true);
Program.AddTaskbarItem(appFtp, appFtp.Tag.ToString(), "FTP Client Setup", null);
@@ -322,6 +323,7 @@ namespace Histacom2.OS.Win95.Win95Apps
CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Time Distorter 0.1"), "tdistort.exe", "time distorter", 17, 23895);
TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true;
CurrentSave.installed95[5] = true;
+ SaveGame();
};
WinClassic appTd = wm.Init(instTd, "Time Distorter Setup", null, true, true);
Program.AddTaskbarItem(appTd, appTd.Tag.ToString(), "Time Distorter Setup", null);
@@ -341,6 +343,7 @@ namespace Histacom2.OS.Win95.Win95Apps
CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Guess The Number V1"), "guessnum.exe", "guess number", 18, 17483);
TitleScreen.frm95.GuessTheNumberToolStripMenuItem.Visible = true;
CurrentSave.installed95[6] = true;
+ SaveGame();
};
WinClassic appGtn = wm.Init(instGtn, "Guess The Number Setup", null, true, true);
Program.AddTaskbarItem(appGtn, appGtn.Tag.ToString(), "Guess The Number Setup", null);
diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx
index a3ef0f7..26ca4e4 100644
--- a/Histacom2/Properties/Resources.resx
+++ b/Histacom2/Properties/Resources.resx
@@ -1755,6 +1755,13 @@
"message": "and let me remind you... MS-DOS IS USELESS! NEXT TIME, DONT PIRATE SOFTWARE!",
"special": null,
"userchat": true
+ },
+ {
+ "user": "12padams",
+ "delay": 5000,
+ "message": "",
+ "special": ".cmd-end",
+ "userchat": false
}
]
}</value>
diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs
index 9167764..2df811c 100644
--- a/Histacom2/Properties/Resources1.Designer.cs
+++ b/Histacom2/Properties/Resources1.Designer.cs
@@ -1148,7 +1148,8 @@ namespace Histacom2.Properties {
/// &quot;userchat&quot;: true
/// },
/// {
- /// [rest of string was truncated]&quot;;.
+ /// &quot;user&quot;: &quot;SkyHigh&quot;,
+ /// [rest of string was truncated]&quot;;.
/// </summary>
public static string webchat1998_convo {
get {