X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions2.c;h=f208a4978520ef6c44fa76b92685c2ef56ef27d0;hp=698319f4c70fba4e6f0b4cc70388ed4d02997335;hb=43aef9ceb16d0e2821c5ee81ea9d7c2f7ace84bb;hpb=42189d79d7b33d5543688d77fa5e7b209452b8d1

diff --git a/actions2.c b/actions2.c
index 698319f..f208a49 100644
--- a/actions2.c
+++ b/actions2.c
@@ -1,6 +1,4 @@
-#include "misc.h"
-#include "main.h"
-#include "share.h"
+#include "advent.h"
 #include "funcs.h"
 
 /*  Carry an object.  Special cases for bird and cage (if bird in cage, can't
@@ -31,7 +29,7 @@ L9011:	if(FIXED[OBJ] != 0) return(2011);
 	if(!TOTING(BOTTLE))SPK=104;
 	 return(2011);
 L9017:	SPK=92;
-	if(game.holdng >= 7) return(2011);
+	if(HOLDNG >= 7) return(2011);
 	if(OBJ != BIRD || PROP[BIRD] == 1 || -1-PROP[BIRD] == 1) goto L9014;
 	if(PROP[BIRD] == 2) goto L9015;
 	if(!TOTING(CAGE))SPK=27;
@@ -63,7 +61,7 @@ int discard(bool just_do_it) {
 	if(!TOTING(OBJ)) return(2011);
 	if(OBJ != BIRD || !HERE(SNAKE)) goto L9023;
 	RSPEAK(30);
-	if(game.closed) return(19000);
+	if(CLOSED) return(19000);
 	DSTROY(SNAKE);
 /*  SET PROP FOR USE BY TRAVEL OPTIONS */
 	PROP[SNAKE]=1;
@@ -150,7 +148,7 @@ int attack(FILE *input) {
 	if(OBJ > 100) return(8000);
 L9124:	if(OBJ != BIRD) goto L9125;
 	SPK=137;
-	if(game.closed) return(2011);
+	if(CLOSED) return(2011);
 	DSTROY(BIRD);
 	PROP[BIRD]=0;
 	SPK=45;
@@ -163,7 +161,7 @@ L9126:	if(OBJ == 0)SPK=44;
 	if(OBJ == CLAM || OBJ == OYSTER)SPK=150;
 	if(OBJ == SNAKE)SPK=46;
 	if(OBJ == DWARF)SPK=49;
-	if(OBJ == DWARF && game.closed) return(19000);
+	if(OBJ == DWARF && CLOSED) return(19000);
 	if(OBJ == DRAGON)SPK=167;
 	if(OBJ == TROLL)SPK=157;
 	if(OBJ == OGRE)SPK=203;
@@ -233,12 +231,12 @@ int throw(FILE *cmdin) {
 	return(attack(cmdin));
 
 L9172:	SPK=48;
-	if(RAN(7) < game.dflag) goto L9175;
+	if(randrange(7) < DFLAG) goto L9175;
 	DSEEN[I]=false;
 	DLOC[I]=0;
 	SPK=47;
-	game.dkill=game.dkill+1;
-	if(game.dkill == 1)SPK=149;
+	DKILL=DKILL+1;
+	if(DKILL == 1)SPK=149;
 L9175:	RSPEAK(SPK);
 	DROP(AXE,LOC);
 	K=NUL;
@@ -279,7 +277,7 @@ L9212:	if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213;
 	SPK=102;
 	if(OBJ == DRAGON && PROP[DRAGON] != 0)SPK=110;
 	if(OBJ == TROLL)SPK=182;
-	if(OBJ != SNAKE || game.closed || !HERE(BIRD)) return(2011);
+	if(OBJ != SNAKE || CLOSED || !HERE(BIRD)) return(2011);
 	SPK=101;
 	DSTROY(BIRD);
 	PROP[BIRD]=0;
@@ -288,7 +286,7 @@ L9212:	if(OBJ != SNAKE && OBJ != DRAGON && OBJ != TROLL) goto L9213;
 L9213:	if(OBJ != DWARF) goto L9214;
 	if(!HERE(FOOD)) return(2011);
 	SPK=103;
-	game.dflag=game.dflag+2;
+	DFLAG=DFLAG+2;
 	 return(2011);
 
 L9214:	if(OBJ != BEAR) goto L9215;