Early Roguelike Collection: xrogue/pack.c comparison

comparison xrogue/pack.c @ 220:f54901b9c39b

XRogue: convert to ANSI-style function declarations.

author	John "Elwin" Edwards
date	Wed, 02 Mar 2016 21:13:26 -0500
parents	cadff8f047a1
children	7c1cb43f346e

comparison

equal deleted inserted replaced

-:f9ef86cf22b2
+:f54901b9c39b
 #include <curses.h>
 #include <ctype.h>
 #include <string.h>
 #include "rogue.h"
+bool is_type(struct object *obj, int type);
 /*
 * add_pack:
 *      Pick up an object and add it to the pack.  If the argument is non-null
 * use it as the linked_list pointer instead of gettting it off the ground.
 */
 bool
-add_pack(item, silent)
+add_pack(struct linked_list *item, bool silent)
-register struct linked_list *item;
-bool silent;
 {
 register struct linked_list *ip, *lp = NULL, *ap;
 register struct object *obj, *op = NULL;
 register bool exact, from_floor;
 bool giveflag = 0;
 /*
 * inventory:
 *      list what is in the pack
 */
-inventory(list, type)
+bool
-register struct linked_list *list;
+inventory(struct linked_list *list, int type)
-register int type;
 {
 register struct object *obj;
 register char ch;
 register int n_objs, cnt, maxx = 0, curx;
 char inv_temp[2*LINELEN+1];
 * picky_inven:
 *      Allow player to inventory a single item
 */
 void
-picky_inven()
+picky_inven(void)
 {
 register struct linked_list *item;
 register char ch, mch;
 if (pack == NULL)
 }
 /*
 * get_item:
 *      pick something out of a pack for a purpose
+*	purpose: NULL if we should be silent (no prompts)
 */
 struct linked_list *
-get_item(list, purpose, type, askfirst, showcost)
+get_item(struct linked_list *list, char *purpose, int type, bool askfirst,
-reg struct linked_list *list;
+bool showcost)
-char *purpose;  /* NULL if we should be silent (no prompts) */
-int type;
-bool askfirst, showcost;
 {
 reg struct linked_list *item;
 reg struct object *obj;
 reg int cnt, pagecnt, ch, och, maxx, curx, confused;
 struct linked_list *saveitem = NULL;
 curx = strlen(description);
 if (maxx < curx) maxx = curx;
 /* Write the screen */
 if ((menu_overlay && cnt < lines - 3) || cnt == 1) {
-over_win(cw, hw, cnt + 2, maxx + 3, cnt, curx, NULL);
+over_win(cw, hw, cnt + 2, maxx + 3, cnt, curx, '\0');
 cnt = -1;       /* Indicate we used over_win */
 }
 else draw(hw);
 if (purpose) {
 else
 msg ("You can't %s that!", purpose);
 }
 }
-pack_char(list, obj)
+char
-register struct object *obj;
+pack_char(struct linked_list *list, struct object *obj)
-struct linked_list *list;
 {
 register struct linked_list *item;
 register char c;
 c = 'a';
 /*
 * cur_null:
 *      This updates cur_weapon etc for dropping things
 */
-cur_null(op)
+void
-reg struct object *op;
+cur_null(struct object *op)
 {
 if (op == cur_weapon)             cur_weapon = NULL;
 else if (op == cur_armor)         cur_armor = NULL;
 else if (op == cur_ring[LEFT_1])  cur_ring[LEFT_1] = NULL;
 else if (op == cur_ring[LEFT_2])  cur_ring[LEFT_2] = NULL;
 /*
 * idenpack:
 *      Identify all the items in the pack
 */
-idenpack()
+void
+idenpack(void)
 {
 reg struct linked_list *pc;
 for (pc = pack ; pc != NULL ; pc = next(pc))
 whatis(pc);
 }
-is_type (obj, type)
+bool
-register struct object *obj;
+is_type(struct object *obj, int type)
-register int type;
 {
 register bool current;
 if (type == obj->o_type)
 return (TRUE);
 }
 }
 return(FALSE);
 }
-del_pack(item)
+void
-register struct linked_list *item;
+del_pack(struct linked_list *item)
 {
 register struct object *obj;
 obj = OBJPTR(item);
 if (obj->o_count > 1) {
 * carry_obj:
 *      Check to see if a monster is carrying something and, if so, give
 * it to him.
 */
-carry_obj(mp, chance)
+void
-register struct thing *mp;
+carry_obj(struct thing *mp, int chance)
-int chance;
 {
 reg struct linked_list *item;
 reg struct object *obj;
 /*
 * floor and so the hero will know where it is if he's trying to
 * avoid it. Note that only UNIQUEs carry relics.
 */
 if (on(*mp, ISUNIQUE)) {
 if (on(*mp, CARRYMDAGGER)) {
-item = spec_item(RELIC, MUSTY_DAGGER, NULL, NULL);
+item = spec_item(RELIC, MUSTY_DAGGER, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYCLOAK)) {
-item = spec_item(RELIC, EMORI_CLOAK, NULL, NULL);
+item = spec_item(RELIC, EMORI_CLOAK, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYANKH)) {
-item = spec_item(RELIC, HEIL_ANKH, NULL, NULL);
+item = spec_item(RELIC, HEIL_ANKH, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYSTAFF)) {
-item = spec_item(RELIC, MING_STAFF, NULL, NULL);
+item = spec_item(RELIC, MING_STAFF, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYWAND)) {
-item = spec_item(RELIC, ORCUS_WAND, NULL, NULL);
+item = spec_item(RELIC, ORCUS_WAND, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYROD)) {
-item = spec_item(RELIC, ASMO_ROD, NULL, NULL);
+item = spec_item(RELIC, ASMO_ROD, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYYAMULET)) {
-item = spec_item(RELIC, YENDOR_AMULET, NULL, NULL);
+item = spec_item(RELIC, YENDOR_AMULET, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYBAMULET)) {
-item = spec_item(RELIC, STONEBONES_AMULET, NULL, NULL);
+item = spec_item(RELIC, STONEBONES_AMULET, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYMANDOLIN)) {
-item = spec_item(RELIC, BRIAN_MANDOLIN, NULL, NULL);
+item = spec_item(RELIC, BRIAN_MANDOLIN, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYEYE)) {
-item = spec_item(RELIC, EYE_VECNA, NULL, NULL);
+item = spec_item(RELIC, EYE_VECNA, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYAXE)) {
-item = spec_item(RELIC, AXE_AKLAD, NULL, NULL);
+item = spec_item(RELIC, AXE_AKLAD, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYQUILL)) {
 register int i, howmany;
-item = spec_item(RELIC, QUILL_NAGROM, NULL, NULL);
+item = spec_item(RELIC, QUILL_NAGROM, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 obj->o_charges = rnd(QUILLCHARGES);
 attach(mp->t_pack, item);
 howmany = roll(4,3);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 }
 if (on(*mp, CARRYMSTAR)) {
-item = spec_item(RELIC, HRUGGEK_MSTAR, NULL, NULL);
+item = spec_item(RELIC, HRUGGEK_MSTAR, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYFLAIL)) {
-item = spec_item(RELIC, YEENOGHU_FLAIL, NULL, NULL);
+item = spec_item(RELIC, YEENOGHU_FLAIL, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYHORN)) {
-item = spec_item(RELIC, GERYON_HORN, NULL, NULL);
+item = spec_item(RELIC, GERYON_HORN, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYSURTURRING)) {
-item = spec_item(RELIC, SURTUR_RING, NULL, NULL);
+item = spec_item(RELIC, SURTUR_RING, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 if (on(*mp, CARRYCARD)) {
-item = spec_item(RELIC, ALTERAN_CARD, NULL, NULL);
+item = spec_item(RELIC, ALTERAN_CARD, 0, 0);
 obj = OBJPTR(item);
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 }
 /*
 * If it carries gold, give it some
 */
 if (on(*mp, CARRYGOLD) && rnd(100) < chance) {
-item = spec_item(GOLD, NULL, NULL, NULL);
+item = spec_item(GOLD, 0, 0, 0);
 obj = OBJPTR(item);
 obj->o_count = GOLDCALC + GOLDCALC;
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 when 33: type = E_ELDERBERRY;
 when 36: type = E_BLUEBERRY;
 when 40: type = E_SLIMEMOLD;  /* monster food */
 otherwise: type = E_RATION;
 }
-item = spec_item(FOOD, type, NULL, NULL);
+item = spec_item(FOOD, type, 0, 0);
 obj = OBJPTR(item);
 obj->o_weight = things[TYP_FOOD].mi_wght;
 obj->o_pos = mp->t_pos;
 attach(mp->t_pack, item);
 }
 *      nothing is there, do nothing.  If there is one thing, pick it
 *      up.  If there are multiple things, prompt the player for what
 *      he wants (* means everything).
 */
-grab(y, x)
+int
-register int y, x;
+grab(int y, int x)
 {
 register struct linked_list *next_item, *item;
 register struct object *obj;
 register int cnt, pagecnt;
 int num_there = 0, ch, och;
 /*
 * If we have fewer than half a screenful, don't clear the screen.
 * Leave 3 blank lines at the bottom and 3 blank columns to he right.
 */
 if (menu_overlay && num_there < lines - 3) {
-over_win(cw, hw, num_there + 2, maxlen + 3, num_there, curlen, NULL);
+over_win(cw, hw, num_there + 2, maxlen + 3, num_there, curlen, '\0');
 pagecnt = -1; /* Indicate we used over_win */
 }
 else draw(hw);          /* write screen */
 for (;;) {
 * screen.  Leave an extra blank line at the bottom and
 * 3 blank columns to the right.
 */
 if (menu_overlay && num_there < lines - 3) {
 over_win(cw, hw, num_there + 2, maxlen + 3,
-num_there, 49, NULL);
+num_there, 49, '\0');
 cnt = -1;   /* Indicate we used over_win */
 }
 else draw(hw);          /* write screen */
 continue;
 }
 * make_sell_pack:
 *
 *      Create a pack for sellers (a la quartermaster)
 */
-make_sell_pack(tp)
+void
-struct thing *tp;
+make_sell_pack(struct thing *tp)
 {
 reg struct linked_list *item;
 reg struct object *obj;
 reg int sell_type = 0, nitems, i;

Mercurial > hg > early-roguelike

comparison xrogue/pack.c @ 220:f54901b9c39b