Early Roguelike Collection: rogue4/fight.c annotate

annotate rogue4/fight.c @ 304:e52a8a7ad4c5

Fix many compiler warnings. There should only be two changes in behavior: arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly applied to characters who are not monks instead of monks who are not empty-handed. urogue/fight.c: fixed an interaction with the "debug" macro that could cause the wrong message to be displayed.

author	John "Elwin" Edwards
date	Wed, 14 Apr 2021 18:55:33 -0400
parents	e7aab31362af
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 * All the fighting gets done here
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 * @(#)fight.c 4.30 (Berkeley) 4/6/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
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	13 #include <stdlib.h>
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	14 #include <curses.h>
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	15 #include <ctype.h>
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	16 #include <string.h>
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	17 #include "rogue.h"
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	18
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	19 long e_levels[] = {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	20 10L,20L,40L,80L,160L,320L,640L,1280L,2560L,5120L,10240L,20480L,
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	21 40920L, 81920L, 163840L, 327680L, 655360L, 1310720L, 2621440L, 0L
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	22 };
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	23
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	24 bool roll_em(THING thatt, THING thdef, THING *weap, bool hurl);
233 0990adf580ee Declare some function arguments as const. John "Elwin" Edwards parents: 215 diff changeset	25 void hit(const char er, const char ee);
0990adf580ee Declare some function arguments as const. John "Elwin" Edwards parents: 215 diff changeset	26 void miss(const char er, const char ee);
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	27 int str_plus(str_t str);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	28 int add_dam(str_t str);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	29 void thunk(THING weap, const char mname);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	30 void bounce(THING weap, const char mname);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	31
12 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 * fight:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	34 * The player attacks the monster.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	35 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	36 bool
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	37 fight(coord mp, char mn, THING weap, bool thrown)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	38 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	39 register THING *tp;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	40 register bool did_hit = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	41 register const char *mname;
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 * Find the monster we want to fight
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	45 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	46 #ifdef WIZARD
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	47 if ((tp = moat(mp->y, mp->x)) == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	48 debug("Fight what @ %d,%d", mp->y, mp->x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	49 #else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	50 tp = moat(mp->y, mp->x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	51 #endif
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	52 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	53 * Since we are fighting, things are not quiet so no healing takes
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	54 * place.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	55 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	56 count = quiet = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	57 runto(mp, &hero);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	58 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	59 * Let him know it was really a mimic (if it was one).
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 (tp->t_type == 'M' && tp->t_disguise != 'M' && !on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	62 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	63 tp->t_disguise = 'M';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	64 if (!thrown)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	65 return FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	66 msg("wait! That's a mimic!");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	67 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	68 did_hit = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	69 if (on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	70 mname = "it";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	71 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	72 mname = monsters[mn-'A'].m_name;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	73 if (roll_em(&player, tp, weap, thrown))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	74 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	75 did_hit = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	76 if (thrown)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	77 thunk(weap, mname);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	78 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	79 hit(NULL, mname);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	80 if (on(player, CANHUH))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	81 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	82 did_hit = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	83 tp->t_flags \|= ISHUH;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	84 player.t_flags &= ~CANHUH;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	85 msg("your hands stop glowing red");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	86 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	87 if (tp->t_stats.s_hpt <= 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	88 killed(tp, TRUE);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	89 else if (did_hit && !on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	90 msg("the %s appears confused", mname);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	91 did_hit = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	92 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	93 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	94 if (thrown)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	95 bounce(weap, mname);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	96 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	97 miss(NULL, mname);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	98 return did_hit;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	99 }
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 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	102 * attack:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	103 * The monster attacks the player
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	104 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	105 int
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	106 attack(THING *mp)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	107 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	108 register const char *mname;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	109
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	110 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	111 * Since this is an attack, stop running and any healing that was
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	112 * going on at the time.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	113 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	114 running = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	115 count = quiet = 0;
245 e7aab31362af Rogue V[345], Super-Rogue: Fix violet fungi/venus flytraps. John "Elwin" Edwards parents: 233 diff changeset	116 if (mp->t_type == 'F')
e7aab31362af Rogue V[345], Super-Rogue: Fix violet fungi/venus flytraps. John "Elwin" Edwards parents: 233 diff changeset	117 fung_hit = atoi(mp->t_stats.s_dmg);
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	118 if (mp->t_type == 'M' && !on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	119 mp->t_disguise = 'M';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	120 if (on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	121 mname = "it";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	122 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	123 mname = monsters[mp->t_type-'A'].m_name;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	124 if (roll_em(mp, &player, NULL, FALSE))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	125 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	126 if (mp->t_type != 'E')
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	127 hit(mname, NULL);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	128 if (pstats.s_hpt <= 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	129 death(mp->t_type); /* Bye bye life ... */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	130 if (!on(*mp, ISCANC))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	131 switch (mp->t_type)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	132 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	133 case 'R':
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 * If a rust monster hits, you lose armor, unless
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	136 * that armor is leather or there is a magic ring
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	137 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	138 if (cur_armor != NULL && cur_armor->o_ac < 9
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	139 && cur_armor->o_which != LEATHER)
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 245 diff changeset	140 {
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	141 if (ISWEARING(R_SUSTARM))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	142 msg("The rust vanishes instantly");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	143 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	144 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	145 cur_armor->o_ac++;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	146 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	147 msg("your armor appears to be weaker now. Oh my!");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	148 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	149 msg("your armor weakens");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	150 }
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 245 diff changeset	151 }
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	152 when 'E':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	153 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	154 * The gaze of the floating eye hypnotizes you
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 if (on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	157 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	158 player.t_flags &= ~ISRUN;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	159 if (!no_command)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	160 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	161 addmsg("you are transfixed");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	162 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	163 addmsg(" by the gaze of the floating eye");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	164 endmsg();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	165 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	166 no_command += rnd(2) + 2;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	167 when 'A':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	168 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	169 * Ants have poisonous bites
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	170 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	171 if (!save(VS_POISON))
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 245 diff changeset	172 {
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	173 if (!ISWEARING(R_SUSTSTR))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	174 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	175 chg_str(-1);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	176 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	177 msg("you feel a sting in your arm and now feel weaker");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	178 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	179 msg("a sting has weakened you");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	180 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	181 else
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 245 diff changeset	182 {
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	183 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	184 msg("a sting momentarily weakens you");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	185 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	186 msg("sting has no effect");
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 245 diff changeset	187 }
e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 245 diff changeset	188 }
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	189 when 'W':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	190 case 'V':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	191 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	192 * Wraiths might drain energy levels, and Vampires
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	193 * can steal max_hp
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	194 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	195 if (rnd(100) < (mp->t_type == 'W' ? 15 : 30))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	196 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	197 register int fewer;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	198
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	199 if (mp->t_type == 'W')
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	200 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	201 if (pstats.s_exp == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	202 death('W'); /* All levels gone */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	203 if (--pstats.s_lvl == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	204 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	205 pstats.s_exp = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	206 pstats.s_lvl = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	207 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	208 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	209 pstats.s_exp = e_levels[pstats.s_lvl-1]+1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	210 fewer = roll(1, 10);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	211 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	212 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	213 fewer = roll(1, 5);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	214 pstats.s_hpt -= fewer;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	215 max_hp -= fewer;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	216 if (pstats.s_hpt < 1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	217 pstats.s_hpt = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	218 if (max_hp < 1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	219 death(mp->t_type);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	220 msg("you suddenly feel weaker");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	221 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	222 when 'F':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	223 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	224 * Violet fungi stops the poor guy from moving
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	225 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	226 player.t_flags \|= ISHELD;
245 e7aab31362af Rogue V[345], Super-Rogue: Fix violet fungi/venus flytraps. John "Elwin" Edwards parents: 233 diff changeset	227 sprintf(mp->t_stats.s_dmg,"%dd1",++fung_hit);
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	228 when 'L':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	229 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	230 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	231 * Leperachaun steals some gold
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	232 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	233 register long lastpurse;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	234
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	235 lastpurse = purse;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	236 purse -= GOLDCALC;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	237 if (!save(VS_MAGIC))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	238 purse -= GOLDCALC + GOLDCALC + GOLDCALC + GOLDCALC;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	239 if (purse < 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	240 purse = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	241 remove_monster(&mp->t_pos, mp, FALSE);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	242 mp = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	243 if (purse != lastpurse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	244 msg("your purse feels lighter");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	245 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	246 when 'N':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	247 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	248 register THING obj, steal;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	249 register int nobj;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	250
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	251 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	252 * Nymph's steal a magic item, look through the pack
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	253 * and pick out one we like.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	254 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	255 steal = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	256 for (nobj = 0, obj = pack; obj != NULL; obj = next(obj))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	257 if (obj != cur_armor && obj != cur_weapon
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	258 && obj != cur_ring[LEFT] && obj != cur_ring[RIGHT]
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	259 && is_magic(obj) && rnd(++nobj) == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	260 steal = obj;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	261 if (steal != NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	262 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	263 remove_monster(&mp->t_pos, moat(mp->t_pos.y, mp->t_pos.x), FALSE);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	264 mp = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	265 inpack--;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	266 if (steal->o_count > 1 && steal->o_group == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	267 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	268 register int oc;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	269
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	270 oc = steal->o_count--;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	271 steal->o_count = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	272 msg("she stole %s!", inv_name(steal, TRUE));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	273 steal->o_count = oc;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	274 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	275 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	276 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	277 detach(pack, steal);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	278 msg("she stole %s!", inv_name(steal, TRUE));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	279 discard(steal);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	280 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	281 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	282 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	283 otherwise:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	284 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	285 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	286 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	287 else if (mp->t_type != 'E')
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	288 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	289 if (mp->t_type == 'F')
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	290 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	291 pstats.s_hpt -= fung_hit;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	292 if (pstats.s_hpt <= 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	293 death(mp->t_type); /* Bye bye life ... */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	294 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	295 miss(mname, NULL);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	296 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	297 if (fight_flush)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	298 flush_type();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	299 count = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	300 status();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	301
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	302 if (mp == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	303 return(-1);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	304 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	305 return(0);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	306 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	307
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	308 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	309 * swing:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	310 * Returns true if the swing hits
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	311 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	312 bool
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	313 swing(int at_lvl, int op_arm, int wplus)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	314 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	315 register int res = rnd(20);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	316 register int need = (20 - at_lvl) - op_arm;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	317
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	318 return (res + wplus >= need);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	319 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	320
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	321 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	322 * check_level:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	323 * Check to see if the guy has gone up a level.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	324 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	325 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	326 check_level(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	327 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	328 register int i, add, olevel;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	329
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	330 for (i = 0; e_levels[i] != 0; i++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	331 if (e_levels[i] > pstats.s_exp)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	332 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	333 i++;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	334 olevel = pstats.s_lvl;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	335 pstats.s_lvl = i;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	336 if (i > olevel)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	337 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	338 add = roll(i - olevel, 10);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	339 max_hp += add;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	340 if ((pstats.s_hpt += add) > max_hp)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	341 pstats.s_hpt = max_hp;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	342 msg("welcome to level %d", i);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	343 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	344 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	345
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	346 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	347 * roll_em:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	348 * Roll several attacks
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	349 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	350 bool
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	351 roll_em(THING thatt, THING thdef, THING *weap, bool hurl)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	352 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	353 register struct stats att, def;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	354 register char *cp;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	355 register int ndice, nsides, def_arm;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	356 register bool did_hit = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	357 register int hplus;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	358 register int dplus;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	359 register int damage;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	360
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	361 att = &thatt->t_stats;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	362 def = &thdef->t_stats;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	363 if (weap == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	364 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	365 cp = att->s_dmg;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	366 dplus = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	367 hplus = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	368 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	369 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	370 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	371 hplus = (weap == NULL ? 0 : weap->o_hplus);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	372 dplus = (weap == NULL ? 0 : weap->o_dplus);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	373 if (weap == cur_weapon)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	374 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	375 if (ISRING(LEFT, R_ADDDAM))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	376 dplus += cur_ring[LEFT]->o_ac;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	377 else if (ISRING(LEFT, R_ADDHIT))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	378 hplus += cur_ring[LEFT]->o_ac;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	379 if (ISRING(RIGHT, R_ADDDAM))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	380 dplus += cur_ring[RIGHT]->o_ac;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	381 else if (ISRING(RIGHT, R_ADDHIT))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	382 hplus += cur_ring[RIGHT]->o_ac;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	383 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	384 if (hurl)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	385 if ((weap->o_flags&ISMISL) && cur_weapon != NULL &&
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	386 cur_weapon->o_which == weap->o_launch)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	387 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	388 cp = weap->o_hurldmg;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	389 hplus += cur_weapon->o_hplus;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	390 dplus += cur_weapon->o_dplus;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	391 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	392 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	393 cp = weap->o_hurldmg;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	394 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	395 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	396 cp = weap->o_damage;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	397 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	398 * Drain a staff of striking
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	399 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	400 if (weap->o_type == STICK && weap->o_which == WS_HIT
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	401 && --weap->o_charges < 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	402 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	403 strcpy(weap->o_damage,"0d0");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	404 cp = weap->o_damage;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	405 weap->o_hplus = weap->o_dplus = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	406 weap->o_charges = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	407 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	408 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	409 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	410 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	411 * If the creature being attacked is not running (alseep or held)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	412 * then the attacker gets a plus four bonus to hit.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	413 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	414 if (!on(*thdef, ISRUN))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	415 hplus += 4;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	416 def_arm = def->s_arm;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	417 if (def == &pstats)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	418 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	419 if (cur_armor != NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	420 def_arm = cur_armor->o_ac;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	421 if (ISRING(LEFT, R_PROTECT))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	422 def_arm -= cur_ring[LEFT]->o_ac;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	423 if (ISRING(RIGHT, R_PROTECT))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	424 def_arm -= cur_ring[RIGHT]->o_ac;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	425 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	426 for (;;)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	427 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	428 ndice = atoi(cp);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	429 if ((cp = strchr(cp, 'd')) == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	430 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	431 nsides = atoi(++cp);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	432 if (swing(att->s_lvl, def_arm, hplus + str_plus(att->s_str)))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	433 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	434 register int proll;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	435
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	436 proll = roll(ndice, nsides);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	437 #ifdef WIZARD
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	438 if (ndice + nsides > 0 && proll < 1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	439 debug("Damage for %dd%d came out %d, dplus = %d, add_dam = %d, def_arm = %d", ndice, nsides, proll, dplus, add_dam(att->s_str), def_arm);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	440 #endif
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	441 damage = dplus + proll + add_dam(att->s_str);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	442 def->s_hpt -= max(0, damage);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	443 did_hit = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	444 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	445 if ((cp = strchr(cp, '/')) == NULL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	446 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	447 cp++;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	448 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	449 return did_hit;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	450 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	451
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	452 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	453 * prname:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	454 * The print name of a combatant
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	455 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	456 char *
233 0990adf580ee Declare some function arguments as const. John "Elwin" Edwards parents: 215 diff changeset	457 prname(const char *who, bool upper)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	458 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	459 static char tbuf[MAXSTR];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	460
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	461 *tbuf = '\0';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	462 if (who == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	463 strcpy(tbuf, "you");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	464 else if (on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	465 strcpy(tbuf, "it");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	466 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	467 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	468 strcpy(tbuf, "the ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	469 strcat(tbuf, who);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	470 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	471 if (upper)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	472 tbuf = toupper(tbuf);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	473 return tbuf;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	474 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	475
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	476 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	477 * hit:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	478 * Print a message to indicate a succesful hit
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	479 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	480 void
233 0990adf580ee Declare some function arguments as const. John "Elwin" Edwards parents: 215 diff changeset	481 hit(const char er, const char ee)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	482 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	483 register char *s = "";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	484
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	485 addmsg(prname(er, TRUE));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	486 if (terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	487 s = " hit";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	488 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	489 switch (rnd(4))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	490 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	491 case 0: s = " scored an excellent hit on ";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	492 when 1: s = " hit ";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	493 when 2: s = (er == 0 ? " have injured " : " has injured ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	494 when 3: s = (er == 0 ? " swing and hit " : " swings and hits ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	495 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	496 addmsg(s);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	497 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	498 addmsg(prname(ee, FALSE));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	499 endmsg();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	500 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	501
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	502 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	503 * miss:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	504 * Print a message to indicate a poor swing
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	505 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	506 void
233 0990adf580ee Declare some function arguments as const. John "Elwin" Edwards parents: 215 diff changeset	507 miss(const char er, const char ee)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	508 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	509 register char *s = "";
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	510
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	511 addmsg(prname(er, TRUE));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	512 switch (terse ? 0 : rnd(4))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	513 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	514 case 0: s = (er == 0 ? " miss" : " misses");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	515 when 1: s = (er == 0 ? " swing and miss" : " swings and misses");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	516 when 2: s = (er == 0 ? " barely miss" : " barely misses");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	517 when 3: s = (er == 0 ? " don't hit" : " doesn't hit");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	518 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	519 addmsg(s);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	520 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	521 addmsg(" %s", prname(ee, FALSE));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	522 endmsg();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	523 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	524
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	525 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	526 * save_throw:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	527 * See if a creature save against something
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	528 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	529 bool
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	530 save_throw(int which, THING *tp)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	531 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	532 register int need;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	533
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	534 need = 14 + which - tp->t_stats.s_lvl / 2;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	535 return (roll(1, 20) >= need);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	536 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	537
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	538 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	539 * save:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	540 * See if he saves against various nasty things
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	541 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	542 bool
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	543 save(int which)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	544 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	545 if (which == VS_MAGIC)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	546 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	547 if (ISRING(LEFT, R_PROTECT))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	548 which -= cur_ring[LEFT]->o_ac;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	549 if (ISRING(RIGHT, R_PROTECT))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	550 which -= cur_ring[RIGHT]->o_ac;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	551 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	552 return save_throw(which, &player);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	553 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	554
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	555 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	556 * str_plus:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	557 * Compute bonus/penalties for strength on the "to hit" roll
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	558 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	559 int
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	560 str_plus(str_t str)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	561 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	562 if (str == 31)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	563 return 3;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	564 if (str > 20)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	565 return 2;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	566 if (str > 16)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	567 return 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	568 if (str > 6)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	569 return 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	570 return str - 7;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	571 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	572
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	573 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	574 * add_dam:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	575 * Compute additional damage done for exceptionally high or low strength
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	576 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	577 int
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	578 add_dam(str_t str)
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	579 {
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	580 if (str == 31)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	581 return 6;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	582 if (str > 21)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	583 return 5;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	584 if (str == 21)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	585 return 4;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	586 if (str > 18)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	587 return 3;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	588 if (str == 18)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	589 return 2;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	590 if (str > 15)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	591 return 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	592 if (str > 6)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	593 return 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	594 return str - 7;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	595 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	596
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	597 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	598 * raise_level:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	599 * The guy just magically went up a level.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	600 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	601 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	602 raise_level(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	603 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	604 pstats.s_exp = e_levels[pstats.s_lvl-1] + 1L;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	605 check_level();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	606 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	607
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	608 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	609 * thunk:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	610 * A missile hits a monster
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	611 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	612 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	613 thunk(THING weap, const char mname)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	614 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	615 if (weap->o_type == WEAPON)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	616 addmsg("the %s hits ", w_names[weap->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	617 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	618 addmsg("you hit ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	619 if (on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	620 msg("it");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	621 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	622 msg("the %s", mname);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	623 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	624
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	625 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	626 * bounce:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	627 * A missile misses a monster
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	628 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	629 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	630 bounce(THING weap, const char mname)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	631 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	632 if (weap->o_type == WEAPON)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	633 addmsg("the %s misses ", w_names[weap->o_which]);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	634 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	635 addmsg("you missed ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	636 if (on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	637 msg("it");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	638 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	639 msg("the %s", mname);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	640 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	641
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	642 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	643 * remove:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	644 * Remove a monster from the screen
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	645 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	646 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	647 remove_monster(coord mp, THING tp, bool waskill)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	648 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	649 register THING obj, nexti;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	650
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	651 for (obj = tp->t_pack; obj != NULL; obj = nexti)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	652 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	653 nexti = next(obj);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	654 obj->o_pos = tp->t_pos;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	655 detach(tp->t_pack, obj);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	656 if (waskill)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	657 fall(obj, FALSE);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	658 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	659 discard(obj);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	660 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	661 moat(mp->y, mp->x) = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	662 mvaddch(mp->y, mp->x, tp->t_oldch);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	663 detach(mlist, tp);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	664 discard(tp);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	665 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	666
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	667 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	668 * is_magic:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	669 * Returns true if an object radiates magic
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	670 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	671 bool
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	672 is_magic(THING *obj)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	673 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	674 switch (obj->o_type)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	675 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	676 case ARMOR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	677 return obj->o_ac != a_class[obj->o_which];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	678 case WEAPON:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	679 return obj->o_hplus != 0 \|\| obj->o_dplus != 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	680 case POTION:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	681 case SCROLL:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	682 case STICK:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	683 case RING:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	684 case AMULET:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	685 return TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	686 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	687 return FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	688 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	689
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	690 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	691 * killed:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	692 * Called to put a monster to death
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	693 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	694 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	695 killed(THING *tp, bool pr)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	696 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	697 pstats.s_exp += tp->t_stats.s_exp;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	698 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	699 * If the monster was a violet fungi, un-hold him
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	700 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	701 switch (tp->t_type)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	702 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	703 case 'F':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	704 player.t_flags &= ~ISHELD;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	705 fung_hit = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	706 when 'L':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	707 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	708 register THING *gold;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	709
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	710 if (fallpos(&tp->t_pos, &tp->t_room->r_gold, TRUE))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	711 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	712 gold = new_item();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	713 gold->o_type = GOLD;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	714 gold->o_goldval = GOLDCALC;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	715 if (save(VS_MAGIC))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	716 gold->o_goldval += GOLDCALC + GOLDCALC
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	717 + GOLDCALC + GOLDCALC;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	718 attach(tp->t_pack, gold);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	719 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	720 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	721 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	722 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	723 * Get rid of the monster.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	724 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	725 if (pr)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	726 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	727 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	728 addmsg("you have ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	729 addmsg("defeated ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	730 if (on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	731 msg("it");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	732 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	733 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	734 if (!terse)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	735 addmsg("the ");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	736 msg("%s", monsters[tp->t_type-'A'].m_name);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	737 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	738 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	739 remove_monster(&tp->t_pos, tp, TRUE);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	740 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	741 * Do adjustments if he went up a level
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	742 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	743 check_level();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	744 }

Mercurial > hg > early-roguelike

annotate rogue4/fight.c @ 304:e52a8a7ad4c5