X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=advent.h;h=ffde43c4f450b93959399434e95bdae5631d2151;hb=851f90cdf7c2ef627a8a14caa4cdaad644c7b60b;hp=3802c83f5799baff57f35caf092b9071888cb030;hpb=a57d93ce35ccdea6fa4f260bf004d6f8f9924b2f;p=open-adventure.git

diff --git a/advent.h b/advent.h
index 3802c83..ffde43c 100644
--- a/advent.h
+++ b/advent.h
@@ -94,7 +94,6 @@ extern long GETTXT(bool,bool,bool);
 extern token_t MAKEWD(long);
 extern void TYPE0(void);
 extern long VOCAB(long,long);
-extern void DSTROY(long);
 extern void JUGGLE(long);
 extern void MOVE(long,long);
 extern long PUT(long,long,long);
@@ -115,7 +114,8 @@ extern void set_seed(long);
 extern unsigned long get_next_lcg_value(void);
 extern long randrange(long);
 extern void score(enum termination);
-extern int saveresume(FILE *, bool);
+extern int suspend(FILE *);
+extern int resume(FILE *);
 
 /*
  *  MOD(N,M)	= Arithmetic modulus
@@ -131,6 +131,7 @@ extern int saveresume(FILE *, bool);
  *  PCT(N)      = true N% of the time (N integer from 0 to 100)
  *  TOTING(OBJ) = true if the OBJ is being carried */
 
+#define DESTROY(N)	MOVE(N, NOWHERE)
 #define MOD(N,M)	((N) % (M))
 #define TOTING(OBJ)	(game.place[OBJ] == CARRIED)
 #define AT(OBJ) (game.place[OBJ] == game.loc || game.fixed[OBJ] == game.loc)
@@ -141,7 +142,7 @@ extern int saveresume(FILE *, bool);
 #define CNDBIT(L,N)	(TSTBIT(COND[L],N))
 #define FORCED(LOC)	(COND[LOC] == 2)
 #define DARK(DUMMY)	((!CNDBIT(game.loc,LIGHT)) && (game.prop[LAMP] == 0 || !HERE(LAMP)))
-#define PCT(N)	(randrange(100) < (N))
+#define PCT(N)		(randrange(100) < (N))
 #define GSTONE(OBJ)	((OBJ) == EMRALD || (OBJ) == RUBY || (OBJ) == AMBER || (OBJ) == SAPPH)
 #define FOREST(LOC)	((LOC) >= LOC_FOREST1 && (LOC) <= LOC_FOREST22)
 #define VOCWRD(LETTRS,SECT)	(VOCAB(MAKEWD(LETTRS),SECT))