From 7e54d42ed67bf8417a4a479dedce65217adc8309 Mon Sep 17 00:00:00 2001 From: lempamo Date: Mon, 28 Aug 2017 00:30:06 -0400 Subject: [PATCH] made 95 windows close when travelling to 1999 --- Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs | 1 + Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 6 ++++-- Histacom2/TitleScreen.cs | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs index 76b9baf..b72c576 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs @@ -275,6 +275,7 @@ public static async void StartObjective() SaveSystem.currentTheme = new Default98Theme(); SaveSystem.CurrentSave.ThemeName = "default98"; TitleScreen.frm95.distort.ParentForm.Close(); + foreach (Form frm in Application.OpenForms) if (frm is WinClassic) frm.Close(); Program.title.StartGame(); TitleScreen.frm95.Close(); return; diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index 07f9e57..d7a10a8 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -53,6 +53,8 @@ void WinClassicWindowsExplorer_Load(object sender, EventArgs e) mainView.LargeImageList = new ImageList(); mainView.LargeImageList.ImageSize = new Size(32, 32); + // Icons 17, 18, 19 reserved for exclusive apps + mainView.LargeImageList.Images.AddRange(new Bitmap[] { Properties.Resources.Win95Computer, // 0 Properties.Resources.WinClassicFolder, Properties.Resources.WinClassicIE4, @@ -73,7 +75,7 @@ void WinClassicWindowsExplorer_Load(object sender, EventArgs e) Properties.Resources.TimeDistorter1, Properties.Resources.WinClassicGTN, Properties.Resources.WinClassicFTP, - Properties.Resources.WinClassicRtfFile}); + Properties.Resources.WinClassicRtfFile}); //20 program.BringToFront(); @@ -992,7 +994,7 @@ private void TextDocumentToolStripMenuItem_Click(object sender, EventArgs e) if (File.Exists(CurrentDirectory + "\\New Text Document.txt")) { //wm.StartInfobox95("Windows Explorer", "This directory already exists", Properties.Resources.Win95Info); - //TODO: add making "New Folder (2)" + //TODO: add making "New Text Document (2)" } else { diff --git a/Histacom2/TitleScreen.cs b/Histacom2/TitleScreen.cs index 1cefa9c..851bd19 100644 --- a/Histacom2/TitleScreen.cs +++ b/Histacom2/TitleScreen.cs @@ -55,7 +55,6 @@ public TitleScreen() public void StartGame() { - //TODO: You may want to handle story stuff to decide what OS to boot here. if (Convert.ToInt32(VM_Width.Text) == 1337 && Convert.ToInt32(VM_Height.Text) == 1337) leet(); else {