X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions2.c;h=75179dc47bb0220696a30f5c7f49d144eea61b47;hb=9a285402da180c0d33ed71d4c0aeb6a9a17b330b;hp=98be045e69fa43f0276adde697bc3e5dad3e5002;hpb=24d7aeaf8a1dc13034884044139728045604fc37;p=open-adventure.git

diff --git a/actions2.c b/actions2.c
index 98be045..75179dc 100644
--- a/actions2.c
+++ b/actions2.c
@@ -3,14 +3,11 @@
 #include "share.h"
 #include "funcs.h"
 
-#define TRUE  (0==0)
-#define FALSE (0!=0)
-
 /*  CARRY AN OBJECT.  SPECIAL CASES FOR BIRD AND CAGE (IF BIRD IN CAGE, CAN'T
  *  TAKE ONE WITHOUT THE OTHER).  LIQUIDS ALSO SPECIAL, SINCE THEY DEPEND ON
  *  STATUS OF BOTTLE.  ALSO VARIOUS SIDE EFFECTS, ETC. */
 
-carry() {
+int carry(void) {
 	if(TOTING(OBJ)) return(2011);
 	SPK=25;
 	if(OBJ == PLANT && PROP[PLANT] <= 0)SPK=115;
@@ -60,7 +57,7 @@ L9015:	SPK=238;
  *  BIRD (MIGHT ATTACK SNAKE OR DRAGON) AND CAGE (MIGHT CONTAIN BIRD) AND VASE.
  *  DROP COINS AT VENDING MACHINE FOR EXTRA BATTERIES. */
 
-discard(just_do_it)long just_do_it; {
+int discard(bool just_do_it) {
 	if(just_do_it) goto L9021;
 	if(TOTING(ROD2) && OBJ == ROD && !TOTING(ROD))OBJ=ROD2;
 	if(!TOTING(OBJ)) return(2011);
@@ -134,7 +131,7 @@ L9028:	PROP[VASE]=2;
  *  OBJECTS FALL INTO TWO CATEGORIES: ENEMIES (SNAKE, DWARF, ETC.)  AND OTHERS
  *  (BIRD, CLAM, MACHINE).  AMBIGUOUS IF 2 ENEMIES, OR NO ENEMIES BUT 2 OTHERS. */
 
-attack() {
+int attack() {
 	I=ATDWRF(LOC);
 	if(OBJ != 0) goto L9124;
 	if(I > 0)OBJ=DWARF;
@@ -206,7 +203,7 @@ L9128:	RSPEAK(SPK);
 	if(DLOC[I] != LOC) goto L9129;
 	K=K+1;
 	DLOC[I]=61;
-	DSEEN[I]=FALSE;
+	DSEEN[I]=false;
 L9129:	/*etc*/ ;
 	} /* end loop */
 	SPK=SPK+1+1/K;
@@ -217,12 +214,12 @@ L9129:	/*etc*/ ;
  *  AND IF DWARF IS PRESENT THEN ONE MIGHT BE KILLED.  (ONLY WAY TO DO SO!)
  *  AXE ALSO SPECIAL FOR DRAGON, BEAR, AND TROLL.  TREASURES SPECIAL FOR TROLL. */
 
-throw() {
+int throw() {
 	if(TOTING(ROD2) && OBJ == ROD && !TOTING(ROD))OBJ=ROD2;
 	if(!TOTING(OBJ)) return(2011);
 	if(OBJ >= 50 && OBJ <= MAXTRS && AT(TROLL)) goto L9178;
 	if(OBJ == FOOD && HERE(BEAR)) goto L9177;
-	if(OBJ != AXE) return(discard(FALSE));
+	if(OBJ != AXE) return(discard(false));
 	I=ATDWRF(LOC);
 	if(I > 0) goto L9172;
 	SPK=152;
@@ -237,7 +234,7 @@ throw() {
 
 L9172:	SPK=48;
 	if(RAN(7) < DFLAG) goto L9175;
-	DSEEN[I]=FALSE;
+	DSEEN[I]=false;
 	DLOC[I]=0;
 	SPK=47;
 	DKILL=DKILL+1;
@@ -273,7 +270,7 @@ L9178:	SPK=159;
 /*  FEED.  IF BIRD, NO SEED.  SNAKE, DRAGON, TROLL: QUIP.  IF DWARF, MAKE HIM
  *  MAD.  BEAR, SPECIAL. */
 
-feed() {
+int feed() {
 	if(OBJ != BIRD) goto L9212;
 	SPK=100;
 	 return(2011);
@@ -315,7 +312,7 @@ L9216:	SPK=14;
 
 /*  FILL.  BOTTLE OR URN MUST BE EMPTY, AND LIQUID AVAILABLE.  (VASE IS NASTY.) */
 
-fill() {
+int fill() {
 	if(OBJ == VASE) goto L9222;
 	if(OBJ == URN) goto L9224;
 	if(OBJ != 0 && OBJ != BOTTLE) return(2011);
@@ -337,7 +334,7 @@ L9222:	SPK=29;
 	RSPEAK(145);
 	PROP[VASE]=2;
 	FIXED[VASE]= -1;
-	 return(discard(TRUE));
+	 return(discard(true));
 
 L9224:	SPK=213;
 	if(PROP[URN] != 0) return(2011);