projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Eliminate some promiscuous variable reuse.
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index 0b28f00a2411e4b1673e9836b604c9c24f22be31..be6ec81bb49c6595fb176d098f957660223d750d 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-166,7
+166,7
@@
void pspeak(vocab_t msg, enum speaktype mode, int skip, ...)
vspeak(objects[msg].inventory, ap);
break;
case look:
vspeak(objects[msg].inventory, ap);
break;
case look:
- vspeak(objects[msg].
long
s[skip], ap);
+ vspeak(objects[msg].
description
s[skip], ap);
break;
case hear:
vspeak(objects[msg].sounds[skip], ap);
break;
case hear:
vspeak(objects[msg].sounds[skip], ap);
@@
-174,6
+174,9
@@
void pspeak(vocab_t msg, enum speaktype mode, int skip, ...)
case study:
vspeak(objects[msg].texts[skip], ap);
break;
case study:
vspeak(objects[msg].texts[skip], ap);
break;
+ case change:
+ vspeak(objects[msg].changes[skip], ap);
+ break;
}
va_end(ap);
}
}
va_end(ap);
}
@@
-535,7
+538,7
@@
long atdwrf(long where)
long setbit(long bit)
/* Returns 2**bit for use in constructing bit-masks. */
{
long setbit(long bit)
/* Returns 2**bit for use in constructing bit-masks. */
{
- return (1 << bit);
+ return (1
L
<< bit);
}
bool tstbit(long mask, int bit)
}
bool tstbit(long mask, int bit)