shiftos-archive/Histacom2
1
0
Fork 0
mirror of https://github.com/HistacomUnity/Histacom2-old.git synced 2025-01-22 09:02:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated my fork!

Browse source 
Conflicts:
	Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
This commit is contained in:
Alex-TIMEHACK 2017-08-27 17:38:37 +01:00
commit 579ed261e4
8 changed files with 52 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Histacom2.Engine/SaveSystem.cs
View file

@ -235,11 +235,23 @@ public static void UpdateDirectoryInfo(string path, THFileInfo newfile)
File.WriteAllText(Path.Combine(path, "_data.info"), toWrite);
}
public static void UpgradeFileSystem(string oldOS, string newOS)
public static void RemoveFileFromDirectory(string path, string filename)
{
switch (oldOS)
FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject<FileSystemFolderInfo>(File.ReadAllText(Path.Combine(path, "_data.info")));
THFileInfo fi = fsfi.Files.Find((THFileInfo f) => { return f.Name == filename; });
if (fi == null) return;
fsfi.ByteSize -= fi.ByteSize;
CurrentSave.BytesLeft += fi.ByteSize;
fsfi.Files.Remove(fi);
string toWrite = JsonConvert.SerializeObject(fsfi, Formatting.Indented);
File.WriteAllText(Path.Combine(path, "_data.info"), toWrite);
}
public static void UpgradeFileSystem(string newOS)
{
case "95":
if (newOS == "98" || newOS == "2000" || newOS == "ME")
{
// We are upgrading from the old WinClassic file System to the new WinClassic filesystem!
@ -264,8 +276,6 @@ public static void UpgradeFileSystem(string oldOS, string newOS)
}
}
}
break;
}
}
public static void SaveDirectoryInfo(string parent, string dirname, bool isProtected, string label, bool allowback)

6
Histacom2/OS/Win95/Win95.Designer.cs generated
View file

@ -218,7 +218,7 @@ private void InitializeComponent()
this.SuspendToolStripMenuItem,
this.ShutdownToolStripMenuItem});
this.startmenuitems.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow;
this.startmenuitems.Location = new System.Drawing.Point(28, 2);
this.startmenuitems.Location = new System.Drawing.Point(26, 2);
this.startmenuitems.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0);
this.startmenuitems.Name = "startmenuitems";
this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0);
@ -930,7 +930,7 @@ private void InitializeComponent()
this.ossidestartmenu.Controls.Add(this.osimage);
this.ossidestartmenu.Location = new System.Drawing.Point(0, 0);
this.ossidestartmenu.Name = "ossidestartmenu";
this.ossidestartmenu.Size = new System.Drawing.Size(26, 297);
this.ossidestartmenu.Size = new System.Drawing.Size(23, 297);
this.ossidestartmenu.TabIndex = 4;
//
// osimage
@ -939,7 +939,7 @@ private void InitializeComponent()
this.osimage.Image = global::Histacom2.Properties.Resources.Win95SideBar;
this.osimage.Location = new System.Drawing.Point(0, 0);
this.osimage.Name = "osimage";
this.osimage.Size = new System.Drawing.Size(26, 297);
this.osimage.Size = new System.Drawing.Size(23, 297);
this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.osimage.TabIndex = 0;
this.osimage.TabStop = false;

2
Histacom2/OS/Win95/Win95.resx
View file

@ -374,7 +374,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO
hAAAAk1TRnQBSQFMAgEBDQEAATQBAgE0AQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
hAAAAk1TRnQBSQFMAgEBDQEAAUQBAgFEAQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
AwABgAMAAQEBAAEgBwABASQAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH//wChAAOAAf8DwAH/
A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/

5
Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs
View file

@ -13,12 +13,11 @@
namespace Histacom2.OS.Win95.Win95Apps.Story
{
static class Hack1 : Object
static class Hack1 : object
{
static WindowManager wm = new WindowManager();
static bool ended = false;
static Thread soundThread = new Thread(dialup_sound_play);
static bool devMode = true;
// This is the very first story script!
public static void StartObjective()
@ -28,7 +27,7 @@ public static void StartObjective()
tmr.Interval = 1;
tmr.Tick += new EventHandler(CheckIfSoundFinished);
if (devMode == true) ContinueObjective();
if (SaveSystem.DevMode) ContinueObjective();
else
{
soundThread.Start();

2
Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
View file

@ -270,7 +270,7 @@ public static async void StartObjective()
await Task.Delay(2000);
sp.Stop();
SaveSystem.UpgradeFileSystem("95", "98");
SaveSystem.UpgradeFileSystem("98");
SaveSystem.CurrentSave.CurrentOS = "98";
SaveSystem.currentTheme = new Default98Theme();
SaveSystem.CurrentSave.ThemeName = "default98";

10
Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs generated
View file

@ -108,7 +108,7 @@ private void InitializeComponent()
//
// MenuStrip1
//
this.MenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
this.MenuStrip1.BackColor = System.Drawing.Color.Silver;
this.MenuStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.MenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileToolStripMenuItem,
@ -139,7 +139,7 @@ private void InitializeComponent()
this.TextDocumentToolStripMenuItem,
this.BitmapImageToolStripMenuItem});
this.CreateShortcutToolStripMenuItem.Name = "CreateShortcutToolStripMenuItem";
this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.CreateShortcutToolStripMenuItem.Text = "New";
//
// FolderToolStripMenuItem
@ -149,6 +149,12 @@ private void InitializeComponent()
this.FolderToolStripMenuItem.Text = "Folder";
this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click);
//
// ShortcutToolStripMenuItem
//
this.ShortcutToolStripMenuItem.Name = "ShortcutToolStripMenuItem";
this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.ShortcutToolStripMenuItem.Text = "Shortcut";
//
// TextDocumentToolStripMenuItem
//
this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem";

2
Histacom2/OS/Win98/Win98.cs
View file

@ -71,7 +71,7 @@ private void MenuItem_MouseLeave(object sender, EventArgs e)
// When New Game is clicked in TitleScreen.cs
private void Desktop_Load(object sender, EventArgs e)
{
UpgradeFileSystem("95", "98");
UpgradeFileSystem( "98");
if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height);
//Start Menu Color - Commented until it works reliably

BIN
Histacom2/Resources/WinClassic/Win95SideBar.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 835 B

After

Width:  |  Height:  |  Size: 843 B