projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
37117f2
)
Remove objectioonable uses of global variables.
author
Eric S. Raymond
<esr@thyrsus.com>
Fri, 9 Jun 2017 14:39:12 +0000
(10:39 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Fri, 9 Jun 2017 14:39:12 +0000
(10:39 -0400)
actions.c
patch
|
blob
|
history
diff --git
a/actions.c
b/actions.c
index c9bf2396981601d25999920d2dd64877a4afa282..e878c89e9518d15029dcc9da262884379a5b8640 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-80,22
+80,23
@@
static int attack(FILE *input, long verb, long obj)
* too. Then do a null motion to get new description. */
RSPEAK(49);
GETIN(input,WD1,WD1X,WD2,WD2X);
* too. Then do a null motion to get new description. */
RSPEAK(49);
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);
game.prop[DRAGON]=1;
game.prop[RUG]=0;
PSPEAK(DRAGON,3);
game.prop[DRAGON]=1;
game.prop[RUG]=0;
-
K
=(PLAC[DRAGON]+FIXD[DRAGON])/2;
+
int k
=(PLAC[DRAGON]+FIXD[DRAGON])/2;
MOVE(DRAGON+NOBJECTS,-1);
MOVE(RUG+NOBJECTS,0);
MOVE(DRAGON+NOBJECTS,-1);
MOVE(RUG+NOBJECTS,0);
- MOVE(DRAGON,
K
);
- MOVE(RUG,
K
);
- DROP(BLOOD,
K
);
+ MOVE(DRAGON,
k
);
+ MOVE(RUG,
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);
-
/*etc*/
;
- }
/* end loop */
- game.loc=
K
;
- K=NUL;
+ if (game.place[obj] == PLAC[DRAGON] || game.place[obj] == FIXD[DRAGON])
+
MOVE(obj,k)
;
+ }
+ game.loc=
k
;
+ 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;
return(2011);
} else {
if (game.foobar != 0)SPK=151;
return(2011);
} else {
-
game.foobar=k;
if (k != 4) return(2009);
game.foobar=0;
game.foobar=k;
if (k != 4) return(2009);
game.foobar=0;
@@
-524,7
+524,7
@@
static int find(token_t obj)
{
if (AT(obj) ||
(LIQ(0) == obj && AT(BOTTLE)) ||
{
if (AT(obj) ||
(LIQ(0) == obj && AT(BOTTLE)) ||
-
K
== LIQLOC(game.loc) ||
+
obj
== LIQLOC(game.loc) ||
(obj == DWARF && ATDWRF(game.loc) > 0))
SPK=94;
if (game.closed)SPK=138;
(obj == DWARF && ATDWRF(game.loc) > 0))
SPK=94;
if (game.closed)SPK=138;