Merge branch 'master' into gh-pages

apps/pcx86/1981/visicalc/README.md

@@ -12,7 +12,7 @@ machines:
         path: /disks/pcx86/dos/ibm/1.00/PCDOS100.json
       B:
         path: /apps/pcx86/1981/visicalc/VISICALC1981.json
-    autoType: 8-10-81\rb:\rvc\r
+    autoType: $date\rb:\rvc\r
 ---
 
 VisiCalc (1981)

apps/pcx86/1985/rogue/README.md

@@ -7,6 +7,7 @@ machines:
     id: ibm5160-rogue
     config: /devices/pcx86/machine/5160/cga/640kb/machine.xml
     state: /apps/pcx86/1985/rogue/state.json
+    resume: 1
 ---
 
 Rogue (1985)

apps/pcx86/README.md

@@ -12,6 +12,8 @@ we've had to create our own "Demo Disks", because copies of the original distrib
 to find, and in some cases (e.g., [Executive Suite](1982/esuite/)), the original disks were copy-protected,
 so we've been forced to use a "cracked" copy of the software instead.
 
+A list of all the software available to PCx86 machines can be found in the [IBM PC Disk Library](/disks/pcx86/).
+
 ### 1981
 
 * [DONKEY.BAS](1981/donkey/)
@@ -40,8 +42,6 @@ so we've been forced to use a "cracked" copy of the software instead.
 
 * [The Dungeons of Moria v5.5](1992/moria/)
 
-A list of all the software available to PCx86 machines can be found in the [IBM PC Disk Library](/disks/pcx86/).
-
 ---
 
 ### Creating IBM PC Application Demos

modules/pcx86/lib/computer.js

@@ -235,7 +235,7 @@ class Computer extends Component {
         }
 
         var sStatePath = null;
-        var sResume = parmsComputer['resume'];
+        var sResume = this.getMachineParm('resume');
         if (sResume !== undefined) {
             /*
              * Decide whether the 'resume' property is a number or the path of a state file to resume.

versions/pcx86/1.35.1/pcx86-uncompiled.js

@@ -74047,7 +74047,7 @@ class Computer extends Component {
         }
 
         var sStatePath = null;
-        var sResume = parmsComputer['resume'];
+        var sResume = this.getMachineParm('resume');
         if (sResume !== undefined) {
             /*
              * Decide whether the 'resume' property is a number or the path of a state file to resume.