projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
read() and reservoir() handlers.
[open-adventure.git]
/
actions2.c
diff --git
a/actions2.c
b/actions2.c
index 2788e1a22391ef571099cd688cc751fa4604656f..72bd0b01e45abaa48d4ef1b0d6f9c4bf1c9d2622 100644
(file)
--- a/
actions2.c
+++ b/
actions2.c
@@
-7,6
+7,15
@@
int carry(long obj)
{
int carry(long obj)
{
+ if (obj == INTRANSITIVE) {
+ /* Carry, no object given yet. OK if only one object present. */
+ if(game.atloc[game.loc] == 0 ||
+ game.link[game.atloc[game.loc]] != 0 ||
+ ATDWRF(game.loc) > 0)
+ return(8000);
+ obj=game.atloc[game.loc];
+ }
+
if (TOTING(obj)) return(2011);
SPK=25;
if (obj == PLANT && game.prop[PLANT] <= 0)SPK=115;
if (TOTING(obj)) return(2011);
SPK=25;
if (obj == PLANT && game.prop[PLANT] <= 0)SPK=115;
@@
-134,7
+143,7
@@
int discard(long obj, bool just_do_it) {
* objects fall into two categories: enemies (snake, dwarf, etc.) and others
* (bird, clam, machine). Ambiguous if 2 enemies, or no enemies but 2 others. */
* objects fall into two categories: enemies (snake, dwarf, etc.) and others
* (bird, clam, machine). Ambiguous if 2 enemies, or no enemies but 2 others. */
-int attack(FILE *input, long
obj, long verb
) {
+int attack(FILE *input, long
verb, long obj
) {
int i =ATDWRF(game.loc);
if (obj == 0) {
if (i > 0)
int i =ATDWRF(game.loc);
if (obj == 0) {
if (i > 0)
@@
-226,7
+235,7
@@
int throw_support(long spk)
return(8);
}
return(8);
}
-int throw(FILE *cmdin, long
obj, long verb
)
+int throw(FILE *cmdin, long
verb, long obj
)
/* Throw. Same as discard unless axe. Then same as attack except
* ignore bird, and if dwarf is present then one might be killed.
* (Only way to do so!) Axe also special for dragon, bear, and
/* Throw. Same as discard unless axe. Then same as attack except
* ignore bird, and if dwarf is present then one might be killed.
* (Only way to do so!) Axe also special for dragon, bear, and
@@
-276,7
+285,7
@@
int throw(FILE *cmdin, long obj, long verb)
JUGGLE(BEAR);
return(2011);
}
JUGGLE(BEAR);
return(2011);
}
- return(attack(cmdin,
0, verb
));
+ return(attack(cmdin,
verb, 0
));
}
if (randrange(NDWARVES+1) < game.dflag) {
}
if (randrange(NDWARVES+1) < game.dflag) {