X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions2.c;h=5b0bd86428bc8754e6e24de8b04aa6b32283ab14;hb=ee20cd086108d4e67ca76fbf32c0f258bd33c419;hp=2788e1a22391ef571099cd688cc751fa4604656f;hpb=1ca74bfc3992e1212e9d58579c434259025e9dba;p=open-adventure.git diff --git a/actions2.c b/actions2.c index 2788e1a..5b0bd86 100644 --- a/actions2.c +++ b/actions2.c @@ -134,7 +134,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. */ -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) @@ -226,7 +226,7 @@ int throw_support(long spk) 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 @@ -276,7 +276,7 @@ int throw(FILE *cmdin, long obj, long verb) JUGGLE(BEAR); return(2011); } - return(attack(cmdin, 0, verb)); + return(attack(cmdin, verb, 0)); } if (randrange(NDWARVES+1) < game.dflag) {