diff options
| author | FloppyDiskDrive <ibmpcdos5@gmail.com> | 2017-08-27 15:50:37 -0500 |
|---|---|---|
| committer | FloppyDiskDrive <ibmpcdos5@gmail.com> | 2017-08-27 15:50:37 -0500 |
| commit | 529e5221b7c72a3613eb4aa396d4626a0173c571 (patch) | |
| tree | 6306b7fdc0dbe4b42e27296d5d74e5787fbc8146 /Histacom2/OS/Win95/Win95Apps/Story | |
| parent | 7e7ef43d2f5a046491acb040a63a38b4f91569e2 (diff) | |
| parent | d2006a3cf629c0ac4ec020778604ae490b4981ec (diff) | |
| download | histacom2-529e5221b7c72a3613eb4aa396d4626a0173c571.tar.gz histacom2-529e5221b7c72a3613eb4aa396d4626a0173c571.tar.bz2 histacom2-529e5221b7c72a3613eb4aa396d4626a0173c571.zip | |
Merge remote-tracking branch 'refs/remotes/Histacom2-Devs/master'
Diffstat (limited to 'Histacom2/OS/Win95/Win95Apps/Story')
| -rw-r--r-- | Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs | 5 | ||||
| -rw-r--r-- | Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs index 54716e5..b988092 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs @@ -13,12 +13,11 @@ using Histacom2.Engine.Template; 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 @@ namespace Histacom2.OS.Win95.Win95Apps.Story tmr.Interval = 1; tmr.Tick += new EventHandler(CheckIfSoundFinished); - if (devMode == true) ContinueObjective(); + if (SaveSystem.DevMode) ContinueObjective(); else { soundThread.Start(); diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs index 1dc99da..76b9baf 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs @@ -270,7 +270,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story 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"; |