diff options
| author | Michael Webb <[email protected]> | 2017-08-27 14:21:12 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-08-27 14:21:12 -0500 |
| commit | 850e858d20ac95e8f758ca67ad6002909b8706c6 (patch) | |
| tree | d320aadf9d53ed8288711189ccac1da72191b257 /Histacom2/OS/Win95/Win95Apps/Story | |
| parent | abfa46d41ef2b477f2a246fe1fdd9bae01165c0c (diff) | |
| parent | da23c51567cf9fd751cf97e7acb1ee6693a0f031 (diff) | |
| download | histacom2-850e858d20ac95e8f758ca67ad6002909b8706c6.tar.gz histacom2-850e858d20ac95e8f758ca67ad6002909b8706c6.tar.bz2 histacom2-850e858d20ac95e8f758ca67ad6002909b8706c6.zip | |
Merge pull request #1 from Histacom2-Devs/master
Merge latest changes from histacom repo
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"; |