Early Roguelike Collection: xrogue/misc.c comparison

comparison xrogue/misc.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
 /*
 * changeclass:
 *      Change the player's class to the specified one.
 */
-changeclass(newclass)
+void
-long *newclass;
+changeclass(long *newclass)
 {
 if (*newclass == player.t_ctype) {
 msg("You feel more skillful.");
 raise_level();
 }
 /*
 * Use the relic that our monster is wielding.
 */
-m_use_relic(monster)
+void
-register struct thing *monster;
+m_use_relic(struct thing *monster)
 {
 register struct object *obj;
 /* Make sure we really have it */
 if (monster->t_using) obj = OBJPTR(monster->t_using);
 hit_monster(unc(missile.o_pos), &missile, monster);
 monster->t_artifact = monster->t_artifact * 4 / 5;
 }
 when EMORI_CLOAK:
 debug("stunning with Emori's cloak");
-do_zap(monster, obj, &monster->t_newpos, WS_PARALYZE, NULL);
+do_zap(monster, obj, &monster->t_newpos, WS_PARALYZE, 0);
 obj->o_charges = 0;
 when ASMO_ROD: {
 char *name;
 monster->t_using = NULL;
 }
 /*
 * add something to the contents of something else
+* bag: the holder of the items
+* item: the item to put inside
 */
-put_contents(bag, item)
+void
-register struct object *bag;            /* the holder of the items */
+put_contents(struct object *bag, struct linked_list *item)
-register struct linked_list *item;      /* the item to put inside  */
 {
 register struct linked_list *titem;
 register struct object *tobj;
 bag->o_ac++;
 }
 }
 /*
 * remove something from something else
+* bag: the holder of the items
 */
-take_contents(bag, item)
+void
-register struct object *bag;            /* the holder of the items */
+take_contents(struct object *bag, struct linked_list *item)
-register struct linked_list *item;
 {
 if (bag->o_ac <= 0) {
 msg("Nothing to take out");
 return;
 if (!add_pack(item, FALSE))
 put_contents(bag, item);
 }
-do_bag(item)
+void
-register struct linked_list *item;
+do_bag(struct linked_list *item)
 {
 register struct linked_list *titem = NULL;
 register struct object *obj, *tobj;
 bool doit = TRUE;
 restscr(cw);
 }
 }
 }
-do_panic(who)
+void
-int who;        /* Kind of monster to panic (all if who is NULL) */
+do_panic(int who)
 {
+/* who: kind of monster to panic (all if who is 0) */
 register int x,y;
 register struct linked_list *mon, *item;
 register struct thing *th;
 for (x = hero.x-2; x <= hero.x+2; x++) {
 /*
 * print miscellaneous magic bonuses
 */
 int
-misc_name(str,obj)
+misc_name(char *str, struct object *obj)
-char *str;
-register struct object *obj;
 {
 char buf1[LINELEN];
 *str = 0;
 buf1[0] = 0;
 strcat(str, buf1);
 return(0);
 }
-use_emori()
+void
+use_emori(void)
 {
 char selection;     /* Cloak function */
 int state = 0;      /* Menu state */
 msg("What do you want to do? (* for a list): ");
 /*
 * try to write a scroll with the quill of Nagrom
 */
-use_quill(obj)
+void
-struct object *obj;
+use_quill(struct object *obj)
 {
 struct linked_list  *item;
 register int        i,
 scroll_ability;
 int                 which_scroll,
 getyx(hw, dummy, curlen);
 if (maxlen < curlen) maxlen = curlen;
 /* Should we overlay? */
 if (menu_overlay && MAXQUILL + 3 < lines - 3) {
-over_win(cw, hw, MAXQUILL + 5, maxlen + 3, 0, curlen, NULL);
+over_win(cw, hw, MAXQUILL + 5, maxlen + 3, 0, curlen, '\0');
 }
 else draw(hw);
 }
 if (!nohw) {
 if (maxlen < curlen) maxlen = curlen;
 /* Should we overlay? */
 if (menu_overlay && MAXQUILL + 3 < lines - 3) {
 over_win(cw, hw, MAXQUILL + 5, maxlen + 3,
-0, curlen, NULL);
+0, curlen, '\0');
 }
 else draw(hw);
 which_scroll = (int) (wgetch(cw) - 'a');
 }
 /*
 * Use something
 */
-use_mm(which)
+void
-int which;
+use_mm(int which)
 {
 register struct object *obj = NULL;
 register struct linked_list *item = NULL;
 bool is_mm;
 /* Put monsters around us to sleep */
 read_scroll(S_HOLD, 0, FALSE);
 when GERYON_HORN:
 /* Chase close monsters away */
 msg("The horn blasts a shrill tone.");
-do_panic(NULL);
+do_panic(0);
 when EYE_VECNA:
 msg("The pain slowly subsides.. ");
 when HEIL_ANKH:
 msg("Your hand grows very warm. ");
 when YENDOR_AMULET:
 case MM_JUG:
 if (obj->o_ac == JUG_EMPTY) {
 msg("The jug is empty");
 break;
 }
-quaff (obj->o_ac, NULL, NULL, FALSE);
+quaff (obj->o_ac, 0, 0, FALSE);
 obj->o_ac = JUG_EMPTY;
 fuse (alchemy, obj, ALCHEMYTIME, AFTER);
 if (!(obj->o_flags & ISKNOW))
 whatis(item);
 if (obj->o_charges <= 0) {
 msg("The drum is broken.");
 break;
 }
 obj->o_charges--;
-do_panic(NULL);
+do_panic(0);
 return;
 /*
 * dust of disappearance makes the player invisible for a while
 */
 when MM_DISAPPEAR:
 str = "flashes brightly";
 else
 str = "vibrates softly";
 msg("You rub the crystal and it %s...  ", str);
 /* cure him */
-read_scroll(S_CURING, NULL, FALSE);
+read_scroll(S_CURING, 0, FALSE);
 /* give him weird hands */
 turn_on(player, CANHUH);
 msg("Your fingertips turn blue.  ");
 /* add intelligence */
 if (player.t_ctype == C_MAGICIAN) {
 *      Return how long it takes to use an item.  For now we only give time
 *      for MM, RELIC, SCROLL, and POTION items.
 */
 int
-usage_time(item)
+usage_time(struct linked_list *item)
-struct linked_list *item;
 {
 register struct object *obj;
 register int units = -1;
 obj = OBJPTR(item);

Mercurial > hg > early-roguelike

comparison xrogue/misc.c @ 220:f54901b9c39b