Changes to make code more compliant with VA SAC

XINDEX complained about 2nd lines and use of the variable U I've also added a few comments and fixed some typos. Since I'm a generating an ADVINDEX.lis using my modified copy of XINDEX, I'm also including it in this project.
whitten · Mar 25, 2016 · 1b8d3d7 · 1b8d3d7
1 parent 30eb83e
commit 1b8d3d7
Show file tree

Hide file tree

Showing 30 changed files with 2,015 additions and 794 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,17 +1,17 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/.gitignore b/.gitignore
@@ -1,47 +1,47 @@
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# =========================
-# Operating System Files
-# =========================
-
-# OSX
-# =========================
-
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
diff --git a/ADV.m b/ADV.m
@@ -1,48 +1,56 @@
-ADV	;ADVENTURE V1.0.  FLH ; 07 FEB 83  3:37 PM
-	;DNL;20May89 13:00;Copyright (c) 1989 PRx, Inc.
-	;K  S:$ZS<6 $ZS=6 S $ZE="ERR1" S GAVEUP=0,S=1
-	S GAME=$P(XID,"^",2),NAME=XID("USER")
-	;NEW (GAME,NAME)
-	I $ZVER["DSM-11" BREAK 2
-	S $ZT="ERR1" S GAVEUP=0,S=1
-	S Q=65,Y=54,N=201 D YES I  D OLDNAM I  D GETGAM I 1
-	E  D NEWNAM,GCOPY,GETGAM
-	S $ZT="ERR^ADV",Q=208,Y=1,N=0 D YES I  I 'HINTED(3) S HINTED(3)=1,LIMIT=LIMIT+670
-	G ^ADV2
-ENDGAM	I '(SAVED&GAVEUP) K ^ADVG(G)
-	E  D PUTGAM
-	S $ZE="ERR1",G="" F Z=0:0 S G=$O(^ADVG(G)) Q:G=""  I $H-10>^(G) K ^(G)
-	S $ZE="" Q
-TIMO	S GAVEUP=1 D ENDGAM H
-	;
-ERR	I $ZE?1"<INRPT".E S $ZE="ERR^ADV",RET="TURN^ADV3" D @$P(^ADV("QUIT"),"/",3) G @RET
-ERR1	D ^%ET Q
-OLDNAM	S M=205 D SPK
-OL1	D GETIN I U1="?"!(U1="HELP") D LIST G OLDNAM
-	I W'?1.5AN S M=203 D SPK G OL1
-	Q:U1="NEW"  S G=U1 I $D(^ADVG(G)) S M=207 D SPK Q
-	S M=206 D SPK G OLDNAM
-LIST	W !! S G="" F X=0:8 S G=$O(^ADVG(G)) Q:G=""  W ?X,G I X>70 W ! S X=0
-	Q
-NEWNAM	S M=202 D SPK
-NE1	D GETIN S G=U1,M=$S(W'?1.5AN:203,G="NEW":210,$D(^ADVG(G)):204,1:207) D SPK G:M-207 NE1 S ^ADVG(G)=$H Q
-GCOPY	F L=1:1:140 S ^ADVG(G,L,"A")=0,^("O")="/"
-	S N=0,F(N)="^ADV(""i"",",T(N)="^ADVG(G,",X=$H D COP K D,F,IN,N,OUT,T,U,X Q
-COP	S U(N)="",IN(N)=F(N)_"U(N))",OUT(N)=T(N)_"U(N))"
-CO1	S U(N)=$O(@IN(N)) I U(N)="" Q
-	S D=$D(@IN(N)) I D#2 S @OUT(N)=@IN(N) I X'=$H S X=$H W "."
-	I D>9 S F(N+1)=F(N)_""""_U(N)_""",",T(N+1)=T(N)_""""_U(N)_""",",N=N+1 D COP S N=N-1
-	G CO1
-GETGAM	S X="" F Z=0:0 S X=$O(^ADVG(G,"i",X)) Q:X=""  S @X=^(X)
-	Q
-PUTGAM	S X="" F Z=0:0 S X=$O(^ADVG(G,"i",X)) Q:X=""  S ^(X)=@X
-	W !!,"This adventure saved with name ",G,"." Q
-GETIN	D KBD S W1=$P(W," ",1),W2=$P(W," ",2),U1=$E($P(U," ",1),1,5),U2=$E($P(U," ",2),1,5) K U Q
-YES	S M=Q D SPK,KBD I U?1"Y".1"ES" S M=Y D:M SPK
-	E  I U'?1"N".1"O" W "   Please answer the question." G YES
-	E  S M=N D:M SPK
-	K M Q
-KBD	W:S ! R !,W:600 G:'$T TIMO^ADV S U=W F I=1:1 Q:U?.CNPU  I $E(U,I)?1L S U=$E(U,1,I-1)_$C($A(U,I)-32)_$E(U,I+1,99)
-	K I Q
-SPK	W:S ! F I=1:1:^ADV("t",M,0) W !,^(I)
-	K I Q
+ADV	;ADVENTURE V1.0.  FLH. DJW/WV ; 07 FEB 83  3:37 PM
+	;;1.0;C1GAMES;****;March 1, 2016
+	;DNL;20May89 13:00;Copyright (c) 1989 PRx, Inc.
+	;ADVENTURE V1.0.  FLH ; 07 FEB 83  3:37 PM
+	;
+	;K  S:$ZS<6 $ZS=6 S $ZE="ERR1" S GAVEUP=0,S=1
+	S GAME=$P(XID,"^",2),NAME=XID("USER")
+	;NEW (GAME,NAME)
+	; CTRL-C allowed during debugging- change IF to disallow
+	I 1 X ^%ZOSF("BRK")
+	I 0 X ^%ZOSF("NBRK")
+	S X="^ERR1" X ^%ZOSF("TRAP")
+	S GAVEUP=0,S=1
+	S Q=65,Y=54,N=201 D YES I  D OLDNAM I  D GETGAM I 1
+	E  D NEWNAM,GCOPY,GETGAM
+	S X="ERR^ADV" X ^%ZOSF("TRAP")
+	S Q=208,Y=1,N=0 D YES I  I 'HINTED(3) S HINTED(3)=1,LIMIT=LIMIT+670
+	G ^ADV2
+ENDGAM	I '(SAVED&GAVEUP) K ^ADVG(G)
+	E  D PUTGAM
+	S X="^ERR1" X ^%ZOSF("TRAP") S G="" F Z=0:0 S G=$O(^ADVG(G)) Q:G=""  I $H-10>^(G) K ^(G)
+	S X="^%ZTER" X ^%ZOSF("TRAP") Q
+TIMO	S GAVEUP=1 D ENDGAM G ^XUSCLEAN
+	;
+	; no Standard ANSI M way to detect CONTROL-C
+ERR	;I $ZE?1"<INRPT".E S $ZE="ERR^ADV",RET="TURN^ADV3" D @$P(^ADV("QUIT"),"/",3) G @RET
+ERR1	D ^%ZTER Q
+OLDNAM	S M=205 D SPK
+OL1	D GETIN I U1="?"!(U1="HELP") D LIST G OLDNAM
+	I W'?1.5AN S M=203 D SPK G OL1
+	Q:U1="NEW"  S G=U1 I $D(^ADVG(G)) S M=207 D SPK Q
+	S M=206 D SPK G OLDNAM
+LIST	W !! S G="" F X=0:8 S G=$O(^ADVG(G)) Q:G=""  W ?X,G I X>70 W ! S X=0
+	Q
+NEWNAM	S M=202 D SPK
+NE1	D GETIN S G=U1,M=$S(W'?1.5AN:203,G="NEW":210,$D(^ADVG(G)):204,1:207) D SPK G:M-207 NE1 S ^ADVG(G)=$H Q
+GCOPY	F L=1:1:140 S ^ADVG(G,L,"A")=0,^("O")="/"
+	S N=0,F(N)="^ADV(""i"",",T(N)="^ADVG(G,",X=$H D COP K D,F,IN,N,OUT,T,SAVE,X Q
+COP	S SAVE(N)="",IN(N)=F(N)_"SAVE(N))",OUT(N)=T(N)_"SAVE(N))"
+CO1	S SAVE(N)=$O(@IN(N)) I SAVE(N)="" Q
+	S D=$D(@IN(N)) I D#2 S @OUT(N)=@IN(N) I X'=$H S X=$H W "."
+	I D>9 S F(N+1)=F(N)_""""_SAVE(N)_""",",T(N+1)=T(N)_""""_SAVE(N)_""",",N=N+1 D COP S N=N-1
+	G CO1
+GETGAM	S X="" F Z=0:0 S X=$O(^ADVG(G,"i",X)) Q:X=""  S @X=^(X)
+	Q
+PUTGAM	S X="" F Z=0:0 S X=$O(^ADVG(G,"i",X)) Q:X=""  S ^(X)=@X
+	W !!,"This adventure saved with name ",G,"." Q
+GETIN	D KBD S W1=$P(W," ",1),W2=$P(W," ",2),U1=$E($P(SAVE," ",1),1,5),U2=$E($P(SAVE," ",2),1,5) K SAVE Q
+YES	S M=Q D SPK,KBD I SAVE?1"Y".1"ES" S M=Y D:M SPK
+	E  I SAVE'?1"N".1"O" W "   Please answer the question." G YES
+	E  S M=N D:M SPK
+	K M Q
+KBD	W:S ! R !,W:600 G:'$T TIMO^ADV S SAVE=W F I=1:1 Q:SAVE?.CNPU  I $E(SAVE,I)?1L S SAVE=$E(SAVE,1,I-1)_$C($A(SAVE,I)-32)_$E(SAVE,I+1,99)
+	K I Q
+SPK	W:S ! F I=1:1:^ADV("t",M,0) W !,^(I)
+	K I Q
diff --git a/ADV2.m b/ADV2.m
@@ -1,4 +1,7 @@
-ADV2	;ADVENTURE.  FLH ; 07 FEB 83  12:39 PM
+ADV2	;ADVENTURE.  FLH, DJW/WV ; 07 FEB 83  12:39 PM
+	;;1.0;C1GAMES;****;March 1, 2016
+	;FLH ; 07 FEB 83  12:39 PM
+	; DJW/WV ;March 1, 2016
 NEWLP	I CLOSNG,LNEW,LNEW<9 S LNEW=LP,M=130 D SPK S:'PANIC CLK2=15,PANIC=1
 	S CONDLP=^ADV(LP,"c") I LNEW-LP,$E(CONDLP,1,2)="00" F DW=1:1:5 I DSEEN(DW),LD1(DW)=LNEW S LNEW=LP,M=2 D SPK Q
 	S LP=LNEW I LP S CONDLP=^ADV(LP,"c") I $E(CONDLP,1,2)="00" D @$S(DFLAG=0:"DW1",DFLAG=1:"DW2",1:"DW3")

diff --git a/ADV3.m b/ADV3.m
@@ -1,5 +1,8 @@
-ADV3	;ADVENTURE.  FLH ; 27 JAN 83  12:32 PM
+ADV3	;ADVENTURE.  FLH, DJW/WV ; 27 JAN 83  12:32 PM
+	;;1.0;C1GAMES;****;March 1, 2016
+	;ADVENTURE. FLH ; 27 JAN 83  12:32 PM
 	;PRX;24Apr89 18:52;Copyright (c) 1989 PRx, Inc.
+	; DJW/WV ;March 1, 2016
 TURN	S (VERB,OBJ)="" D:M SPK
 TU1	F J=4:1:9 I 'HINTED(J) S HINTLC(J)=$S($E(CONDLP,5)=J:HINTLC(J)+1,1:0) I HINTLC(J)'<HINTH(J) D HINT^ADV9
 	I CLOSED,TOTING["/OYSTE/" S O="OYSTE",P=1 I ^ADVG(G,O,"P")<0 D PSPK
@@ -43,10 +46,10 @@ OBJECT	S (O,OBJ)=WD1 D HERE E  I ^ADVG(G,O,"F")-LP G OBJ2
 AVQ	Q
 SPEC	S M=$E(WD1X,2,99) G TURN
 GETIN	D KBD
-	S W1=$P(W," ",1),W2=$P(W," ",2),U1=$E($P(U," ",1),1,5),U2=$E($P(U," ",2),1,5) K U Q
+	S W1=$P(W," ",1),W2=$P(W," ",2),U1=$E($P(SAVE," ",1),1,5),U2=$E($P(SAVE," ",2),1,5) K SAVE Q
 KBD	W:S ! R !,W:600 G:'$T TIMO^ADV
 	I W="^"!(W="^Q") S W="QUIT" ;MSM;24Apr89
-	S U=W F I=1:1 Q:U?.CNPU  I $E(U,I)?1L S U=$E(U,1,I-1)_$C($A(U,I)-32)_$E(U,I+1,99)
+	S SAVE=W F I=1:1 Q:SAVE?.CNPU  I $E(SAVE,I)?1L S SAVE=$E(SAVE,1,I-1)_$C($A(SAVE,I)-32)_$E(SAVE,I+1,99)
 	K I Q
 SPK	W:S ! F I=1:1:^ADV("t",M,0) W !,^(I)
 	K I Q

diff --git a/ADV4.m b/ADV4.m
@@ -1,4 +1,7 @@
-ADV4	;ADVENTURE.  FLH ; 04 FEB 83  4:30 AM
+ADV4	;ADVENTURE.  FLH, DJW/WV ; 04 FEB 83  4:30 AM
+	;;1.0;C1GAMES;****;March 1, 2016
+	;ADVENTURE. FLH ; 04 FEB 83  4:30 AM
+	; DJW/WV ;March 1, 2016
 AVC	I OBJ="DWARF",CLOSED S M=199 D SPK G RUCKUS
 	Q
 AVD	S I=TOTING[("/"_OBJ_"/") I OBJ="ROD",'I,TOTING["/ROD2/" S OBJ="ROD2",I=1

diff --git a/ADV5.m b/ADV5.m
@@ -1,4 +1,7 @@
-ADV5	;ADVENTURE.  FLH ; 24 JAN 83  12:58 PM
+ADV5	;ADVENTURE.  FLH, DJW/WV ; 24 JAN 83  12:58 PM
+	;;1.0;C1GAMES;****;March 1, 2016
+	;ADVENTURE. FLH ; 04 FEB 83  4:30 AM
+	; DJW/WV ;March 1, 2016
 AV0	W:S ! W !,"I don't understand ",W1,"." S OBJ="",RET="TU1" Q
 AVA	S J=0 I DFLAG>1 F DW=1:1:5 I LD(DW)=LP S J=1,OBJ="DWARF" Q
 	S O="SNAKE" D HERE,AVAJ
@@ -45,12 +48,12 @@
 	Q
 AVR	S:OBJ'="LAMP" M=76 Q
 AVU	S Q=22,(Y,N)=54 D YES S:$T RET="SCORE^ADV8" S GAVEUP=$T,M=0 Q
-GETIN	D KBD S W1=$P(W," ",1),W2=$P(W," ",2),U1=$E($P(U," ",1),1,5),U2=$E($P(U," ",2),1,5) K U Q
-YES	S M=Q D SPK,KBD I U?1"Y".1"ES" S M=Y D:M SPK
-	E  I U'?1"N".1"O" W "   Please answer the question." G YES
+GETIN	D KBD S W1=$P(W," ",1),W2=$P(W," ",2),U1=$E($P(SAVE," ",1),1,5),U2=$E($P(SAVE," ",2),1,5) K SAVE Q
+YES	S M=Q D SPK,KBD I SAVE?1"Y".1"ES" S M=Y D:M SPK
+	E  I SAVE'?1"N".1"O" W "   Please answer the question." G YES
 	E  S M=N D:M SPK
 	K M Q
-KBD	W:S ! R !,W:600 G:'$T TIMO^ADV S U=W F I=1:1 Q:U?.CNPU  I $E(U,I)?1L S U=$E(U,1,I-1)_$C($A(U,I)-32)_$E(U,I+1,99)
+KBD	W:S ! R !,W:600 G:'$T TIMO^ADV S SAVE=W F I=1:1 Q:SAVE?.CNPU  I $E(SAVE,I)?1L S SAVE=$E(SAVE,1,I-1)_$C($A(SAVE,I)-32)_$E(SAVE,I+1,99)
 	K I Q
 SPK	W:S ! F I=1:1:^ADV("t",M,0) W !,^(I)
 	K I Q

diff --git a/ADV6.m b/ADV6.m
@@ -1,4 +1,7 @@
-ADV6	;ADVENTURE.  FLH ; 28 DEC 82  9:53 AM
+ADV6	;ADVENTURE.  FLH, DJW/WV ; 28 DEC 82  9:53 AM
+	;;1.0;C1GAMES;****;March 1, 2016
+	;ADVENTURE.  FLH ; 28 DEC 82  9:53 AM
+	; DJW/WV ;March 1, 2016
 AVB	I CLOSED,^ADVG(G,"ROD2","P")'<0 S O="ROD2" D HERE S @$S($T:"M=135,BONUS=25",LP=115:"M=134,BONUS=30",1:"M=133,BONUS=45"),RET="SCORE^ADV8" D SPK
 	Q
 AVF	S I=$E(CONDLP,4) I OBJ="VASE" S M=$S('I:144,1:29) Q:TOTING'["/VASE/"!'I  S M=145 D SPK S M=0 G AVDV^ADV4
@@ -42,11 +45,11 @@
 AVVJ	D HERE I  S OBJ=O,J=J+1 I J>1
 	Q
 AVZ	S SAVED=1,M=0 D PUTGAM^ADV Q
-YES	S M=Q D SPK,KBD I U?1"Y".1"ES" S M=Y D:M SPK
-	E  I U'?1"N".1"O" W "   Please answer the question." G YES
+YES	S M=Q D SPK,KBD I SAVE?1"Y".1"ES" S M=Y D:M SPK
+	E  I SAVE'?1"N".1"O" W "   Please answer the question." G YES
 	E  S M=N D:M SPK
 	K M Q
-KBD	W:S ! R !,W:600 G:'$T TIMO^ADV S U=W F I=1:1 Q:U?.CNPU  I $E(U,I)?1L S U=$E(U,1,I-1)_$C($A(U,I)-32)_$E(U,I+1,99)
+KBD	W:S ! R !,W:600 G:'$T TIMO^ADV S SAVE=W F I=1:1 Q:SAVE?.CNPU  I $E(SAVE,I)?1L S SAVE=$E(SAVE,1,I-1)_$C($A(SAVE,I)-32)_$E(SAVE,I+1,99)
 	K I Q
 SPK	W:S ! F I=1:1:^ADV("t",M,0) W !,^(I)
 	K I Q

diff --git a/ADV7.m b/ADV7.m
@@ -1,4 +1,7 @@
-ADV7	;ADVENTURE.  FLH ; 24 JAN 83  12:16 PM
+ADV7	;ADVENTURE.  FLH, DJW/WV ; 24 JAN 83  12:16 PM
+	;;1.0;C1GAMES;****;March 1, 2016
+	;FLH ; 24 JAN 83  12:16 PM
+	; DJW/WV ;March 1, 2016
 AVH	S M=209 Q
 AVL	S M=28 F O="CLAM","OYSTE" D HERE I  S OBJ=O
 	F O="DOOR","GRATE" D AT I  S OBJ=O

diff --git a/ADV8.m b/ADV8.m
@@ -1,4 +1,7 @@
-ADV8	;ADVENTURE.  FLH ; 04 FEB 83  4:00 AM
+ADV8	;ADVENTURE.  FLH, DJW/WV ; 04 FEB 83  4:00 AM
+	;;1.0;C1GAMES;****;March 1, 2016
+	;FLH ; 04 FEB 83  4:00 AM
+	; DJW/WV ;March 1, 2016
 CLOSEUP	F O="GRATE","FISSU" S ^ADVG(G,O,"P")=0
 	F O="CHAIN","AXE" S ^ADVG(G,O,"P")=0,^("F")=0
 	F DW=1:1:6 S (DSEEN(DW),LD(DW))=0
@@ -40,11 +43,11 @@ SC1	S (SCORE,MXSCOR)=2
 	;N=25;I CLOSNG;
 	;N=BONUS;I 1;
 	;N=1;I ^ADVG(G,"MAGAZ","L")=108;
-YES	S M=Q D SPK,KBD I U?1"Y".1"ES" S M=Y D:M SPK
-	E  I U'?1"N".1"O" W "   Please answer the question." G YES
+YES	S M=Q D SPK,KBD I SAVE?1"Y".1"ES" S M=Y D:M SPK
+	E  I SAVE'?1"N".1"O" W "   Please answer the question." G YES
 	E  S M=N D:M SPK
 	K M Q
-KBD	W:S ! R !,W:600 G:'$T TIMO^ADV S U=W F I=1:1 Q:U?.CNPU  I $E(U,I)?1L S U=$E(U,1,I-1)_$C($A(U,I)-32)_$E(U,I+1,99)
+KBD	W:S ! R !,W:600 G:'$T TIMO^ADV S SAVE=W F I=1:1 Q:SAVE?.CNPU  I $E(SAVE,I)?1L S SAVE=$E(SAVE,1,I-1)_$C($A(SAVE,I)-32)_$E(SAVE,I+1,99)
 	K I Q
 SPK	W:S ! F I=1:1:^ADV("t",M,0) W !,^(I)
 	K I Q

diff --git a/ADV9.m b/ADV9.m
@@ -1,4 +1,7 @@
-ADV9	;ADVENTURE.  FLH ; 29 DEC 82  8:52 AM
+ADV9	;ADVENTURE.  FLH, DJW/WV ; 29 DEC 82  8:52 AM
+	;;1.0;C1GAMES;****;March 1, 2016
+	;FLH ; 29 DEC 82  8:52 AM
+	; DJW/WV ;March 1, 2016
 HINT	D @("HINT"_J) E  Q:J=5  G HI1
 	S X=^ADV("h",J),P=$P(X,"/",2),Q=$P(X,"/",3),Y=0,N=54 D YES E  Q
 	W:S ! W !,"I am prepared to give you a hint, but it will cost you ",P," points."
@@ -34,11 +37,11 @@ HI1	S HINTLC(J)=0 Q
 TRL	I DETAIL<3 S M=15 D SPK
 	S DETAIL=DETAIL+1,WZDARK=0,^ADVG(G,LP,"A")=0 Q
 TRN	Q
-YES	S M=Q D SPK,KBD I U?1"Y".1"ES" S M=Y D:M SPK
-	E  I U'?1"N".1"O" W "   Please answer the question." G YES
+YES	S M=Q D SPK,KBD I SAVE?1"Y".1"ES" S M=Y D:M SPK
+	E  I SAVE'?1"N".1"O" W "   Please answer the question." G YES
 	E  S M=N D:M SPK
 	K M Q
-KBD	W:S ! R !,W:600 G:'$T TIMO^ADV S U=W F I=1:1 Q:U?.CNPU  I $E(U,I)?1L S U=$E(U,1,I-1)_$C($A(U,I)-32)_$E(U,I+1,99)
+KBD	W:S ! R !,W:600 G:'$T TIMO^ADV S SAVE=W F I=1:1 Q:SAVE?.CNPU  I $E(SAVE,I)?1L S SAVE=$E(SAVE,1,I-1)_$C($A(SAVE,I)-32)_$E(SAVE,I+1,99)
 	K I Q
 SPK	W:S ! F I=1:1:^ADV("t",M,0) W !,^(I)
 	K I Q