diff options
Diffstat (limited to 'rogue/pack.c')
| -rw-r--r-- | rogue/pack.c | 73 |
1 files changed, 28 insertions, 45 deletions
diff --git a/rogue/pack.c b/rogue/pack.c index 793bf1f0..ac516df0 100644 --- a/rogue/pack.c +++ b/rogue/pack.c @@ -1,4 +1,4 @@ -/* $NetBSD: pack.c,v 1.9 2008/01/14 00:23:52 dholland Exp $ */ +/* $NetBSD: pack.c,v 1.10 2008/01/14 03:50:02 dholland Exp $ */ /* * Copyright (c) 1988, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)pack.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pack.c,v 1.9 2008/01/14 00:23:52 dholland Exp $"); +__RCSID("$NetBSD: pack.c,v 1.10 2008/01/14 03:50:02 dholland Exp $"); #endif #endif /* not lint */ @@ -58,9 +58,7 @@ __RCSID("$NetBSD: pack.c,v 1.9 2008/01/14 00:23:52 dholland Exp $"); const char *curse_message = "you can't, it appears to be cursed"; object * -add_to_pack(obj, pack, condense) - object *obj, *pack; - int condense; +add_to_pack(object *obj, object *pack, int condense) { object *op; @@ -87,8 +85,7 @@ add_to_pack(obj, pack, condense) } void -take_from_pack(obj, pack) - object *obj, *pack; +take_from_pack(object *obj, object *pack) { while (pack->next_object != obj) { pack = pack->next_object; @@ -101,9 +98,7 @@ take_from_pack(obj, pack) */ object * -pick_up(row, col, status) - short *status; - int row, col; +pick_up(int row, int col, short *status) { object *obj; @@ -111,7 +106,7 @@ pick_up(row, col, status) if (levitate) { messagef(0, "you're floating in the air!"); - return((object *)0); + return NULL; } obj = object_at(&level_objects, row, col); if (!obj) { @@ -128,7 +123,7 @@ pick_up(row, col, status) if (id_scrolls[SCARE_MONSTER].id_status == UNIDENTIFIED) { id_scrolls[SCARE_MONSTER].id_status = IDENTIFIED; } - return((object *)0); + return NULL; } if (obj->what_is == GOLD) { rogue.gold += obj->quantity; @@ -139,7 +134,7 @@ pick_up(row, col, status) } if (pack_count(obj) >= MAX_PACK_COUNT) { messagef(1, "pack too full"); - return((object *)0); + return NULL; } dungeon[row][col] &= ~(OBJECT); take_from_pack(obj, &level_objects); @@ -149,7 +144,7 @@ pick_up(row, col, status) } void -drop() +drop(void) { object *obj, *new; short ch; @@ -211,8 +206,7 @@ drop() } object * -check_duplicate(obj, pack) - object *obj, *pack; +check_duplicate(object *obj, object *pack) { object *op; @@ -245,7 +239,7 @@ check_duplicate(obj, pack) } short -next_avail_ichar() +next_avail_ichar(void) { object *obj; int i; @@ -270,16 +264,14 @@ next_avail_ichar() } void -wait_for_ack() +wait_for_ack(void) { while (rgetchar() != ' ') ; } short -pack_letter(prompt, mask) - const char *prompt; - unsigned short mask; +pack_letter(const char *prompt, unsigned short mask) { short ch; unsigned short tmask = mask; @@ -315,7 +307,7 @@ pack_letter(prompt, mask) } void -take_off() +take_off(void) { char desc[DCOLS]; object *obj; @@ -338,7 +330,7 @@ take_off() } void -wear() +wear(void) { short ch; object *obj; @@ -370,18 +362,16 @@ wear() } void -unwear(obj) - object *obj; +unwear(object *obj) { if (obj) { obj->in_use_flags &= (~BEING_WORN); } - rogue.armor = (object *)0; + rogue.armor = NULL; } void -do_wear(obj) - object *obj; +do_wear(object *obj) { rogue.armor = obj; obj->in_use_flags |= BEING_WORN; @@ -389,7 +379,7 @@ do_wear(obj) } void -wield() +wield(void) { short ch; object *obj; @@ -425,25 +415,23 @@ wield() } void -do_wield(obj) - object *obj; +do_wield(object *obj) { rogue.weapon = obj; obj->in_use_flags |= BEING_WIELDED; } void -unwield(obj) - object *obj; +unwield(object *obj) { if (obj) { obj->in_use_flags &= (~BEING_WIELDED); } - rogue.weapon = (object *)0; + rogue.weapon = NULL; } void -call_it() +call_it(void) { short ch; object *obj; @@ -474,8 +462,7 @@ call_it() } short -pack_count(new_obj) - const object *new_obj; +pack_count(const object *new_obj) { object *obj; short count = 0; @@ -502,9 +489,7 @@ pack_count(new_obj) } boolean -mask_pack(pack, mask) - const object *pack; - unsigned short mask; +mask_pack(const object *pack, unsigned short mask) { while (pack->next_object) { pack = pack->next_object; @@ -516,9 +501,7 @@ mask_pack(pack, mask) } boolean -is_pack_letter(c, mask) - short *c; - unsigned short *mask; +is_pack_letter(short *c, unsigned short *mask) { if (((*c == '?') || (*c == '!') || (*c == ':') || (*c == '=') || (*c == ')') || (*c == ']') || (*c == '/') || (*c == ','))) { @@ -555,13 +538,13 @@ is_pack_letter(c, mask) } boolean -has_amulet() +has_amulet(void) { return(mask_pack(&rogue.pack, AMULET)); } void -kick_into_pack() +kick_into_pack(void) { object *obj; char desc[DCOLS]; |