#include "advent.h"
#include "database.h"
+/* Limit visibility of ugly globals. Eventually these should go away. */
+extern long WD1, WD1X, WD2, WD2X;
+
+static long SPK; /* This should go away too */
+
/*
* Action handlers. Eventually we'll do lookup through a method table
* that calls these. Absolutely nothing like the original FORTRAN.
*/
-static int fill(long);
+static int fill(token_t verb, token_t);
static int attack(FILE *input, long verb, long obj)
/* Attack. Assume target if unambiguous. "Throw" also links here.
* dwarf, etc.) and others (bird, clam, machine). Ambiguous if 2
* enemies, or no enemies but 2 others. */
{
- int i =ATDWRF(game.loc);
+ int spk = ACTSPK[verb];
+ int i = ATDWRF(game.loc);
if (obj == 0) {
if (i > 0)
obj=DWARF;
}
}
if (obj == BIRD) {
- SPK=137;
+ spk=137;
if (game.closed)
{
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
DSTROY(BIRD);
game.prop[BIRD]=0;
- SPK=45;
+ spk=45;
}
if (obj == VEND) {
PSPEAK(VEND,game.prop[VEND]+2);
return(2012);
}
- if (obj == 0)SPK=44;
- if (obj == CLAM || obj == OYSTER)SPK=150;
- if (obj == SNAKE)SPK=46;
- if (obj == DWARF)SPK=49;
+ if (obj == 0)spk=44;
+ if (obj == CLAM || obj == OYSTER)spk=150;
+ if (obj == SNAKE)spk=46;
+ if (obj == DWARF)spk=49;
if (obj == DWARF && game.closed) return(19000);
- if (obj == DRAGON)SPK=167;
- if (obj == TROLL)SPK=157;
- if (obj == OGRE)SPK=203;
+ if (obj == DRAGON)spk=167;
+ if (obj == TROLL)spk=157;
+ if (obj == OGRE)spk=203;
if (obj == OGRE && i > 0) {
- RSPEAK(SPK);
+ RSPEAK(spk);
RSPEAK(6);
DSTROY(OGRE);
int k=0;
game.dseen[i]=false;
}
}
- SPK=SPK+1+1/k;
- RSPEAK(SPK);
+ spk=spk+1+1/k;
+ RSPEAK(spk);
return 2012;
}
- if (obj == BEAR)SPK=165+(game.prop[BEAR]+1)/2;
- if (obj != DRAGON || game.prop[DRAGON] != 0) {RSPEAK(SPK); return 2012;}
+ if (obj == BEAR)spk=165+(game.prop[BEAR]+1)/2;
+ if (obj != DRAGON || game.prop[DRAGON] != 0) {RSPEAK(spk); return 2012;}
/* 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,
MOVE(obj,k);
}
game.loc=k;
- K=NUL; /* FIXME: error if removed */
return(8);
}
* word zips the eggs back to the giant room (unless already there). */
{
int k=VOCAB(foo,3);
- SPK=42;
+ int spk=42;
if (game.foobar != 1-k) {
- if (game.foobar != 0)SPK=151;
- RSPEAK(SPK);
+ if (game.foobar != 0)spk=151;
+ RSPEAK(spk);
return 2012;
} else {
game.foobar=k;
}
game.foobar=0;
if (game.place[EGGS]==PLAC[EGGS] || (TOTING(EGGS) && game.loc==PLAC[EGGS])) {
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
/* Bring back troll if we steal the eggs back from him before
static int bivalve(token_t verb, token_t obj)
/* Clam/oyster actions */
{
- int k=0;
+ int spk, k=0;
if (obj == OYSTER)k=1;
- SPK=124+k;
- if (TOTING(obj))SPK=120+k;
- if (!TOTING(TRIDNT))SPK=122+k;
- if (verb == LOCK)SPK=61;
- if (SPK == 124) {
+ spk=124+k;
+ if (TOTING(obj))spk=120+k;
+ if (!TOTING(TRIDNT))spk=122+k;
+ if (verb == LOCK)spk=61;
+ if (spk == 124) {
DSTROY(CLAM);
DROP(OYSTER,game.loc);
DROP(PEARL,105);
}
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
static int blast(void)
/* Blast. No effect unless you've got dynamite, which is a neat trick! */
{
- if (game.prop[ROD2] < 0 || !game.closed) {RSPEAK(SPK); return 2012;}
+ if (game.prop[ROD2] < 0 || !game.closed)
+ {
+ RSPEAK(67);
+ return 2012;
+ }
game.bonus=133;
- if (game.loc == 115)game.bonus=134;
- if (HERE(ROD2))game.bonus=135;
+ if (game.loc == 115)
+ game.bonus=134;
+ if (HERE(ROD2))
+ game.bonus=135;
RSPEAK(game.bonus);
score(0);
}
-static int vbreak(token_t obj)
+static int vbreak(token_t verb, token_t obj)
/* Break. Only works for mirror in repository and, of course, the vase. */
{
- if (obj == MIRROR)SPK=148;
+ int spk = ACTSPK[verb];
+ if (obj == MIRROR)spk=148;
if (obj == VASE && game.prop[VASE] == 0) {
- SPK=198;
if (TOTING(VASE))DROP(VASE,game.loc);
game.prop[VASE]=2;
game.fixed[VASE]= -1;
+ spk=198;
} else {
if (obj == MIRROR && game.closed) {
- SPK=197;
- return(18999);
+ RSPEAK(197);
+ return(190000);
}
}
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
static int brief(void)
/* Brief. Intransitive only. Suppress long descriptions after first time. */
{
- SPK=156;
game.abbnum=10000;
game.detail=3;
- RSPEAK(SPK);
+ RSPEAK(156);
return 2012;
}
-static int carry(long obj)
+static int carry(token_t verb, long obj)
/* 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. */
{
+ int spk;
if (obj == INTRANSITIVE) {
/* Carry, no object given yet. OK if only one object present. */
if(game.atloc[game.loc] == 0 ||
obj=game.atloc[game.loc];
}
- if (TOTING(obj)) {RSPEAK(SPK); return 2012;}
- SPK=25;
- if (obj == PLANT && game.prop[PLANT] <= 0)SPK=115;
- if (obj == BEAR && game.prop[BEAR] == 1)SPK=169;
- if (obj == CHAIN && game.prop[BEAR] != 0)SPK=170;
- if (obj == URN)SPK=215;
- if (obj == CAVITY)SPK=217;
- if (obj == BLOOD)SPK=239;
- if (obj == RUG && game.prop[RUG] == 2)SPK=222;
- if (obj == SIGN)SPK=196;
+ if (TOTING(obj)) {RSPEAK(24); return 2012;}
+ spk=25;
+ if (obj == PLANT && game.prop[PLANT] <= 0)spk=115;
+ if (obj == BEAR && game.prop[BEAR] == 1)spk=169;
+ if (obj == CHAIN && game.prop[BEAR] != 0)spk=170;
+ if (obj == URN)spk=215;
+ if (obj == CAVITY)spk=217;
+ if (obj == BLOOD)spk=239;
+ if (obj == RUG && game.prop[RUG] == 2)spk=222;
+ if (obj == SIGN)spk=196;
if (obj == MESSAG) {
- SPK=190;
+ spk=190;
+ return 2012;
DSTROY(MESSAG);
}
if (game.fixed[obj] != 0) {
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
if (obj == WATER || obj == OIL) {
if (!HERE(BOTTLE) || LIQUID() != obj) {
if (TOTING(BOTTLE) && game.prop[BOTTLE] == 1)
- return(fill(BOTTLE));
- if (game.prop[BOTTLE] != 1)SPK=105;
- if (!TOTING(BOTTLE))SPK=104;
- RSPEAK(SPK);
+ return(fill(verb, BOTTLE));
+ if (game.prop[BOTTLE] != 1)spk=105;
+ if (!TOTING(BOTTLE))spk=104;
+ RSPEAK(spk);
return 2012;
}
obj = BOTTLE;
}
- SPK=92;
+ spk=92;
if (game.holdng >= INVLIMIT) {
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
else if (obj == BIRD && game.prop[BIRD] != 1 && -1-game.prop[BIRD] != 1) {
RSPEAK(238);
return 2012;
}
- if (!TOTING(CAGE))SPK=27;
- if (TOTING(ROD))SPK=26;
- if (SPK/2 == 13) {
- RSPEAK(SPK);
+ if (!TOTING(CAGE))spk=27;
+ if (TOTING(ROD))spk=26;
+ if (spk/2 == 13) {
+ RSPEAK(spk);
return 2012;
}
game.prop[BIRD]=1;
static int chain(token_t verb)
/* Do something to the bear's chain */
{
+ int spk;
if (verb != LOCK) {
- SPK=171;
- if (game.prop[BEAR] == 0)SPK=41;
- if (game.prop[CHAIN] == 0)SPK=37;
- if (SPK != 171) {RSPEAK(SPK); return 2012;}
+ spk=171;
+ if (game.prop[BEAR] == 0)spk=41;
+ if (game.prop[CHAIN] == 0)spk=37;
+ if (spk != 171) {RSPEAK(spk); return 2012;}
game.prop[CHAIN]=0;
game.fixed[CHAIN]=0;
if (game.prop[BEAR] != 3)game.prop[BEAR]=2;
game.fixed[BEAR]=2-game.prop[BEAR];
} else {
- SPK=172;
- if (game.prop[CHAIN] != 0)SPK=34;
- if (game.loc != PLAC[CHAIN])SPK=173;
- if (SPK != 172) {RSPEAK(SPK); return 2012;}
+ spk=172;
+ if (game.prop[CHAIN] != 0)spk=34;
+ if (game.loc != PLAC[CHAIN])spk=173;
+ if (spk != 172) {RSPEAK(spk); return 2012;}
game.prop[CHAIN]=2;
if (TOTING(CHAIN))DROP(CHAIN,game.loc);
game.fixed[CHAIN]= -1;
}
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
-static int discard(long obj, bool just_do_it)
+static int discard(token_t verb, long obj, bool just_do_it)
/* Discard object. "Throw" also comes here for most objects. Special cases for
* bird (might attack snake or dragon) and cage (might contain bird) and vase.
* Drop coins at vending machine for extra batteries. */
{
+ int spk = ACTSPK[verb];
if (!just_do_it) {
if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj=ROD2;
- if (!TOTING(obj)) {RSPEAK(SPK); return 2012;}
+ if (!TOTING(obj)) {RSPEAK(spk); return 2012;}
if (obj == BIRD && HERE(SNAKE)) {
RSPEAK(30);
if (game.closed) return(19000);
game.prop[CAVITY]=0;
if (HERE(RUG) && ((obj == EMRALD && game.prop[RUG] != 2) || (obj == RUBY &&
game.prop[RUG] == 2))) {
- SPK=219;
- if (TOTING(RUG))SPK=220;
- if (obj == RUBY)SPK=221;
- RSPEAK(SPK);
- if (SPK != 220) {
- K=2-game.prop[RUG];
- game.prop[RUG]=K;
- if (K == 2)K=PLAC[SAPPH];
- MOVE(RUG+NOBJECTS,K);
+ spk=219;
+ if (TOTING(RUG))spk=220;
+ if (obj == RUBY)spk=221;
+ RSPEAK(spk);
+ if (spk != 220) {
+ int k = 2-game.prop[RUG];
+ game.prop[RUG] = k;
+ if (k == 2) k = PLAC[SAPPH];
+ MOVE(RUG+NOBJECTS, k);
}
}
} else if (obj == COINS && HERE(VEND)) {
if (game.prop[VASE] != 0)game.fixed[VASE]= -1;
}
}
- K=LIQUID();
- if (K == obj)obj=BOTTLE;
- if (obj == BOTTLE && K != 0)game.place[K]=0;
+ int k = LIQUID();
+ if (k == obj)obj=BOTTLE;
+ if (obj == BOTTLE && k != 0)
+ game.place[k]=0;
if (obj == CAGE && game.prop[BIRD] == 1)DROP(BIRD,game.loc);
DROP(obj,game.loc);
if (obj != BIRD) return(2012);
* mad. Bear, special. */
{
if (obj == BIRD) {
- SPK=100;
- RSPEAK(SPK);
+ RSPEAK(100);
return 2012;
}
if (!(obj != SNAKE && obj != DRAGON && obj != TROLL)) {
- SPK=102;
- if (obj == DRAGON && game.prop[DRAGON] != 0)SPK=110;
- if (obj == TROLL)SPK=182;
+ int spk=102;
+ if (obj == DRAGON && game.prop[DRAGON] != 0)spk=110;
+ if (obj == TROLL)spk=182;
if (obj != SNAKE || game.closed || !HERE(BIRD))
- {RSPEAK(SPK); return 2012;}
- SPK=101;
+ {
+ RSPEAK(spk);
+ return 2012;
+ }
DSTROY(BIRD);
game.prop[BIRD]=0;
- RSPEAK(SPK);
+ RSPEAK(101);
return 2012;
}
if (obj == DWARF) {
if (!HERE(FOOD))
- {RSPEAK(SPK); return 2012;}
- SPK=103;
+ {
+ RSPEAK(SPK); /* FIXME: Defaults from ACTSPK */
+ return 2012;
+ }
game.dflag=game.dflag+2;
- RSPEAK(SPK);
+ RSPEAK(103);
return 2012;
}
return 2012;
}
-int fill(long obj)
+int fill(token_t verb, long obj)
/* Fill. Bottle or urn must be empty, and liquid available. (Vase
* is nasty.) */
{
int k;
+ int spk = ACTSPK[verb];
if (obj == VASE) {
- SPK=29;
- if (LIQLOC(game.loc) == 0)SPK=144;
+ spk=29;
+ if (LIQLOC(game.loc) == 0)spk=144;
if (LIQLOC(game.loc) == 0 || !TOTING(VASE)) {
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
RSPEAK(145);
game.prop[VASE]=2;
game.fixed[VASE]= -1;
- return(discard(obj, true));
+ return(discard(verb, obj, true));
}
if (obj == URN){
- SPK=213;
- if (game.prop[URN] != 0) {RSPEAK(SPK); return 2012;}
- SPK=144;
+ spk=213;
+ if (game.prop[URN] != 0) {RSPEAK(spk); return 2012;}
+ spk=144;
k=LIQUID();
- if (k == 0 || !HERE(BOTTLE)) {RSPEAK(SPK); return 2012;}
+ if (k == 0 || !HERE(BOTTLE)) {RSPEAK(spk); return 2012;}
game.place[k]=0;
game.prop[BOTTLE]=1;
if (k == OIL)game.prop[URN]=1;
- SPK=211+game.prop[URN];
- RSPEAK(SPK);
+ spk=211+game.prop[URN];
+ RSPEAK(spk);
return 2012;
}
if (obj != 0 && obj != BOTTLE) {
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
if (obj == 0 && !HERE(BOTTLE))
return(8000);
- SPK=107;
+ spk=107;
if (LIQLOC(game.loc) == 0)
- SPK=106;
+ spk=106;
if (HERE(URN) && game.prop[URN] != 0)
- SPK=214;
+ spk=214;
if (LIQUID() != 0)
- SPK=105;
- if (SPK != 107)
- {RSPEAK(SPK); return 2012;}
+ spk=105;
+ if (spk != 107)
+ {RSPEAK(spk); return 2012;}
game.prop[BOTTLE]=MOD(COND[game.loc],4)/2*2;
k=LIQUID();
if (TOTING(BOTTLE))
game.place[k]= -1;
if (k == OIL)
- SPK=108;
- RSPEAK(SPK);
+ spk=108;
+ RSPEAK(spk);
return 2012;
}
for (i=1; i<=NOBJECTS; i++) {
if (i == BEAR || !TOTING(i))
continue;
- if (SPK == 98)RSPEAK(99);
+ if (SPK == 98)
+ RSPEAK(99);
game.blklin=false;
PSPEAK(i,-1);
game.blklin=true;
int light(token_t obj)
/* Light. Applicable only to lamp and urn. */
{
+ int spk;
if (obj == INTRANSITIVE) {
if (HERE(LAMP) && game.prop[LAMP] == 0 && game.limit >= 0)obj=LAMP;
if (HERE(URN) && game.prop[URN] == 1)obj=obj*NOBJECTS+URN;
}
if (obj == URN) {
- SPK=38;
+ spk=38;
if (game.prop[URN] == 0)
- {RSPEAK(SPK); return 2012;}
- SPK=209;
+ {RSPEAK(spk); return 2012;}
+ spk=209;
game.prop[URN]=2;
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
} else {
if (obj != LAMP)
{
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
- SPK=184;
+ spk=184;
if (game.limit < 0) {
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
game.prop[LAMP]=1;
/* Listen. Intransitive only. Print stuff based on objsnd/locsnd. */
{
int i, k;
- SPK=228;
+ int spk=228;
k=LOCSND[game.loc];
if (k != 0) {
RSPEAK(labs(k));
if (k < 0) return(2012);
- SPK=0;
+ spk=0;
}
SETPRM(1,game.zzword,0);
for (i=1; i<=NOBJECTS; i++) {
if (!HERE(i) || OBJSND[i] == 0 || game.prop[i] < 0)
continue;
PSPEAK(i,OBJSND[i]+game.prop[i]);
- SPK=0;
+ spk=0;
if (i == BIRD && OBJSND[i]+game.prop[i] == 8)
DSTROY(BIRD);
}
- RSPEAK(SPK);
+ RSPEAK(spk);
return 2012;
}
return 2012;
}
-static int pour(token_t obj)
+static int pour(token_t verb, token_t obj)
/* Pour. If no object, or object is bottle, assume contents of bottle.
* special tests for pouring water or oil on plant or rusty door. */
{
SPK=78;
if (obj != OIL && obj != WATER) {RSPEAK(SPK); return 2012;}
if (HERE(URN) && game.prop[URN] == 0)
- return fill(URN);
+ return fill(verb, URN);
game.prop[BOTTLE]=1;
game.place[obj]=0;
SPK=77;
PSPEAK(PLANT,game.prop[PLANT]+3);
game.prop[PLANT]=MOD(game.prop[PLANT]+1,3);
game.prop[PLANT2]=game.prop[PLANT];
- K=NUL;
return(8);
} else {
game.prop[DOOR]=0;
{
RSPEAK(spk);
DROP(AXE,game.loc);
- K=NUL;
return(8);
}
* troll. Treasures special for troll. */
{
if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj=ROD2;
- if (!TOTING(obj))
- {RSPEAK(SPK); return 2012;}
+ if (!TOTING(obj)) {
+ RSPEAK(SPK); /* FIXME: Defaults from ACTSPK */
+ return 2012;
+ }
if (obj >= 50 && obj <= MAXTRS && AT(TROLL)) {
SPK=159;
/* Snarf a treasure for the troll. */
return(feed(obj));
}
if (obj != AXE)
- return(discard(obj, false));
+ return(discard(verb, obj, false));
int i=ATDWRF(game.loc);
if (i <= 0) {
if (AT(DRAGON) && game.prop[DRAGON] == 0) {
/* Wake. Only use is to disturb the dwarves. */
{
if (obj != DWARF || !game.closed) {RSPEAK(SPK); return 2012;}
- SPK=199;
- return(18999);
+ RSPEAK(199);
+ return(19000);
}
static int wave(token_t obj)
RSPEAK(SPK);
return 2012;
} else {
- if (game.closed) return(18999);
+ if (game.closed) {
+ RSPEAK(SPK); /* FIXME: How is SPK set here? */
+ return(19000);
+ }
if (game.closng || !AT(FISSUR)) {RSPEAK(SPK); return 2012;}
if (HERE(BIRD))RSPEAK(SPK);
game.prop[FISSUR]=1-game.prop[FISSUR];
if (obj == 0) {
/* Analyse an intransitive verb (ie, no object given yet). */
switch (verb-1) {
- case 0: /* CARRY */ return carry(INTRANSITIVE);
+ case 0: /* CARRY */ return carry(verb, INTRANSITIVE);
case 1: /* DROP */ return(8000);
case 2: /* SAY */ return(8000);
case 3: /* UNLOC */ return lock(verb, INTRANSITIVE);
case 9: /* CALM */ return(8000);
case 10: /* WALK */ {RSPEAK(SPK); return 2012;}
case 11: /* ATTAC */ return attack(input, verb, obj);
- case 12: /* POUR */ return pour(obj);
+ case 12: /* POUR */ return pour(verb, obj);
case 13: /* EAT */ return eat(INTRANSITIVE);
case 14: /* DRINK */ return drink(obj);
case 15: /* RUB */ return(8000);
case 18: /* FIND */ return(8000);
case 19: /* INVEN */ return inven(obj);
case 20: /* FEED */ return(8000);
- case 21: /* FILL */ return fill(obj);
+ case 21: /* FILL */ return fill(verb, obj);
case 22: /* BLAST */ return blast();
case 23: /* SCOR */ return vscore();
case 24: /* FOO */ return bigwords(WD1);
case transitive:
/* Analyse a transitive verb. */
switch (verb-1) {
- case 0: /* CARRY */ return carry(obj);
- case 1: /* DROP */ return discard(obj, false);
+ case 0: /* CARRY */ return carry(verb, obj);
+ case 1: /* DROP */ return discard(verb, obj, false);
case 2: /* SAY */ return say();
case 3: /* UNLOC */ return lock(verb, obj);
case 4: /* NOTHI */ {RSPEAK(54); return(20012);}
case 9: /* CALM */ {RSPEAK(SPK); return 2012;}
case 10: /* WALK */ {RSPEAK(SPK); return 2012;}
case 11: /* ATTAC */ return attack(input, verb, obj);
- case 12: /* POUR */ return pour(obj);
+ case 12: /* POUR */ return pour(verb, obj);
case 13: /* EAT */ return eat(obj);
case 14: /* DRINK */ return drink(obj);
case 15: /* RUB */ return rub(obj);
case 18: /* FIND */ return find(obj);
case 19: /* INVEN */ return find(obj);
case 20: /* FEED */ return feed(obj);
- case 21: /* FILL */ return fill(obj);
+ case 21: /* FILL */ return fill(verb, obj);
case 22: /* BLAST */ return blast();
case 23: /* SCOR */ {RSPEAK(SPK); return 2012;}
case 24: /* FOO */ {RSPEAK(SPK); return 2012;}
case 25: /* BRIEF */ {RSPEAK(SPK); return 2012;}
case 26: /* READ */ return read(input, obj);
- case 27: /* BREAK */ return vbreak(obj);
+ case 27: /* BREAK */ return vbreak(verb, obj);
case 28: /* WAKE */ return wake(obj);
case 29: /* SUSP */ {RSPEAK(SPK); return 2012;}
case 30: /* RESU */ {RSPEAK(SPK); return 2012;}