diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-11-04 09:50:43 +0000 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-11-04 09:50:43 +0000 |
| commit | f933ce9b841a5f302066336877f86119de034eb4 (patch) | |
| tree | 50e23551bae5ade3a263d9c1c054fb326a7ab5a6 /Histacom2/OS/Win95/Win95Apps/Story | |
| parent | 6ab1468786f1e865e9ff408d32149f9c9620d844 (diff) | |
| parent | 382f0167714bbcad00ab710fe7dcfa05eaeb88ac (diff) | |
| download | histacom2-f933ce9b841a5f302066336877f86119de034eb4.tar.gz histacom2-f933ce9b841a5f302066336877f86119de034eb4.tar.bz2 histacom2-f933ce9b841a5f302066336877f86119de034eb4.zip | |
Updated my fork!
Conflicts:
Histacom2/TitleScreen.Designer.cs
Histacom2/TitleScreen.cs
Diffstat (limited to 'Histacom2/OS/Win95/Win95Apps/Story')
| -rw-r--r-- | Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs | 1 | ||||
| -rw-r--r-- | Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs index 7cf9dd4..a918cda 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/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs index 77f63b5..9dcebfc 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs @@ -10,6 +10,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story { public class Hack2 : object { + public static bool Upgraded = false; static WindowManager wm = new WindowManager(); public static async void StartObjective() @@ -80,7 +81,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story await Task.Delay(2500); Console.WriteLine("Command> Show Start Button"); TitleScreen.frm95.startbutton.Show(); - TitleScreen.frm95.desktopicons.BackgroundImage = null; + if (SaveSystem.currentTheme.defaultWallpaper != null) TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(SaveSystem.currentTheme.defaultWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height); await Task.Delay(2900); Console.WriteLine("12padams> OKAY, NOW YOU'VE DONE IT!"); await Task.Delay(2500); @@ -273,6 +274,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story SaveSystem.CurrentSave.CurrentOS = "98"; SaveSystem.currentTheme = new Default98Theme(); SaveSystem.CurrentSave.ThemeName = "default98"; + Upgraded = true; TitleScreen.frm95.distort.ParentForm.Close(); foreach (Form frm in Application.OpenForms) if (frm is WinClassic) frm.Close(); Program.title.StartGame(); |