Early Roguelike Collection: xrogue/player.c comparison

comparison xrogue/player.c @ 225:4f6e056438eb

Merge the GCC5 and build fix branches.

author	John "Elwin" Edwards
date	Wed, 02 Mar 2016 21:28:34 -0500
parents	f54901b9c39b
children	2236ef808bcb

comparison

equal deleted inserted replaced

-:4d0f53998e8a
+:4f6e056438eb
 #include <ctype.h>
 #include <string.h>
 #include <curses.h>
 #include "rogue.h"
+bool pick_spell(struct spells spells[], int ability, int num_spells, int power,
+const char *prompt, const char *type);
 /*
 * affect:
 *      cleric affecting undead
 */
-affect()
+void
+affect(void)
 {
 register struct linked_list *item;
 register struct thing *tp;
 register char *mname;
 bool see;
 /*
 * the cleric asks his deity for a spell
 */
-pray()
+void
+pray(void)
 {
 register int num_prayers, prayer_ability, which_prayer;
 which_prayer = num_prayers = prayer_ability =  0;
 msg("Your prayer has been granted. ");
 if (cleric_spells[which_prayer].s_type == TYP_POTION)
 quaff(          cleric_spells[which_prayer].s_which,
-NULL,
+0,
 cleric_spells[which_prayer].s_flag,
 FALSE);
 else if (cleric_spells[which_prayer].s_type == TYP_SCROLL)
 read_scroll(    cleric_spells[which_prayer].s_which,
 cleric_spells[which_prayer].s_flag,
 /*
 * the magician is going to try and cast a spell
 */
-cast()
+void
+cast(void)
 {
 register int spell_ability, which_spell, num_spells;
 if (player.t_ctype != C_MAGICIAN && player.t_ctype != C_RANGER) {
 msg("You are not permitted to cast spells.");
 msg("Your spell is successful. ");
 if (magic_spells[which_spell].s_type == TYP_POTION)
 quaff(  magic_spells[which_spell].s_which,
-NULL,
+0,
 magic_spells[which_spell].s_flag,
 FALSE);
 else if (magic_spells[which_spell].s_type == TYP_SCROLL)
 read_scroll(    magic_spells[which_spell].s_which,
 magic_spells[which_spell].s_flag,
 /*
 * the druid asks his deity for a spell
 */
-chant()
+void
+chant(void)
 {
 register int num_chants, chant_ability, which_chant;
 which_chant = num_chants = chant_ability = 0;
 msg("Your chant has been granted. ");
 if (druid_spells[which_chant].s_type == TYP_POTION)
 quaff(          druid_spells[which_chant].s_which,
-NULL,
+0,
 druid_spells[which_chant].s_flag,
 FALSE);
 else if (druid_spells[which_chant].s_type == TYP_SCROLL)
 read_scroll(    druid_spells[which_chant].s_which,
 druid_spells[which_chant].s_flag,
 chant_time += druid_spells[which_chant].s_cost;
 }
 /* Constitution bonus */
-const_bonus()   /* Hit point adjustment for changing levels */
+int
+const_bonus(void)   /* Hit point adjustment for changing levels */
 {
 register int bonus;
 if (pstats.s_const > 9 && pstats.s_const < 18)
 bonus = 0;
 else if (pstats.s_const >= 18 && pstats.s_const < 20)
 * to give a slime-mold to Alteran (a unique monster) in order to
 * get the special "Card of Alteran" quest item.  There's no other
 * way to get this artifact and remain alive.
 */
-give(th)
+void
-register struct thing *th;
+give(struct thing *th)
 {
 /*
 * Find any monster within one space of you
 */
 struct linked_list *ll;
 /*
 * Frighten a monster.  Useful for the 'good' characters.
 */
-fright(th)
+void
-register struct thing *th;
+fright(struct thing *th)
 {
 /*
 * Find any monster within one space of you
 */
 register int x,y;
 /*
 * gsense: Sense gold
 */
-gsense()
+void
+gsense(void)
 {
 /* Thief & assassin can do this, but fighter & ranger can later */
 if (player.t_ctype == C_THIEF     || player.t_ctype == C_ASSASSIN ||
 ((player.t_ctype == C_FIGHTER || player.t_ctype == C_RANGER)  &&
 pstats.s_lvl >= 12)) {
-read_scroll(S_GFIND, NULL, FALSE);
+read_scroll(S_GFIND, 0, FALSE);
 }
 else msg("You seem to have no gold sense.");
 return;
 }
 /*
 * xsense: Sense traps
 */
-xsense()
+void
+xsense(void)
 {
 /* Only thief can do this, but assassin, fighter, & monk can later */
 if (player.t_ctype == C_THIEF   || ((player.t_ctype == C_ASSASSIN ||
 player.t_ctype == C_FIGHTER || player.t_ctype == C_MONK)      &&
 pstats.s_lvl >= 14)) {
-read_scroll(S_FINDTRAPS, NULL, FALSE);
+read_scroll(S_FINDTRAPS, 0, FALSE);
 }
 else msg("You seem not to be able to sense traps.");
 return;
 }
 /*
 * steal:
 *      Steal in direction given in delta
 */
-steal()
+void
+steal(void)
 {
 register struct linked_list *item;
 register struct thing *tp;
 register char *mname;
 coord new_pos;
 /*
 * Take charmed monsters with you via up or down commands.
 */
-take_with()
+void
+take_with(void)
 {
 register struct thing *tp;
 register struct linked_list *item;
 struct linked_list *nitem;
 register int t;
 }
 /*
 * this routine lets the player pick the spell that they
 * want to cast regardless of character class
+* spells: spell list
+* ability: spell ability
+* num_spells: number of spells that can be cast
+* power: spell power
+* prompt: prompt for spell list
+* type: type of thing--> spell, prayer, chant
 */
-pick_spell(spells, ability, num_spells, power, prompt, type)
+bool
-struct spells   spells[];       /* spell list                            */
+pick_spell(struct spells spells[], int ability, int num_spells, int power,
-int             ability;        /* spell ability                         */
+const char *prompt, const char *type)
-int             num_spells;     /* number of spells that can be cast     */
-int             power;          /* spell power                           */
-const char      *prompt;        /* prompt for spell list                 */
-const char      *type;          /* type of thing--> spell, prayer, chant */
 {
 bool                nohw = FALSE;
 register int        i;
 int                 curlen,
 maxlen = 0,
 getyx(hw, dummy, curlen);
 if (maxlen < curlen) maxlen = curlen;
 /* Should we overlay? */
 if (menu_overlay && num_spells + 3 < lines - 3) {
-over_win(cw, hw, num_spells + 5, maxlen + 3, 0, curlen, NULL);
+over_win(cw, hw, num_spells + 5, maxlen + 3, 0, curlen, '\0');
 }
 else draw(hw);
 }
 if (!nohw) {
 if (maxlen < curlen) maxlen = curlen;
 /* Should we overlay? */
 if (menu_overlay && num_spells + 3 < lines - 3) {
 over_win(cw, hw, num_spells + 5, maxlen + 3,
-0, curlen, NULL);
+0, curlen, '\0');
 }
 else draw(hw);
 which_spell = (int) (wgetch(cw) - 'a');
 }
 /*
 * opt_player:
 * Let the player know what's happening with himself
 */
-opt_player()
+void
+opt_player(void)
 {
 int i = 1;  /* initialize counters */
 int j = 2;
 wclear(hw);
 if (i > 1 && i < 17) {
 j = 39;
 if (menu_overlay) {     /* Print the list. */
 wmove(hw, i+2, 0);
 wprintw(hw, spacemsg);
-over_win(cw, hw, i+3, j, i+2, 27, NULL);
+over_win(cw, hw, i+3, j, i+2, 27, '\0');
 }
 else {
 wmove(hw, i+2, 0);
 wprintw(hw, spacemsg);
 draw(hw);
 if (menu_overlay) {     /* Print the list. */
 wmove(hw, i+2, 0);
 wprintw(hw, spacemsg);
 if (j > 2) j = 78;
 else j = 39;
-over_win(cw, hw, i+3, j, i+2, 27, NULL);
+over_win(cw, hw, i+3, j, i+2, 27, '\0');
 }
 else {
 wmove(hw, i+2, 0);
 wprintw(hw, spacemsg);
 draw(hw);

Mercurial > hg > early-roguelike

comparison xrogue/player.c @ 225:4f6e056438eb