fix LOSE-LIFE routine

daelsepara · Aug 25, 2020 · a31cb18 · a31cb18
1 parent 2bde5d1
commit a31cb18
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/gamebook.zil b/src/gamebook.zil
@@ -135,9 +135,9 @@
             <CHECK-VICTORY>
         )>
         <COND (<AND ,CHARACTERS-ENABLED ,RUN-ONCE>
-            <LOSE-MONEY>
-            <GAIN-CODEWORD>
-            <GAIN-ITEM>
+            <LOSE-MONEY .CURRENT-LOC>
+            <GAIN-CODEWORD NONE .CURRENT-LOC>
+            <GAIN-ITEM .CURRENT-LOC>
         )>
         <COND (,CONTINUE-TO-CHOICES
             <SET KEY <PROCESS-STORY>>
@@ -581,8 +581,9 @@
         <SETG CONTINUE-TO-CHOICES F>
     )>>
 
-<ROUTINE GAIN-CODEWORD ("OPT" CODEWORD)    
-    <COND (<NOT .CODEWORD> <SET CODEWORD <GETP ,HERE ,P?CODEWORD>>)>
+<ROUTINE GAIN-CODEWORD ("OPT" CODEWORD LOCATION)
+    <COND (<NOT .LOCATION> <SET LOCATION ,HERE>)>
+    <COND (<NOT .CODEWORD> <SET CODEWORD <GETP .LOCATION ,P?CODEWORD>>)>
     <COND (.CODEWORD
         <CRLF>
         <TELL "[You gained the codeword ">
@@ -630,8 +631,9 @@
 		<PUTP .ITEM ,P?CHARGES .CHARGES>
 	)>>
 
-<ROUTINE GAIN-ITEM ("AUX" ITEM)
-    <SET ITEM <GETP ,HERE ,P?ITEM>>
+<ROUTINE GAIN-ITEM ("OPT" LOCATION "AUX" ITEM)
+    <COND (<NOT .LOCATION> <SET LOCATION ,HERE>)>
+    <SET ITEM <GETP .LOCATION ,P?ITEM>>
     <TAKE-ITEM .ITEM>>
 
 <ROUTINE GAIN-LIFE (POINTS "AUX" DIFF)
@@ -662,8 +664,9 @@
 <ROUTINE GIVE-ITEM (ITEM)
     <REMOVE-ITEM .ITEM "gave">>
 
-<ROUTINE LOSE-MONEY ("AUX" COST)
-    <SET COST <GETP ,HERE ,P?COST>>
+<ROUTINE LOSE-MONEY ("OPT" STORY "AUX" COST)
+    <COND (<NOT .STORY> <SET .STORY ,HERE>)>
+    <SET COST <GETP .STORY ,P?COST>>
     <COND(<G? .COST 0> <CHARGE-MONEY .COST>)>>
 
 <ROUTINE LOSE-ITEM (ITEM)
@@ -678,6 +681,7 @@
     <COND (<L? ,LIFE-POINTS 1>
         <TELL .MSG>
         <SETG CONTINUE-TO-CHOICES F>
+        <PUTP .STORY ,P?DEATH T>
     )(ELSE
         <PUTP .STORY ,P?DEATH F>
         <TELL "You lost " N .DMG " Life Points">