archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove objectioonable uses of global variables.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-09 10:39:12 -04:00
parent 37117f20e0
commit 2606284916
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
actions.c
View file

@ -80,22 +80,23 @@ static int attack(FILE *input, long verb, long obj)
* too. Then do a null motion to get new description. */ * too. Then do a null motion to get new description. */
RSPEAK(49); RSPEAK(49);
GETIN(input,WD1,WD1X,WD2,WD2X); GETIN(input,WD1,WD1X,WD2,WD2X);
if (WD1 != MAKEWD(25) && WD1 != MAKEWD(250519)) return(2607); if (WD1 != MAKEWD(25) && WD1 != MAKEWD(250519))
return(2607);
PSPEAK(DRAGON,3); PSPEAK(DRAGON,3);
game.prop[DRAGON]=1; game.prop[DRAGON]=1;
game.prop[RUG]=0; game.prop[RUG]=0;
K=(PLAC[DRAGON]+FIXD[DRAGON])/2; int k=(PLAC[DRAGON]+FIXD[DRAGON])/2;
MOVE(DRAGON+NOBJECTS,-1); MOVE(DRAGON+NOBJECTS,-1);
MOVE(RUG+NOBJECTS,0); MOVE(RUG+NOBJECTS,0);
MOVE(DRAGON,K); MOVE(DRAGON,k);
MOVE(RUG,K); MOVE(RUG,k);
DROP(BLOOD,K); DROP(BLOOD,k);
for (obj=1; obj<=NOBJECTS; obj++) { for (obj=1; obj<=NOBJECTS; obj++) {
if (game.place[obj] == PLAC[DRAGON] || game.place[obj] == FIXD[DRAGON])MOVE(obj,K); if (game.place[obj] == PLAC[DRAGON] || game.place[obj] == FIXD[DRAGON])
/*etc*/ ; MOVE(obj,k);
} /* end loop */ }
game.loc=K; game.loc=k;
K=NUL; K=NUL; /* FIXME: error if removed */
return(8); return(8);
} }
@ -110,7 +111,6 @@ static int bigwords(long foo)
if (game.foobar != 0)SPK=151; if (game.foobar != 0)SPK=151;
return(2011); return(2011);
} else { } else {
game.foobar=k; game.foobar=k;
if (k != 4) return(2009); if (k != 4) return(2009);
game.foobar=0; game.foobar=0;
@ -524,7 +524,7 @@ static int find(token_t obj)
{ {
if (AT(obj) || if (AT(obj) ||
(LIQ(0) == obj && AT(BOTTLE)) || (LIQ(0) == obj && AT(BOTTLE)) ||
K == LIQLOC(game.loc) || obj == LIQLOC(game.loc) ||
(obj == DWARF && ATDWRF(game.loc) > 0)) (obj == DWARF && ATDWRF(game.loc) > 0))
SPK=94; SPK=94;
if (game.closed)SPK=138; if (game.closed)SPK=138;