Early Roguelike Collection: rogue4/rings.c annotate

annotate rogue4/rings.c @ 215:1b73a8641b37

rogue4: fix most GCC5 warnings. Converting all function definitions to ANSI style accounts for most of the change. This has exposed other problems, such as daemons not actually being their stated type, that will require more careful solutions.

author	John "Elwin" Edwards
date	Wed, 27 Jan 2016 19:41:05 -0500
parents	9535a08ddc39
children

rev	line source
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	1 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	2 * Routines dealing specifically with rings
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	3 *
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	4 * @(#)rings.c 4.13 (Berkeley) 1/28/82
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	5 *
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	6 * Rogue: Exploring the Dungeons of Doom
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	7 * Copyright (C) 1980, 1981, 1982 Michael Toy, Ken Arnold and Glenn Wichman
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	8 * All rights reserved.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	9 *
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	10 * See the file LICENSE.TXT for full copyright and licensing information.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	11 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	12
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	13 #include <curses.h>
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	14 #include <string.h>
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	15 #include "rogue.h"
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	16
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	17 int gethand(void);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	18
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	19 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	20 * ring_on:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	21 * Put a ring on a hand
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	22 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	23 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	24 ring_on(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	25 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	26 register THING *obj;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	27 register int ring;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	28
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	29 obj = get_item("put on", RING);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	30 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	31 * Make certain that it is somethings that we want to wear
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	32 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	33 if (obj == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	34 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	35 if (obj->o_type != RING)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	36 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	37 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	38 msg("it would be difficult to wrap that around a finger");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	39 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	40 msg("not a ring");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	41 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	42 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	43
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	44 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	45 * find out which hand to put it on
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	46 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	47 if (is_current(obj))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	48 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	49
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	50 if (cur_ring[LEFT] == NULL && cur_ring[RIGHT] == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	51 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	52 if ((ring = gethand()) < 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	53 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	54 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	55 else if (cur_ring[LEFT] == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	56 ring = LEFT;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	57 else if (cur_ring[RIGHT] == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	58 ring = RIGHT;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	59 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	60 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	61 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	62 msg("you already have a ring on each hand");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	63 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	64 msg("wearing two");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	65 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	66 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	67 cur_ring[ring] = obj;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	68
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	69 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	70 * Calculate the effect it has on the poor guy.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	71 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	72 switch (obj->o_which)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	73 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	74 case R_ADDSTR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	75 chg_str(obj->o_ac);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	76 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	77 case R_SEEINVIS:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	78 invis_on();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	79 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	80 case R_AGGR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	81 aggravate();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	82 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	83 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	84
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	85 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	86 addmsg("you are now wearing ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	87 msg("%s (%c)", inv_name(obj, TRUE), pack_char(obj));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	88 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	89
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	90 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	91 * ring_off:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	92 * Take off a ring
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	93 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	94 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	95 ring_off(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	96 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	97 register int ring;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	98 register THING *obj;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	99 register char packchar;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	100
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	101 if (cur_ring[LEFT] == NULL && cur_ring[RIGHT] == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	102 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	103 if (terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	104 msg("no rings");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	105 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	106 msg("you aren't wearing any rings");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	107 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	108 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	109 else if (cur_ring[LEFT] == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	110 ring = RIGHT;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	111 else if (cur_ring[RIGHT] == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	112 ring = LEFT;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	113 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	114 if ((ring = gethand()) < 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	115 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	116 mpos = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	117 obj = cur_ring[ring];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	118 if (obj == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	119 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	120 msg("not wearing such a ring");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	121 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	122 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	123 packchar = pack_char(obj);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	124 if (dropcheck(obj))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	125 msg("was wearing %s(%c)", inv_name(obj, TRUE), packchar);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	126 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	127
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	128 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	129 * gethand:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	130 * Which hand is the hero interested in?
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	131 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	132 int
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	133 gethand(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	134 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	135 register int c;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	136
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	137 for (;;)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	138 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	139 if (terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	140 msg("left or right ring? ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	141 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	142 msg("left hand or right hand? ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	143 if ((c = readchar()) == ESCAPE)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	144 return -1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	145 mpos = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	146 if (c == 'l' \|\| c == 'L')
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	147 return LEFT;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	148 else if (c == 'r' \|\| c == 'R')
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	149 return RIGHT;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	150 if (terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	151 msg("L or R");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	152 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	153 msg("please type L or R");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	154 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	155 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	156
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	157 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	158 * ring_eat:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	159 * How much food does this ring use up?
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	160 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	161 int
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	162 ring_eat(int hand)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	163 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	164 if (cur_ring[hand] == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	165 return 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	166 switch (cur_ring[hand]->o_which)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	167 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	168 case R_REGEN:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	169 return 2;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	170 case R_SUSTSTR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	171 case R_SUSTARM:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	172 case R_PROTECT:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	173 case R_ADDSTR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	174 case R_STEALTH:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	175 return 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	176 case R_SEARCH:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	177 case R_ADDHIT:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	178 case R_ADDDAM:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	179 return (rnd(3) == 0);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	180 case R_DIGEST:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	181 return -rnd(2);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	182 case R_SEEINVIS:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	183 return (rnd(5) == 0);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	184 default:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	185 return 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	186 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	187 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	188
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	189 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	190 * ring_num:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	191 * Print ring bonuses
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	192 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	193 char *
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	194 ring_num(THING *obj)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	195 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	196 static char buf[5];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	197
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	198 if (!(obj->o_flags & ISKNOW))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	199 return "";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	200 switch (obj->o_which)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	201 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	202 case R_PROTECT:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	203 case R_ADDSTR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	204 case R_ADDDAM:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	205 case R_ADDHIT:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	206 buf[0] = ' ';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	207 strcpy(&buf[1], num(obj->o_ac, 0, RING));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	208 otherwise:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	209 return "";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	210 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	211 return buf;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	212 }

Mercurial > hg > early-roguelike

annotate rogue4/rings.c @ 215:1b73a8641b37