RSPEAK(spk);
RSPEAK(KNIFE_THROWN);
DSTROY(OGRE);
- int k=0;
+ int dwarves=0;
for (int i=1; i < PIRATE; i++) {
if (game.dloc[i] == game.loc) {
- ++k;
+ ++dwarves;
game.dloc[i] = LOC_LONGWEST;
game.dseen[i]=false;
}
}
- spk=spk+1+1/k; /* FIXME: Arithmetic on message numbers */
- RSPEAK(spk);
- return GO_CLEAROBJ;
+ spk=spk+1+1/dwarves; /* FIXME: Arithmetic on message numbers */
}
-
- if (obj == BEAR)
+ else if (obj == BEAR)
/* FIXME: Arithmetic on message numbers */
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 == 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;
- /* FIXME: Arithmetic on message numbers in next lines */
- 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 == PEARL_FALLS) {
DSTROY(CLAM);
if (HERE(ROD2))
game.bonus=135;
RSPEAK(game.bonus);
- score(0);
+ score(endgame);
return GO_CLEAROBJ; /* pacify compiler - we never get here */
}
}
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;
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;
if (obj != BLOOD) {
if (obj != 0 && obj != WATER)spk=RIDICULOUS_ATTEMPT;
if (spk != RIDICULOUS_ATTEMPT && LIQUID() == WATER && HERE(BOTTLE)) {
- game.prop[BOTTLE]=1;
- game.place[WATER]=0;
+ game.prop[BOTTLE] = 1;
+ game.place[WATER] = NOWHERE;
spk=BOTTLE_EMPTY;
}
} else {
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) { /* FIXME: Arithmetic on message numbers */
+ if (spk == RUG_NOTHING2 || spk == FLAP_ARMS) {
RSPEAK(spk);
return GO_CLEAROBJ;
}
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 spk=NO_CARRY;
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;
}
static int vscore(void)
/* Score. Call scoring routine but tell it to return. */
{
- score(-1);
+ score(scoregame);
return GO_CLEAROBJ;
}
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