nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

warning bit

Browse Source 
Avoid gcc's inaccurate warning about mattk possibly being
used before being set in do_breathe().
This commit is contained in:
nethack.rankin
2002-03-25 08:05:27 +00:00
parent e8d404f87c
commit e848030571
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/monattk.h
+3 -1
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)monattk.h 3.4 1995/01/28 */ /* SCCS Id: @(#)monattk.h 3.4 2002/03/24 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
/* Copyright 1988, M. Stephenson */ /* Copyright 1988, M. Stephenson */
@@ -8,6 +8,7 @@
/* Add new attack types below - ordering affects experience (exper.c). /* Add new attack types below - ordering affects experience (exper.c).
* Attacks > AT_BUTT are worth extra experience. * Attacks > AT_BUTT are worth extra experience.
*/ */
#define AT_ANY (-1) /* fake attack; dmgtype_fromattack wildcard */
#define AT_NONE 0 /* passive monster (ex. acid blob) */ #define AT_NONE 0 /* passive monster (ex. acid blob) */
#define AT_CLAW 1 /* claw (punch, hit, etc.) */ #define AT_CLAW 1 /* claw (punch, hit, etc.) */
#define AT_BITE 2 /* bite */ #define AT_BITE 2 /* bite */
@@ -32,6 +33,7 @@
* Note that 1-10 correspond to the types of attack used in buzz(). * Note that 1-10 correspond to the types of attack used in buzz().
* Please don't disturb the order unless you rewrite the buzz() code. * Please don't disturb the order unless you rewrite the buzz() code.
*/ */
#define AD_ANY (-1) /* fake damage; attacktype_fordmg wildcard */
#define AD_PHYS 0 /* ordinary physical */ #define AD_PHYS 0 /* ordinary physical */
#define AD_MAGM 1 /* magic missiles */ #define AD_MAGM 1 /* magic missiles */
#define AD_FIRE 2 /* fire damage */ #define AD_FIRE 2 /* fire damage */
src/mondata.c
+1 -5
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)mondata.c 3.4 2001/12/05 */ /* SCCS Id: @(#)mondata.c 3.4 2002/03/24 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -6,10 +6,6 @@
#include "eshk.h" #include "eshk.h"
#include "epri.h" #include "epri.h"
/* fake attack and damage types */
#define AT_ANY (-1)
#define AD_ANY (-1)
/* These routines provide basic data for any type of monster. */ /* These routines provide basic data for any type of monster. */
#ifdef OVLB #ifdef OVLB
src/polyself.c
+7 -9
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)polyself.c 3.4 2002/01/15 */ /* SCCS Id: @(#)polyself.c 3.4 2002/03/24 */
/* Copyright (C) 1987, 1988, 1989 by Ken Arromdee */ /* Copyright (C) 1987, 1988, 1989 by Ken Arromdee */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -705,6 +705,8 @@ rehumanize()
int int
dobreathe() dobreathe()
{ {
struct attack *mattk;
if (Strangled) { if (Strangled) {
You_cant("breathe. Sorry."); You_cant("breathe. Sorry.");
return(0); return(0);
@@ -717,17 +719,13 @@ dobreathe()
flags.botl = 1; flags.botl = 1;
if (!getdir((char *)0)) return(0); if (!getdir((char *)0)) return(0);
else {
register struct attack *mattk;
register int i;
for(i = 0; i < NATTK; i++) { mattk = attacktype_fordmg(youmonst.data, AT_BREA, AD_ANY);
mattk = &(youmonst.data->mattk[i]); if (!mattk)
if(mattk->aatyp == AT_BREA) break; impossible("bad breath attack?"); /* mouthwash needed... */
} else
buzz((int) (20 + mattk->adtyp-1), (int)mattk->damn, buzz((int) (20 + mattk->adtyp-1), (int)mattk->damn,
u.ux, u.uy, u.dx, u.dy); u.ux, u.uy, u.dx, u.dy);
}
return(1); return(1);
} }