diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-08-27 17:38:37 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-08-27 17:38:37 +0100 |
| commit | 579ed261e4b035449ca838b9d852ae602a9b76bf (patch) | |
| tree | 87066515fd61a265e12743f9c2ebaa2c806f51fe /Histacom2/OS/Win95/Win95Apps/Story | |
| parent | 15b5a609e1a60035b74aebfc70fafd8e118e4c3a (diff) | |
| parent | d5d50c6c205b505ea6f4dcae90b3797ed6c180f7 (diff) | |
| download | histacom2-579ed261e4b035449ca838b9d852ae602a9b76bf.tar.gz histacom2-579ed261e4b035449ca838b9d852ae602a9b76bf.tar.bz2 histacom2-579ed261e4b035449ca838b9d852ae602a9b76bf.zip | |
Updated my fork!
Conflicts:
Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
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"; |