* enemies, or no enemies but 2 others. */
{
int spk = ACTSPK[verb];
- int i = ATDWRF(game.loc);
+ int d = ATDWRF(game.loc);
if (obj == 0) {
- if (i > 0)
+ if (d > 0)
obj=DWARF;
if (HERE(SNAKE))obj=obj*NOBJECTS+SNAKE;
if (AT(DRAGON) && game.prop[DRAGON] == 0)obj=obj*NOBJECTS+DRAGON;
RSPEAK(spk);
return GO_CLEAROBJ;
}
- DSTROY(BIRD);
+ DESTROY(BIRD);
game.prop[BIRD]=0;
spk=BIRD_DEAD;
}
if (obj == DWARF && game.closed) return GO_DWARFWAKE;
if (obj == DRAGON)spk=ALREADY_DEAD;
if (obj == TROLL)spk=ROCKY_TROLL;
- if (obj == OGRE)spk=OGRE_DOFGE;
- if (obj == OGRE && i > 0) {
+ if (obj == OGRE)spk=OGRE_DODGE;
+ if (obj == OGRE && d > 0) {
RSPEAK(spk);
RSPEAK(KNIFE_THROWN);
- DSTROY(OGRE);
- int k=0;
- for (i=1; i < PIRATE; i++) {
+ DESTROY(OGRE);
+ int dwarves=0;
+ for (int i=1; i < PIRATE; i++) {
if (game.dloc[i] == game.loc) {
- ++k;
- game.dloc[i]=61;
+ ++dwarves;
+ game.dloc[i] = LOC_LONGWEST;
game.dseen[i]=false;
}
}
- spk=spk+1+1/k;
- RSPEAK(spk);
- return GO_CLEAROBJ;
+ spk=spk+1+1/dwarves; /* FIXME: Arithmetic on message numbers */
}
- if (obj == BEAR)spk=BEAR_HANDS+(game.prop[BEAR]+1)/2;
- if (obj != DRAGON || game.prop[DRAGON] != 0) {RSPEAK(spk); return GO_CLEAROBJ;}
- /* Fun stuff for dragon. If he insists on attacking it, win!
- * Set game.prop to dead, move dragon to central loc (still
- * fixed), move rug there (not fixed), and move him there,
- * too. Then do a null motion to get new description. */
- RSPEAK(BARE_HANDS_QUERY);
- GETIN(input,&WD1,&WD1X,&WD2,&WD2X);
- if (WD1 != MAKEWD(25) && WD1 != MAKEWD(250519))
- return GO_CHECKFOO;
- PSPEAK(DRAGON,3);
- game.prop[DRAGON]=1;
- game.prop[RUG]=0;
- int k=(PLAC[DRAGON]+FIXD[DRAGON])/2;
- MOVE(DRAGON+NOBJECTS,-1);
- MOVE(RUG+NOBJECTS,0);
- MOVE(DRAGON,k);
- MOVE(RUG,k);
- DROP(BLOOD,k);
- for (obj=1; obj<=NOBJECTS; obj++) {
- if (game.place[obj] == PLAC[DRAGON] || game.place[obj] == FIXD[DRAGON])
- MOVE(obj,k);
+ else if (obj == BEAR)
+ /* FIXME: Arithmetic on message numbers */
+ spk = BEAR_HANDS+(game.prop[BEAR]+1)/2;
+ else if (obj == DRAGON && game.prop[DRAGON] == 0) {
+ /* Fun stuff for dragon. If he insists on attacking it, win!
+ * Set game.prop to dead, move dragon to central loc (still
+ * fixed), move rug there (not fixed), and move him there,
+ * too. Then do a null motion to get new description. */
+ RSPEAK(BARE_HANDS_QUERY);
+ GETIN(input,&WD1,&WD1X,&WD2,&WD2X);
+ if (WD1 != MAKEWD(25) && WD1 != MAKEWD(250519))
+ return GO_CHECKFOO;
+ PSPEAK(DRAGON,3);
+ game.prop[DRAGON]=1;
+ game.prop[RUG]=0;
+ int k=(PLAC[DRAGON]+FIXD[DRAGON])/2;
+ MOVE(DRAGON+NOBJECTS,-1);
+ MOVE(RUG+NOBJECTS,0);
+ MOVE(DRAGON,k);
+ MOVE(RUG,k);
+ DROP(BLOOD,k);
+ for (obj=1; obj<=NOBJECTS; obj++) {
+ if (game.place[obj] == PLAC[DRAGON] || game.place[obj] == FIXD[DRAGON])
+ MOVE(obj,k);
+ }
+ game.loc=k;
+ return GO_MOVE;
}
- game.loc=k;
- return GO_MOVE;
+
+ RSPEAK(spk);
+ return GO_CLEAROBJ;
}
static int bigwords(long foo)
static int bivalve(token_t verb, token_t obj)
/* Clam/oyster actions */
{
- int spk, k=0;
- if (obj == OYSTER)k=1;
- spk=PEARL_FALLS+k;
- if (TOTING(obj))spk=DROP_CLAM+k;
- if (!TOTING(TRIDNT))spk=CLAM_OPENER+k;
+ int spk;
+ bool is_oyster = (obj == OYSTER);
+ spk= is_oyster ? OYSTER_OPENS : PEARL_FALLS;
+ if (TOTING(obj))spk= is_oyster ? DROP_OYSTER : DROP_CLAM;
+ if (!TOTING(TRIDNT))spk= is_oyster ? OYSTER_OPENER : CLAM_OPENER;
if (verb == LOCK)spk=HUH_MAN;
- if (spk == 124) {
- DSTROY(CLAM);
+ if (spk == PEARL_FALLS) {
+ DESTROY(CLAM);
DROP(OYSTER,game.loc);
- DROP(PEARL,105);
+ DROP(PEARL,LOC_CULDESAC);
}
RSPEAK(spk);
return GO_CLEAROBJ;
return GO_CLEAROBJ;
}
game.bonus=133;
- if (game.loc == 115)
+ if (game.loc == LOC_NE)
game.bonus=134;
if (HERE(ROD2))
game.bonus=135;
RSPEAK(game.bonus);
- score(0);
+ score(endgame);
return GO_CLEAROBJ; /* pacify compiler - we never get here */
}
if (obj == SIGN)spk=HAND_PASSTHROUGH;
if (obj == MESSAG) {
RSPEAK(REMOVE_MESSAGE);
- DSTROY(MESSAG);
+ DESTROY(MESSAG);
return GO_CLEAROBJ;
}
if (game.fixed[obj] != 0) {
}
else if (obj == BIRD && game.prop[BIRD] != 1 && -1-game.prop[BIRD] != 1) {
if (game.prop[BIRD] == 2) {
- DSTROY(BIRD);
+ DESTROY(BIRD);
RSPEAK(BIRD_CRAP);
return GO_CLEAROBJ;
}
if (!TOTING(CAGE))spk=CANNOT_CARRY;
if (TOTING(ROD))spk=BIRD_EVADES;
- if (spk/2 == 13) { /* FIXME: Arithmetic on message number */
+ if (spk == CANNOT_CARRY || spk == BIRD_EVADES) {
RSPEAK(spk);
return GO_CLEAROBJ;
}
CARRY(BIRD+CAGE-obj,game.loc);
CARRY(obj,game.loc);
if (obj == BOTTLE && LIQUID() != 0)
- game.place[LIQUID()] = -1;
+ game.place[LIQUID()] = CARRIED;
if (GSTONE(obj) && game.prop[obj] != 0) {
game.prop[obj]=0;
game.prop[CAVITY]=1;
spk=CHAIN_LOCKED;
if (game.prop[CHAIN] != 0)spk=ALREADY_LOCKED;
if (game.loc != PLAC[CHAIN])spk=NO_LOCKSITE;
- if (spk != CHAIN_LOCKED) {RSPEAK(spk); return GO_CLEAROBJ;}
+ if (spk != CHAIN_LOCKED) {
+ RSPEAK(spk);
+ return GO_CLEAROBJ;
+ }
game.prop[CHAIN]=2;
if (TOTING(CHAIN))DROP(CHAIN,game.loc);
game.fixed[CHAIN]= -1;
if (obj == BIRD && HERE(SNAKE)) {
RSPEAK(BIRD_ATTACKS);
if (game.closed) return GO_DWARFWAKE;
- DSTROY(SNAKE);
+ DESTROY(SNAKE);
/* Set game.prop for use by travel options */
game.prop[SNAKE]=1;
if (TOTING(RUG))spk=RUG_WIGGLES;
if (obj == RUBY)spk=RUG_SETTLES;
RSPEAK(spk);
- if (spk != 220) {
+ if (spk != RUG_WIGGLES) {
int k = 2-game.prop[RUG];
game.prop[RUG] = k;
if (k == 2) k = PLAC[SAPPH];
}
}
} else if (obj == COINS && HERE(VEND)) {
- DSTROY(COINS);
+ DESTROY(COINS);
DROP(BATTER,game.loc);
PSPEAK(BATTER,0);
return GO_CLEAROBJ;
} else if (obj == BIRD && AT(DRAGON) && game.prop[DRAGON] == 0) {
RSPEAK(BIRD_BURNT);
- DSTROY(BIRD);
+ DESTROY(BIRD);
game.prop[BIRD]=0;
return GO_CLEAROBJ;
} else if (obj == BEAR && AT(TROLL)) {
int k = LIQUID();
if (k == obj)obj=BOTTLE;
if (obj == BOTTLE && k != 0)
- game.place[k]=0;
+ game.place[k] = NOWHERE;
if (obj == CAGE && game.prop[BIRD] == 1)DROP(BIRD,game.loc);
DROP(obj,game.loc);
if (obj != BIRD) return GO_CLEAROBJ;
return GO_UNKNOWN;
if (obj != BLOOD) {
if (obj != 0 && obj != WATER)spk=RIDICULOUS_ATTEMPT;
- if (spk != 110 && LIQUID() == WATER && HERE(BOTTLE)) {
- game.prop[BOTTLE]=1;
- game.place[WATER]=0;
+ if (spk != RIDICULOUS_ATTEMPT && LIQUID() == WATER && HERE(BOTTLE)) {
+ game.prop[BOTTLE] = 1;
+ game.place[WATER] = NOWHERE;
spk=BOTTLE_EMPTY;
}
} else {
- DSTROY(BLOOD);
+ DESTROY(BLOOD);
game.prop[DRAGON]=2;
OBJSND[BIRD]=OBJSND[BIRD]+3;
spk=HEAD_BUZZES;
if (obj == INTRANSITIVE) {
if (!HERE(FOOD))
return GO_UNKNOWN;
- DSTROY(FOOD);
+ DESTROY(FOOD);
spk=THANKS_DELICIOUS;
} else {
if (obj == FOOD) {
- DSTROY(FOOD);
+ DESTROY(FOOD);
spk=THANKS_DELICIOUS;
}
if (obj == BIRD || obj == SNAKE || obj == CLAM || obj == OYSTER || obj ==
if (obj == DRAGON && game.prop[DRAGON] != 0)spk=RIDICULOUS_ATTEMPT;
if (obj == TROLL)spk=TROLL_VICES;
if (obj == SNAKE && !game.closed && HERE(BIRD)) {
- DSTROY(BIRD);
+ DESTROY(BIRD);
game.prop[BIRD]=0;
spk = BIRD_DEVOURED;
}
if (game.prop[BEAR] == 0)spk=NOTHING_EDIBLE;
if (game.prop[BEAR] == 3)spk=RIDICULOUS_ATTEMPT;
if (HERE(FOOD)) {
- DSTROY(FOOD);
+ DESTROY(FOOD);
game.prop[BEAR]=1;
game.fixed[AXE]=0;
game.prop[AXE]=0;
return GO_CLEAROBJ;
}
RSPEAK(SHATTER_VASE);
- game.prop[VASE]=2;
+ game.prop[VASE] = 2;
game.fixed[VASE]= -1;
return(discard(verb, obj, true));
}
spk=FILL_INVALID;
k=LIQUID();
if (k == 0 || !HERE(BOTTLE)) {RSPEAK(spk); return GO_CLEAROBJ;}
- game.place[k]=0;
- game.prop[BOTTLE]=1;
+ game.place[k] = NOWHERE;
+ game.prop[BOTTLE] = 1;
if (k == OIL)game.prop[URN]=1;
spk=WATER_URN+game.prop[URN];
RSPEAK(spk);
game.prop[BOTTLE]=MOD(COND[game.loc],4)/2*2;
k=LIQUID();
if (TOTING(BOTTLE))
- game.place[k]= -1;
+ game.place[k] = CARRIED;
if (k == OIL)
spk=BOTTLED_OIL;
}
if (obj == INTRANSITIVE) {
if (game.prop[RUG] != 2)spk=RUG_NOTHING2;
if (!HERE(RUG))spk=FLAP_ARMS;
- if (spk/2 == 112) {
+ if (spk == RUG_NOTHING2 || spk == FLAP_ARMS) {
RSPEAK(spk);
return GO_CLEAROBJ;
}
game.oldloc=game.loc;
game.newloc=game.place[RUG]+game.fixed[RUG]-game.loc;
spk=RUG_GOES;
- if (game.prop[SAPPH] >= 0)spk=RUG_RETURNS;
+ if (game.prop[SAPPH] >= 0)
+ spk=RUG_RETURNS;
RSPEAK(spk);
return GO_TERMINATE;
}
-
-static int inven(token_t obj)
+
+static int inven(void)
/* Inventory. If object, treat same as find. Else report on current burden. */
{
- int i;
int spk=NO_CARRY;
- for (i=1; i<=NOBJECTS; i++) {
+ for (int i=1; i<=NOBJECTS; i++) {
if (i == BEAR || !TOTING(i))
continue;
- if (spk == 98)
+ if (spk == NO_CARRY)
RSPEAK(NOW_HOLDING);
game.blklin=false;
PSPEAK(i,-1);
return GO_TOP;
else
return GO_CLEAROBJ;
- }
+ }
}
static int listen(void)
/* Listen. Intransitive only. Print stuff based on objsnd/locsnd. */
{
- int i, k;
+ int k;
int spk=ALL_SILENT;
k=LOCSND[game.loc];
if (k != 0) {
spk=ARB_0;
}
SETPRM(1,game.zzword,0);
- for (i=1; i<=NOBJECTS; i++) {
+ for (int i=1; i<=NOBJECTS; i++) {
if (!HERE(i) || OBJSND[i] == 0 || game.prop[i] < 0)
continue;
PSPEAK(i,OBJSND[i]+game.prop[i]);
spk=ARB_0;
if (i == BIRD && OBJSND[i]+game.prop[i] == 8)
- DSTROY(BIRD);
+ DESTROY(BIRD);
}
RSPEAK(spk);
return GO_CLEAROBJ;
if (!game.panic)game.clock2=15;
game.panic=true;
} else {
- spk=ALREADY_LOCKED+game.prop[GRATE]; /* FIXME: Arithmetic on message number */
+ spk=game.prop[GRATE] ? GRATE_LOCKED : ALREADY_LOCKED;
game.prop[GRATE]=1;
if (verb == LOCK)game.prop[GRATE]=0;
- spk=spk+2*game.prop[GRATE];
+ spk=game.prop[GRATE] ? GRATE_UNLOCKED : GRATE_LOCKED;
}
}
}
if (obj != OIL && obj != WATER) {RSPEAK(spk); return GO_CLEAROBJ;}
if (HERE(URN) && game.prop[URN] == 0)
return fill(verb, URN);
- game.prop[BOTTLE]=1;
- game.place[obj]=0;
+ game.prop[BOTTLE] = 1;
+ game.place[obj] = NOWHERE;
spk=GROUND_WET;
if (!(AT(PLANT) || AT(DOOR)))
{RSPEAK(spk); return GO_CLEAROBJ;}
/* Quit. Intransitive only. Verify intent and exit if that's what he wants. */
{
if (YES(input,REALLY_QUIT,OK_MAN,OK_MAN))
- score(1);
+ score(quitgame);
return GO_CLEAROBJ;
}
} else {
PSPEAK(RESER,game.prop[RESER]+1);
game.prop[RESER]=1-game.prop[RESER];
- if (AT(RESER)) return GO_CLEAROBJ;
- game.oldlc2=game.loc;
- game.newloc=0;
- RSPEAK(NOT_BRIGHT);
- return GO_TERMINATE;
+ if (AT(RESER))
+ return GO_CLEAROBJ;
+ else {
+ game.oldlc2=game.loc;
+ game.newloc=0;
+ RSPEAK(NOT_BRIGHT);
+ return GO_TERMINATE;
+ }
}
}
if (obj != LAMP)
spk=PECULIAR_NOTHING;
if (obj == URN && game.prop[URN] == 2) {
- DSTROY(URN);
+ DESTROY(URN);
DROP(AMBER,game.loc);
game.prop[AMBER]=1;
--game.tally;
if (WD2 > 0)
WD1=WD2;
int wd=VOCAB(WD1,-1);
+ /* FIXME: Magic numbers */
if (wd == 62 || wd == 65 || wd == 71 || wd == 2025 || wd == 2034) {
WD2=0;
return GO_LOOKUP;
RSPEAK(spk);
return GO_CLEAROBJ;
}
- if (obj >= 50 && obj <= MAXTRS && AT(TROLL)) {
+ if (obj >= MINTRS && obj <= MAXTRS && AT(TROLL)) {
spk=TROLL_SATISFIED;
/* Snarf a treasure for the troll. */
DROP(obj,0);
return throw_support(spk);
}
if (AT(OGRE)) {
- spk=OGRE_DOFGE;
+ spk=OGRE_DODGE;
return throw_support(spk);
}
if (HERE(BEAR) && game.prop[BEAR] == 0) {
static int vscore(void)
/* Score. Call scoring routine but tell it to return. */
{
- score(-1);
+ score(scoregame);
return GO_CLEAROBJ;
}
if (HERE(obj))
/* FALL THROUGH */;
else if (obj == GRATE) {
- if (game.loc == 1 || game.loc == 4 || game.loc == 7)
+ if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT)
obj=DPRSSN;
- if (game.loc > 9 && game.loc < 15)
+ /* FIXME: Arithmetic on location numbers */
+ if (game.loc > LOC_BELOWGRATE && game.loc < LOC_MISTHALL)
obj=ENTRNC;
if (obj != GRATE)
return GO_MOVE;
case 16: /* TOSS */ return GO_UNKNOWN;
case 17: /* QUIT */ return quit(input);
case 18: /* FIND */ return GO_UNKNOWN;
- case 19: /* INVEN */ return inven(obj);
+ case 19: /* INVEN */ return inven();
case 20: /* FEED */ return GO_UNKNOWN;
case 21: /* FILL */ return fill(verb, obj);
case 22: /* BLAST */ return blast();
projects / open-adventure.git / blobdiff