Early Roguelike Collection: arogue7/misc.c comparison

comparison arogue7/misc.c @ 225:4f6e056438eb

Merge the GCC5 and build fix branches.

author	John "Elwin" Edwards
date	Wed, 02 Mar 2016 21:28:34 -0500
parents	f9ef86cf22b2
children	e1cd27c5464f

comparison

equal deleted inserted replaced

-:4d0f53998e8a
+:4f6e056438eb
 */
 #include "curses.h"
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
 #include "rogue.h"
 #ifdef PC7300
 #include "menu.h"
 #endif
 /*
 * changeclass:
 *	Change the player's class to the specified one.
 */
-changeclass(newclass)
+void
-int newclass;
+changeclass(int 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, NULL))
 	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;
 		touchwin(cw);
 	}
 }
 }
-do_panic(who)
+/* who: Kind of monster to panic (all if who is NULL) */
-int who;	/* Kind of monster to panic (all if who is NULL) */
+void
+do_panic(int who)
 {
 register int x,y;
 register struct linked_list *mon, *item;
 register struct thing *th;
 /*
 * print miscellaneous magic bonuses
 */
 char *
-misc_name(obj)
+misc_name(struct object *obj)
-register struct object *obj;
 {
 static char buf[LINELEN];
 char buf1[LINELEN];
 buf[0] = '\0';
 }
 strcat (buf, buf1);
 return buf;
 }
-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): ");
 static char Displines[MAXQUILL+1][LINELEN+1];	/* The lines themselves */
 #endif
 /*
 * 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,
 	    goto got_scroll;
 	}
 #endif
 	/* Should we overlay? */
 	if (menu_overlay && MAXQUILL + 3 < lines / 2) {
-	    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 / 2) {
 		over_win(cw, hw, MAXQUILL + 5, maxlen + 3,
-			    0, curlen, NULL);
+			    0, curlen, '\0');
 	    }
 	    else draw(hw);
 	    which_scroll = (int) (readchar() - 'a');
 	}
 	(OBJPTR(item))->o_pos = hero;
 	fall(item, TRUE);
 }
 }
-use_mm(which)
+void
-int which;
+use_mm(int which)
 {
 register struct object *obj = NULL;
 register struct linked_list *item = NULL;
 bool cursed, blessed, 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 HEIL_ANKH:
 	    case YENDOR_AMULET:
 	    case STONEBONES_AMULET:
 		/* Nothing happens by this mode */
 		msg("Nothing happens.");
 	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);
 	/*
 	 * dust of disappearance makes the player invisible for a while
 	 */
 	when MM_DISAPPEAR:
 	    m_know[MM_DISAPPEAR] = TRUE;
 *	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 arogue7/misc.c @ 225:4f6e056438eb