Because (almost) everything is done in handlers now, merge the action files.

[open-adventure.git] / advent.h

diff --git a/advent.h b/advent.h
index 8b993645e54476ead1c1dda9d93a78e98f9306d4..3f607c7c307e464605dd8cef77a2dfdc5e2ccfd4 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -11,6 +11,7 @@
 #define MAXTRS         79
 #define MAXPARMS       25
 #define INVLIMIT       7
+#define INTRANSITIVE   -1      /* illegal object number */
 
 typedef struct lcg_state
 {
@@ -120,7 +121,7 @@ extern long ATDWRF(long);
 extern long SETBIT(long);
 extern bool TSTBIT(long,int);
 extern long RNDVOC(long,long);
-extern void BUG(long);
+extern void BUG(long) __attribute__((noreturn));
 extern void MAPLIN(FILE *);
 extern void TYPE(void);
 extern void MPINIT(void);
@@ -135,12 +136,6 @@ extern void set_seed(long);
 extern unsigned long get_next_lcg_value(void);
 extern long randrange(long);
 extern void score(long);
-extern int carry(long);
-extern int discard(long, bool);
-extern int attack(FILE *, long, long);
-extern int throw(FILE *, long, long);
-extern int feed(long);
-extern int fill(long);
 
 /*  Statement functions
  *
@@ -189,6 +184,6 @@ extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY, SECT, SIGN, SNAKE,
    STEPS, STICK, STREAM, THROW, TRIDNT, TROLL, TROLL2,
    URN, VASE, VEND, VOLCAN, WATER;
-/* evrything else */
-extern long I, J, K, L, SPK, V1, V2, VRSION, WD1, WD1X, WD2, WD2X;
+/* everything else */
+extern long I, J, K, L, SPK, VRSION, WD1, WD1X, WD2, WD2X;