noisytoot/notnotdnethack
1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-07-28 00:12:23 +01:00
Code Issues Activity

Remove NEARDATA

Browse source 
Another thing from the DOS port that makes no sense on modern systems.
This commit is contained in:
Ron Nazarov 2024-05-01 23:58:56 +01:00
parent efdb5b2dc6
commit 14212ff3d3
Signed by: noisytoot
GPG key ID: 1D43EF4F4492268B
69 changed files with 366 additions and 368 deletions

2
include/artilist.h
View file

@ -51,7 +51,7 @@ static const char *artifact_names[] = {
cpr, cfl, \
inv, ifl }
//struct artifact * artilist;
NEARDATA const struct artifact base_artilist[] = {
const struct artifact base_artilist[] = {
#endif /* MAKEDEFS_C */
/* Artifact cost rationale:

2
include/config1.h
View file

@ -5,8 +5,6 @@
#ifndef CONFIG1_H
#define CONFIG1_H
#define NEARDATA
#if defined(__linux__) && defined(__GNUC__) && !defined(_GNU_SOURCE)
/* ensure _GNU_SOURCE is defined before including any system headers */
# define _GNU_SOURCE

154
include/decl.h
View file

@ -21,27 +21,27 @@ E char *catmore;
E char SAVEF[];
E NEARDATA int bases[MAXOCLASSES];
E int bases[MAXOCLASSES];
E long has_loaded_bones;
E long last_clear_screen;
E NEARDATA int multi;
E int multi;
E char multi_txt[BUFSZ];
#if 0
E NEARDATA int warnlevel;
E int warnlevel;
#endif
E NEARDATA int nroom;
E NEARDATA int nsubroom;
E NEARDATA int occtime;
E int nroom;
E int nsubroom;
E int occtime;
#define WARNCOUNT 6 /* number of different warning levels */
E uchar warnsyms[WARNCOUNT];
E int x_maze_max, y_maze_max;
E NEARDATA int in_doagain;
E int in_doagain;
E struct dgn_topology { /* special dungeon levels for speed */
/*Dungeons of Doom*/
@ -395,43 +395,43 @@ E struct dgn_topology { /* special dungeon levels for speed */
#define mineend_level (dungeon_topology.d_mineend_level)
#define sokoend_level (dungeon_topology.d_sokoend_level)
E NEARDATA stairway dnstair, upstair; /* stairs up and down */
E stairway dnstair, upstair; /* stairs up and down */
#define xdnstair (dnstair.sx)
#define ydnstair (dnstair.sy)
#define xupstair (upstair.sx)
#define yupstair (upstair.sy)
E NEARDATA stairway dnladder, upladder; /* ladders up and down */
E stairway dnladder, upladder; /* ladders up and down */
#define xdnladder (dnladder.sx)
#define ydnladder (dnladder.sy)
#define xupladder (upladder.sx)
#define yupladder (upladder.sy)
E NEARDATA stairway sstairs;
E stairway sstairs;
E NEARDATA dest_area updest, dndest; /* level-change destination areas */
E dest_area updest, dndest; /* level-change destination areas */
E NEARDATA coord inv_pos;
E NEARDATA dungeon dungeons[];
E NEARDATA s_level *sp_levchn;
E coord inv_pos;
E dungeon dungeons[];
E s_level *sp_levchn;
#define dunlev_reached(x) (dungeons[(x)->dnum].dunlev_ureached)
#include "quest.h"
E struct q_score quest_status;
E NEARDATA char pl_character[PL_CSIZ];
E NEARDATA char pl_race; /* character's race */
E char pl_character[PL_CSIZ];
E char pl_race; /* character's race */
E NEARDATA char pl_fruit[PL_FSIZ];
E NEARDATA int current_fruit;
E NEARDATA struct fruit *ffruit;
E char pl_fruit[PL_FSIZ];
E int current_fruit;
E struct fruit *ffruit;
E NEARDATA char tune[6];
E char tune[6];
#define MAXLINFO (MAXDUNGEON * MAXLEVEL)
E struct linfo level_info[MAXLINFO];
E NEARDATA struct sinfo {
E struct sinfo {
int gameover; /* self explanatory? */
int stopprint; /* inhibit further end of game disclosure */
#if defined(UNIX)
@ -454,18 +454,18 @@ E const char ynchars[];
E const char ynqchars[];
E const char ynaqchars[];
E const char ynNaqchars[];
E NEARDATA long yn_number;
E long yn_number;
E const char disclosure_options[];
E NEARDATA int smeq[];
E NEARDATA int doorindex;
E NEARDATA int altarindex;
E NEARDATA char *save_cm;
E int smeq[];
E int doorindex;
E int altarindex;
E char *save_cm;
#define KILLED_BY_AN 0
#define KILLED_BY 1
#define NO_KILLER_PREFIX 2
E NEARDATA int killer_format;
E int killer_format;
E const char *killer;
E const char *delayed_killer;
#ifdef GOLDOBJ
@ -479,18 +479,18 @@ E long killer_flags;
E char dump_fn[]; /* dumpfile name (dump patch) */
#endif
E const char *configfile;
E NEARDATA char plname[PL_NSIZ];
E NEARDATA char inherited[];
E NEARDATA char dogname[];
E NEARDATA char catname[];
E NEARDATA char horsename[];
E NEARDATA char lizardname[];
E NEARDATA char spidername[];
E NEARDATA char dragonname[];
E NEARDATA char parrotname[];
E NEARDATA char monkeyname[];
E NEARDATA char whisperername[];
E NEARDATA char ratname[];
E char plname[PL_NSIZ];
E char inherited[];
E char dogname[];
E char catname[];
E char horsename[];
E char lizardname[];
E char spidername[];
E char dragonname[];
E char parrotname[];
E char monkeyname[];
E char whisperername[];
E char ratname[];
E char preferred_pet;
E const char *occtxt; /* defined when occupation != NULL */
E const char *nomovemsg;
@ -513,11 +513,11 @@ E char misc_cmds[];
/* the number of miscellaneous commands */
# define MISC_CMD_COUNT 7
E NEARDATA schar tbx, tby; /* set in mthrowu.c */
E schar tbx, tby; /* set in mthrowu.c */
E NEARDATA struct multishot { int n, i; short o; boolean s; struct obj * x;} m_shot;
E struct multishot { int n, i; short o; boolean s; struct obj * x;} m_shot;
E NEARDATA struct dig_info { /* apply.c, hack.c */
E struct dig_info { /* apply.c, hack.c */
int effort;
d_level level;
coord pos;
@ -525,26 +525,26 @@ E NEARDATA struct dig_info { /* apply.c, hack.c */
boolean down, chew, warned, quiet;
} digging;
E NEARDATA long moves, monstermoves;
E NEARDATA long nonce;
E NEARDATA long wailmsg;
E long moves, monstermoves;
E long nonce;
E long wailmsg;
E boolean goat_seenonce;
E NEARDATA boolean in_mklev;
E NEARDATA boolean stoned;
E NEARDATA boolean golded;
E NEARDATA boolean glassed;
E NEARDATA boolean unweapon;
E NEARDATA boolean mrg_to_wielded;
E NEARDATA boolean mon_ranged_gazeonly;
E NEARDATA struct obj *current_wand;
E boolean in_mklev;
E boolean stoned;
E boolean golded;
E boolean glassed;
E boolean unweapon;
E boolean mrg_to_wielded;
E boolean mon_ranged_gazeonly;
E struct obj *current_wand;
E NEARDATA boolean in_steed_dismounting;
E boolean in_steed_dismounting;
E const int shield_static[];
#include "spell.h"
E NEARDATA struct spell spl_book[]; /* sized in decl.c */
E struct spell spl_book[]; /* sized in decl.c */
#include "color.h"
#ifdef TEXTCOLOR
@ -557,16 +557,16 @@ E const char def_monsyms[MAXMCLASSES]; /* default class symbols */
E uchar monsyms[MAXMCLASSES]; /* current class symbols */
#include "obj.h"
E NEARDATA struct obj *magic_chest_objs[10];
E NEARDATA struct obj *invent,
E struct obj *magic_chest_objs[10];
E struct obj *invent,
*uarm, *uarmc, *uarmh, *uarms, *uarmg, *uarmf,
*uarmu, /* under-wear, so to speak */
*uskin, *uamul, *ublindf,
*uwep, *uswapwep, *uquiver;
#define URINGS_SIZE 8
E NEARDATA struct obj *urings[URINGS_SIZE]; /* init'd and defined in decl.c */
E NEARDATA const long long ring_index_to_wornmask[URINGS_SIZE]; /* init'd and defined in worn.c */
E struct obj *urings[URINGS_SIZE]; /* init'd and defined in decl.c */
E const long long ring_index_to_wornmask[URINGS_SIZE]; /* init'd and defined in worn.c */
#define uleft (urings[0])
#define uright (urings[1])
@ -575,20 +575,20 @@ E NEARDATA const long long ring_index_to_wornmask[URINGS_SIZE]; /* init'd and de
#define WORN_SLOTS { uarm, uarmc, uarmf, uarmh, uarmg, uarms, uarmu, uamul, ublindf, uwep, uswapwep, uquiver, \
urings[0], urings[1], urings[2], urings[3], urings[4], urings[5], urings[6], urings[7] }
E NEARDATA struct obj *urope; /* defined only when entangled */
E NEARDATA struct obj *uchain; /* defined only when punished */
E NEARDATA struct obj *uball;
E NEARDATA struct obj *migrating_objs;
E NEARDATA struct obj *billobjs;
E NEARDATA struct obj zeroobj; /* init'd and defined in decl.c */
E NEARDATA anything zeroany; /* init'd and defined in decl.c */
E struct obj *urope; /* defined only when entangled */
E struct obj *uchain; /* defined only when punished */
E struct obj *uball;
E struct obj *migrating_objs;
E struct obj *billobjs;
E struct obj zeroobj; /* init'd and defined in decl.c */
E anything zeroany; /* init'd and defined in decl.c */
#include "mutations.h"
#include "you.h"
E NEARDATA struct you u;
E struct you u;
#include "gods.h"
E NEARDATA struct god * godlist;
E struct god * godlist;
#include "onames.h"
#include "gnames.h"
@ -596,14 +596,14 @@ E NEARDATA struct god * godlist;
#include "pm.h"
#endif
E NEARDATA struct monst youmonst; /* init'd and defined in decl.c */
E NEARDATA struct monst *mydogs, *migrating_mons;
E struct monst youmonst; /* init'd and defined in decl.c */
E struct monst *mydogs, *migrating_mons;
E NEARDATA struct permonst upermonst; /* init'd in decl.c,
E struct permonst upermonst; /* init'd in decl.c,
* defined in polyself.c
*/
E NEARDATA struct mvitals {
E struct mvitals {
uchar born; /*How many of this monster have been created in a way that respects extinction*/
uchar died; /*How many of this monster have died of any cause*/
uchar killed; /*How many of this monster have died at the PC's hands*/
@ -615,7 +615,7 @@ E NEARDATA struct mvitals {
Bitfield(insightkill,1);
} mvitals[NUMMONS];
E NEARDATA struct c_color_names {
E struct c_color_names {
const char *const c_black, *const c_amber, *const c_golden,
*const c_light_blue,*const c_red, *const c_green,
*const c_silver, *const c_blue, *const c_purple,
@ -672,12 +672,12 @@ E const struct material materials[];
#define EXACT_NAME 0x0F
/* Vision */
E NEARDATA boolean vision_full_recalc; /* TRUE if need vision recalc */
E NEARDATA char **viz_array; /* could see/in sight row pointers */
E boolean vision_full_recalc; /* TRUE if need vision recalc */
E char **viz_array; /* could see/in sight row pointers */
/* Window system stuff */
E NEARDATA winid WIN_MESSAGE, WIN_STATUS;
E NEARDATA winid WIN_MAP, WIN_INVEN;
E winid WIN_MESSAGE, WIN_STATUS;
E winid WIN_MAP, WIN_INVEN;
/* pline (et al) for a single string argument (suppress compiler warning) */
#define pline1(cstr) pline("%s", cstr)

4
include/flag.h
View file

@ -434,8 +434,8 @@ struct instance_flags {
#define use_inverse wc_inverse
#define preload_tiles wc_preload_tiles
extern NEARDATA struct flag flags;
extern NEARDATA struct instance_flags iflags;
extern struct flag flags;
extern struct instance_flags iflags;
/* runmode options */
#define RUN_TPORT 0 /* don't update display until movement stops */

2
include/godlist.h
View file

@ -37,7 +37,7 @@ static const char *god_names[] = {
#define Cangels PM_NOVIERE_ELADRIN,PM_BRALANI_ELADRIN,PM_FIRRE_ELADRIN,PM_SHIERE_ELADRIN,PM_ANGEL,PM_GHAELE_ELADRIN,PM_TULANI_ELADRIN,NON_PM
#define Cdemons PM_MANES,PM_QUASIT,PM_VROCK,PM_HEZROU,PM_NALFESHNEE,PM_MARILITH,PM_BALROG,NON_PM
NEARDATA const struct god base_godlist[] = {
const struct god base_godlist[] = {
#endif
/* dummy so all non-zero elements are interesting */
GOD_V2((const char *)0, 0, 0, MINIONS()),

2
include/hack.h
View file

@ -120,7 +120,7 @@
#include "zap.h"
#include "thoughtglyph.h"
NEARDATA extern coord bhitpos; /* place where throw or zap hits or stops */
extern coord bhitpos; /* place where throw or zap hits or stops */
/* types of calls to bhit() */
#define ZAPPED_WAND 0 /* invisible ray, pierces monsters */

8
include/mkroom.h
View file

@ -35,8 +35,8 @@ struct shclass {
const char * const *shknms; /* list of shopkeeper names for this type */
};
extern NEARDATA struct mkroom rooms[(MAXNROFROOMS+1)*2];
extern NEARDATA struct mkroom* subrooms;
extern struct mkroom rooms[(MAXNROFROOMS+1)*2];
extern struct mkroom* subrooms;
/* the normal rooms on the current level are described in rooms[0..n] for
* some n<MAXNROFROOMS
* the vault, if any, is described by rooms[n+1]
@ -58,8 +58,8 @@ struct altar {
int god;
};
extern NEARDATA struct door doors[DOORMAX];
extern NEARDATA struct altar altars[ALTARMAX];
extern struct door doors[DOORMAX];
extern struct altar altars[ALTARMAX];
/* values for rtype in the room definition structure */
#define OROOM 0 /* ordinary room */

6
include/objclass.h
View file

@ -229,9 +229,9 @@ struct material {
const int flat_ac; /* defense modifier (torso, limbs and head are 1/2) */
};
extern NEARDATA struct objclass objects[];
extern NEARDATA struct objdescr obj_descr[];
extern NEARDATA struct colorTextClr LightsaberColor[];
extern struct objclass objects[];
extern struct objdescr obj_descr[];
extern struct colorTextClr LightsaberColor[];
/*
* All objects have a class. Make sure that all classes have a corresponding

2
include/patchlevel.h
View file

@ -343,7 +343,7 @@
* refine the overlay manager, rearrange the OVLx breakdown for better
* efficiency, rename the overlay macros, and split off the overlay
* instructions to Install.ovl
* introduce NEARDATA for better Amiga efficiency
* introduce for better Amiga efficiency
* support for more VMS versions (courtesy Joshua Delahunty and Pat Rankin)
* more const fixes
* better support for common graphics (DEC VT and IBM)

2
include/permonst.h
View file

@ -116,7 +116,7 @@ struct permonst {
int mtyp; /* Index number of this permonst entry */
};
extern NEARDATA struct permonst
extern struct permonst
mons[]; /* the master list of monster types */
#define VERY_SLOW 3

2
include/tcap.h
View file

@ -41,7 +41,7 @@ extern struct tc_lcl_data { /* defined and set up in termcap.c */
extern short ospeed; /* set up in termcap.c */
#ifdef TEXTCOLOR
extern NEARDATA char *hilites[CLR_MAX];
extern char *hilites[CLR_MAX];
#endif
#endif /* TCAP_H */

2
include/winprocs.h
View file

@ -63,7 +63,7 @@ struct window_procs {
void FDECL((*win_preference_update), (const char *));
};
extern NEARDATA struct window_procs windowprocs;
extern struct window_procs windowprocs;
/*
* If you wish to only support one window system and not use procedure

8
src/apply.c
View file

@ -2342,7 +2342,7 @@ light_torch(obj)
begin_burn(obj);
}
static NEARDATA const char cuddly[] = { TOOL_CLASS, GEM_CLASS, 0 };
static const char cuddly[] = { TOOL_CLASS, GEM_CLASS, 0 };
int
dorub()
@ -3265,8 +3265,8 @@ coord *cc;
}
}
static NEARDATA const char lubricables[] = { ALL_CLASSES, ALLOW_NONE, 0 };
static NEARDATA const char need_to_remove_outer_armor[] =
static const char lubricables[] = { ALL_CLASSES, ALLOW_NONE, 0 };
static const char need_to_remove_outer_armor[] =
"need to remove your %s to grease your %s.";
static void
@ -7898,7 +7898,7 @@ struct obj *kit;
ptr = mtmp->data;
}
// attempt to find a piece of armor to resize
NEARDATA const char clothes[] = { ARMOR_CLASS, TOOL_CLASS, 0 };
const char clothes[] = { ARMOR_CLASS, TOOL_CLASS, 0 };
otmp = getobj(clothes, "resize");
if (!otmp) return MOVE_CANCELLED;
if(otmp == kit){

18
src/artifact.c
View file

@ -38,22 +38,22 @@ int FDECL(doprismaticmenu, (const char *,struct obj *));
int FDECL(doillithidmenu, (const char *,struct obj *));
static NEARDATA schar delay; /* moves left for this spell */
static NEARDATA struct obj *artiptr;/* last/current artifact being used */
static NEARDATA int necro_effect; /* necro effect picked */
static NEARDATA int lostname; /* spirit # picked */
static schar delay; /* moves left for this spell */
static struct obj *artiptr;/* last/current artifact being used */
static int necro_effect; /* necro effect picked */
static int lostname; /* spirit # picked */
static NEARDATA int oozes[] = {PM_ACID_BLOB, PM_QUIVERING_BLOB,
static int oozes[] = {PM_ACID_BLOB, PM_QUIVERING_BLOB,
PM_GELATINOUS_CUBE, PM_DARKNESS_GIVEN_HUNGER, PM_GRAY_OOZE,
PM_BROWN_PUDDING, PM_BLACK_PUDDING, PM_GREEN_SLIME,
PM_AOA, PM_BROWN_MOLD, PM_RED_MOLD};
static NEARDATA int devils[] = {PM_IMP, PM_LEMURE,
static int devils[] = {PM_IMP, PM_LEMURE,
PM_LEGION_DEVIL_GRUNT, PM_LEGION_DEVIL_SOLDIER, PM_LEGION_DEVIL_SERGEANT,
PM_HORNED_DEVIL, PM_BARBED_DEVIL, PM_BONE_DEVIL,
PM_ICE_DEVIL, PM_PIT_FIEND, PM_ANCIENT_OF_ICE, PM_ANCIENT_OF_DEATH};
static NEARDATA int demons[] = {PM_QUASIT, PM_MANES, PM_QUASIT,
static int demons[] = {PM_QUASIT, PM_MANES, PM_QUASIT,
PM_MANES, PM_QUASIT, PM_MANES,
PM_SUCCUBUS, PM_INCUBUS, PM_VROCK,
PM_HEZROU, PM_NALFESHNEE, PM_MARILITH,
@ -8171,8 +8171,8 @@ boolean printmessages; /* print generic elemental damage messages */
#undef currdmg
}
static NEARDATA const char recharge_type[] = { ALLOW_COUNT, ALL_CLASSES, 0 };
static NEARDATA const char invoke_types[] = { ALL_CLASSES, 0 };
static const char recharge_type[] = { ALLOW_COUNT, ALL_CLASSES, 0 };
static const char invoke_types[] = { ALL_CLASSES, 0 };
/* #invoke: an "ugly check" filters out most objects */

2
src/botl.c
View file

@ -262,7 +262,7 @@ add_colored_text(const char *hilite, const char *text, char *newbot2,
#endif
static NEARDATA int mrank_sz = 0; /* loaded by max_rank_sz (from u_init) */
static int mrank_sz = 0; /* loaded by max_rank_sz (from u_init) */
static const char *NDECL(rank);

6
src/cmd.c
View file

@ -177,7 +177,7 @@ static char NDECL(popch);
*/
#define BSIZE 20
static char pushq[BSIZE], saveq[BSIZE];
static NEARDATA int phead, ptail, shead, stail;
static int phead, ptail, shead, stail;
static char
popch() {
@ -2629,7 +2629,7 @@ int typ;
int n;
register struct obj *obj;
char allowall[2];
static NEARDATA const char callable[] = {
static const char callable[] = {
SCROLL_CLASS, TILE_CLASS, POTION_CLASS, WAND_CLASS, RING_CLASS, AMULET_CLASS,
GEM_CLASS, SPBOOK_CLASS, ARMOR_CLASS, TOOL_CLASS, 0 };
@ -4234,7 +4234,7 @@ register int x, y;
return x >= 1 && x <= COLNO-1 && y >= 0 && y <= ROWNO-1;
}
static NEARDATA int last_multi;
static int last_multi;
/*
* convert a MAP window position into a movecmd

2
src/dbridge.c
View file

@ -241,7 +241,7 @@ struct entity {
#define ENTITIES 2
static NEARDATA struct entity occupants[ENTITIES];
static struct entity occupants[ENTITIES];
static
struct entity *

162
src/decl.c
View file

@ -17,24 +17,24 @@ int locknum = 0; /* max num of simultaneous users */
char *catmore = 0; /* default pager */
#endif
NEARDATA int bases[MAXOCLASSES] = DUMMY;
int bases[MAXOCLASSES] = DUMMY;
long has_loaded_bones = 0L;
long last_clear_screen = 0L;
NEARDATA int multi = 0;
int multi = 0;
char multi_txt[BUFSZ] = DUMMY;
#if 0
NEARDATA int warnlevel = 0; /* used by movemon and dochugw */
int warnlevel = 0; /* used by movemon and dochugw */
#endif
NEARDATA int nroom = 0;
NEARDATA int nsubroom = 0;
NEARDATA int occtime = 0;
int nroom = 0;
int nsubroom = 0;
int occtime = 0;
int x_maze_max, y_maze_max; /* initialized in main, used in mkmaze.c */
NEARDATA int in_doagain = 0;
int in_doagain = 0;
/*
* The following structure will be initialized at startup time with
@ -45,16 +45,16 @@ struct dgn_topology dungeon_topology = {DUMMY};
#include "quest.h"
struct q_score quest_status = DUMMY;
NEARDATA int smeq[MAXNROFROOMS+1] = DUMMY;
NEARDATA int doorindex = 0;
NEARDATA int altarindex = 0;
int smeq[MAXNROFROOMS+1] = DUMMY;
int doorindex = 0;
int altarindex = 0;
NEARDATA char *save_cm = 0;
NEARDATA int killer_format = 0;
char *save_cm = 0;
int killer_format = 0;
const char *killer = 0;
const char *delayed_killer = 0;
#ifdef GOLDOBJ
NEARDATA long done_money = 0;
long done_money = 0;
#endif
char killer_buf[BUFSZ] = DUMMY;
@ -64,15 +64,15 @@ boolean saving_game = FALSE; /*The game is currently saving, so don't update the
const char *nomovemsg = 0;
const char nul[40] = DUMMY; /* contains zeros */
NEARDATA char plname[PL_NSIZ] = DUMMY; /* player name */
NEARDATA char pl_character[PL_CSIZ] = DUMMY;
NEARDATA char pl_race = '\0';
char plname[PL_NSIZ] = DUMMY; /* player name */
char pl_character[PL_CSIZ] = DUMMY;
char pl_race = '\0';
NEARDATA char pl_fruit[PL_FSIZ] = DUMMY;
NEARDATA int current_fruit = 0;
NEARDATA struct fruit *ffruit = (struct fruit *)0;
char pl_fruit[PL_FSIZ] = DUMMY;
int current_fruit = 0;
struct fruit *ffruit = (struct fruit *)0;
NEARDATA char tune[6] = DUMMY;
char tune[6] = DUMMY;
const char *occtxt = DUMMY;
const char quitchars[] = " \r\n\033";
@ -81,7 +81,7 @@ const char ynchars[] = "yn";
const char ynqchars[] = "ynq";
const char ynaqchars[] = "ynaq";
const char ynNaqchars[] = "yn#aq";
NEARDATA long yn_number = 0L;
long yn_number = 0L;
const char disclosure_options[] = "iavgc";
@ -90,7 +90,7 @@ const char disclosure_options[] = "iavgc";
struct linfo level_info[MAXLINFO];
NEARDATA struct sinfo program_state;
struct sinfo program_state;
/* 'rogue'-like direction commands (cmd.c) */
const char qykbd_dir[] = "hykulnjb><"; /* qwerty layout */
@ -102,55 +102,55 @@ const schar ydir[10] = { 0,-1,-1,-1, 0, 1, 1, 1, 0, 0 };
const schar zdir[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 1,-1 };
char misc_cmds[] = {'g', 'G', 'F', 'm', 'M', '\033', '\001'};
NEARDATA schar tbx = 0, tby = 0; /* mthrowu: target */
schar tbx = 0, tby = 0; /* mthrowu: target */
/* for xname handling of multiple shot missile volleys:
number of shots, index of current one, validity check, shoot vs throw */
NEARDATA struct multishot m_shot = { 0, 0, STRANGE_OBJECT, FALSE };
struct multishot m_shot = { 0, 0, STRANGE_OBJECT, FALSE };
NEARDATA struct dig_info digging;
struct dig_info digging;
NEARDATA dungeon dungeons[MAXDUNGEON]; /* ini'ed by init_dungeon() */
NEARDATA s_level *sp_levchn;
NEARDATA stairway upstair = { 0, 0, 0, 0}, dnstair = { 0, 0, 0, 0};
NEARDATA stairway upladder = { 0, 0, 0, 0}, dnladder = { 0, 0, 0, 0};
NEARDATA stairway sstairs = { 0, 0, 0, 0};
NEARDATA dest_area updest = { 0, 0, 0, 0, 0, 0, 0, 0 };
NEARDATA dest_area dndest = { 0, 0, 0, 0, 0, 0, 0, 0 };
NEARDATA coord inv_pos = { 0, 0 };
dungeon dungeons[MAXDUNGEON]; /* ini'ed by init_dungeon() */
s_level *sp_levchn;
stairway upstair = { 0, 0, 0, 0}, dnstair = { 0, 0, 0, 0};
stairway upladder = { 0, 0, 0, 0}, dnladder = { 0, 0, 0, 0};
stairway sstairs = { 0, 0, 0, 0};
dest_area updest = { 0, 0, 0, 0, 0, 0, 0, 0 };
dest_area dndest = { 0, 0, 0, 0, 0, 0, 0, 0 };
coord inv_pos = { 0, 0 };
NEARDATA boolean in_mklev = FALSE;
NEARDATA boolean stoned = FALSE; /* done to monsters hit by 'c' */
NEARDATA boolean golded = FALSE; /* done to monsters hit by Mammon's breath */
NEARDATA boolean glassed = FALSE; /* done to monsters hit by Baalphegor's breath */
NEARDATA boolean unweapon = FALSE;
NEARDATA boolean mrg_to_wielded = FALSE;
boolean in_mklev = FALSE;
boolean stoned = FALSE; /* done to monsters hit by 'c' */
boolean golded = FALSE; /* done to monsters hit by Mammon's breath */
boolean glassed = FALSE; /* done to monsters hit by Baalphegor's breath */
boolean unweapon = FALSE;
boolean mrg_to_wielded = FALSE;
boolean mon_ranged_gazeonly = FALSE;
/* weapon picked is merged with wielded one */
NEARDATA struct obj *current_wand = 0; /* wand currently zapped/applied */
struct obj *current_wand = 0; /* wand currently zapped/applied */
NEARDATA boolean in_steed_dismounting = FALSE;
boolean in_steed_dismounting = FALSE;
NEARDATA coord bhitpos = DUMMY;
NEARDATA struct door doors[DOORMAX] = {DUMMY};
NEARDATA struct altar altars[ALTARMAX] = {DUMMY};
coord bhitpos = DUMMY;
struct door doors[DOORMAX] = {DUMMY};
struct altar altars[ALTARMAX] = {DUMMY};
NEARDATA struct mkroom rooms[(MAXNROFROOMS+1)*2] = {DUMMY};
NEARDATA struct mkroom* subrooms = &rooms[MAXNROFROOMS+1];
struct mkroom rooms[(MAXNROFROOMS+1)*2] = {DUMMY};
struct mkroom* subrooms = &rooms[MAXNROFROOMS+1];
struct mkroom *upstairs_room, *dnstairs_room, *sstairs_room;
dlevel_t level; /* level map */
struct trap *ftrap = (struct trap *)0;
NEARDATA struct monst youmonst = DUMMY;
NEARDATA struct permonst upermonst = DUMMY;
NEARDATA struct flag flags = DUMMY;
NEARDATA struct instance_flags iflags = DUMMY;
NEARDATA struct you u = DUMMY;
struct monst youmonst = DUMMY;
struct permonst upermonst = DUMMY;
struct flag flags = DUMMY;
struct instance_flags iflags = DUMMY;
struct you u = DUMMY;
/* objects that have been stored in a magic chest */
NEARDATA struct obj *magic_chest_objs[10] = {0};
struct obj *magic_chest_objs[10] = {0};
NEARDATA struct obj *invent = (struct obj *)0,
struct obj *invent = (struct obj *)0,
*uwep = (struct obj *)0, *uarm = (struct obj *)0,
*uswapwep = (struct obj *)0,
*uquiver = (struct obj *)0, /* quiver */
@ -164,7 +164,7 @@ NEARDATA struct obj *invent = (struct obj *)0,
*uball = (struct obj *)0,
*urope = (struct obj *)0;
NEARDATA struct obj *urings[URINGS_SIZE] = {0};
struct obj *urings[URINGS_SIZE] = {0};
#ifdef TEXTCOLOR
/*
@ -196,46 +196,46 @@ const int shield_static[SHIELD_COUNT] = {
// S_ss1, S_ss2, S_ss3, S_ss2, S_ss1, S_ss2, S_ss4,
};
NEARDATA struct spell spl_book[MAXSPELL + 1] = {DUMMY};
struct spell spl_book[MAXSPELL + 1] = {DUMMY};
NEARDATA long moves = 1L, monstermoves = 1L;
long moves = 1L, monstermoves = 1L;
/* These diverge when player is Fast */
NEARDATA long nonce = 0L;
NEARDATA long wailmsg = 0L;
long nonce = 0L;
long wailmsg = 0L;
boolean goat_seenonce = FALSE;
/* objects that are moving to another dungeon level */
NEARDATA struct obj *migrating_objs = (struct obj *)0;
struct obj *migrating_objs = (struct obj *)0;
/* objects not yet paid for */
NEARDATA struct obj *billobjs = (struct obj *)0;
struct obj *billobjs = (struct obj *)0;
/* used to zero all elements of a struct obj */
NEARDATA struct obj zeroobj = DUMMY;
struct obj zeroobj = DUMMY;
/* used to zero out union any */
NEARDATA anything zeroany = (anything) 0;
anything zeroany = (anything) 0;
NEARDATA char inherited[PL_PSIZ] = DUMMY;
char inherited[PL_PSIZ] = DUMMY;
/* originally from dog.c */
NEARDATA char dogname[PL_PSIZ] = DUMMY;
NEARDATA char catname[PL_PSIZ] = DUMMY;
NEARDATA char parrotname[PL_PSIZ] = DUMMY;
NEARDATA char monkeyname[PL_PSIZ] = DUMMY;
NEARDATA char spidername[PL_PSIZ] = DUMMY;
NEARDATA char lizardname[PL_PSIZ] = DUMMY;
NEARDATA char dragonname[PL_PSIZ] = DUMMY;
NEARDATA char horsename[PL_PSIZ] = DUMMY;
NEARDATA char whisperername[PL_PSIZ] = DUMMY;
NEARDATA char ratname[PL_PSIZ] = DUMMY;
char dogname[PL_PSIZ] = DUMMY;
char catname[PL_PSIZ] = DUMMY;
char parrotname[PL_PSIZ] = DUMMY;
char monkeyname[PL_PSIZ] = DUMMY;
char spidername[PL_PSIZ] = DUMMY;
char lizardname[PL_PSIZ] = DUMMY;
char dragonname[PL_PSIZ] = DUMMY;
char horsename[PL_PSIZ] = DUMMY;
char whisperername[PL_PSIZ] = DUMMY;
char ratname[PL_PSIZ] = DUMMY;
char preferred_pet; /* '\0', 'c', 'd', 'n' (none) */
/* monsters that went down/up together with @ */
NEARDATA struct monst *mydogs = (struct monst *)0;
struct monst *mydogs = (struct monst *)0;
/* monsters that are moving to another dungeon level */
NEARDATA struct monst *migrating_mons = (struct monst *)0;
struct monst *migrating_mons = (struct monst *)0;
NEARDATA struct mvitals mvitals[NUMMONS];
struct mvitals mvitals[NUMMONS];
/* originally from end.c */
#ifdef DUMP_LOG
@ -246,7 +246,7 @@ char dump_fn[PL_PSIZ] = DUMMY;
#endif
#endif /* DUMP_LOG */
NEARDATA struct c_color_names c_color_names = {
struct c_color_names c_color_names = {
"black", "amber", "golden",
"light blue", "red", "green",
"silver", "blue", "purple",
@ -329,12 +329,12 @@ const struct material materials[] = {
};
/* Vision */
NEARDATA boolean vision_full_recalc = 0;
NEARDATA char **viz_array = 0;/* used in cansee() and couldsee() macros */
boolean vision_full_recalc = 0;
char **viz_array = 0;/* used in cansee() and couldsee() macros */
/* Global windowing data, defined here for multi-window-system support */
NEARDATA winid WIN_MESSAGE = WIN_ERR, WIN_STATUS = WIN_ERR;
NEARDATA winid WIN_MAP = WIN_ERR, WIN_INVEN = WIN_ERR;
winid WIN_MESSAGE = WIN_ERR, WIN_STATUS = WIN_ERR;
winid WIN_MAP = WIN_ERR, WIN_INVEN = WIN_ERR;
char toplines[TBUFSZ];
/* Windowing stuff that's really tty oriented, but present for all ports */
struct tc_gbl_data tc_gbl_data = { 0,0, 0,0 }; /* AS,AE, LI,CO */

2
src/dig.c
View file

@ -7,7 +7,7 @@
/* #define DEBUG */ /* turn on for diagnostics */
static NEARDATA boolean did_dig_msg;
static boolean did_dig_msg;
static void NDECL(fakerocktrap);
static void NDECL(openfakedoor);

6
src/do.c
View file

@ -21,7 +21,7 @@ static boolean NDECL(no_spirits);
/* static boolean FDECL(badspot, (XCHAR_P,XCHAR_P)); */
static NEARDATA const char drop_types[] =
static const char drop_types[] =
{ ALLOW_COUNT, COIN_CLASS, ALL_CLASSES, 0 };
/* 'd' command: drop one inventory item */
@ -892,7 +892,7 @@ enum AcuItemsCheck {
};
/* on a ladder, used in goto_level */
static NEARDATA boolean at_ladder = FALSE;
static boolean at_ladder = FALSE;
int
dodown()
@ -2674,7 +2674,7 @@ int
dowipe()
{
if(u.ucreamed) {
static NEARDATA char buf[39];
static char buf[39];
Sprintf(buf, "wiping off your %s", body_part(FACE));
set_occupation(wipeoff, buf, 0);

6
src/do_name.c
View file

@ -443,7 +443,7 @@ do_mname()
return(0);
}
static NEARDATA const char callable[] = {
static const char callable[] = {
SCROLL_CLASS, TILE_CLASS, POTION_CLASS, WAND_CLASS, RING_CLASS, AMULET_CLASS,
GEM_CLASS, SPBOOK_CLASS, ARMOR_CLASS, TOOL_CLASS, 0 };
@ -2176,7 +2176,7 @@ roguename() /* Name of a Rogue player */
#endif /* REINCARNATION */
static NEARDATA const char * const hcolors[] = {
static const char * const hcolors[] = {
"ultraviolet", "infrared", "bluish-orange",
"reddish-green", "dark white", "light black", "sky blue-pink",
"salty", "sweet", "sour", "bitter",
@ -2205,7 +2205,7 @@ rndcolor()
"colorless" : c_obj_colors[k];
}
static NEARDATA const char *const hliquids[] = {
static const char *const hliquids[] = {
"yoghurt", "oobleck", "clotted blood", "diluted water", "purified water",
"instant coffee", "tea", "herbal infusion", "liquid rainbow",
"creamy foam", "mulled wine", "bouillon", "nectar", "grog", "flubber",

18
src/do_wear.c
View file

@ -9,15 +9,15 @@
#include "artifact.h"
static NEARDATA long long takeoff_mask = 0LL;
static NEARDATA long long taking_off = 0LL;
static long long takeoff_mask = 0LL;
static long long taking_off = 0LL;
static NEARDATA int todelay;
static int todelay;
static boolean cancelled_don = FALSE;
static NEARDATA const char see_yourself[] = "see yourself";
static NEARDATA const char unknown_type[] = "Unknown type of %s (%d)";
static NEARDATA const char c_armor[] = "armor",
static const char see_yourself[] = "see yourself";
static const char unknown_type[] = "Unknown type of %s (%d)";
static const char c_armor[] = "armor",
c_suit[] = "suit",
c_shirt[] = "shirt",
c_cloak[] = "cloak",
@ -29,7 +29,7 @@ static NEARDATA const char c_armor[] = "armor",
c_sword[] = "sword",
c_axe[] = "axe",
c_that_[] = "that";
static NEARDATA const long long takeoff_order[] = { WORN_BLINDF, W_WEP,
static const long long takeoff_order[] = { WORN_BLINDF, W_WEP,
WORN_SHIELD, WORN_GLOVES,
W_RING0, W_RING1, W_RING2, W_RING3, W_RING4, W_RING5, W_RING6, W_RING7,
WORN_CLOAK, WORN_HELMET, WORN_AMUL, WORN_ARMOR,
@ -1512,8 +1512,8 @@ cancel_don()
taking_off = 0L;
}
static NEARDATA const char clothes[] = {ARMOR_CLASS, 0};
static NEARDATA const char accessories[] = {RING_CLASS, AMULET_CLASS, TOOL_CLASS, FOOD_CLASS, 0};
static const char clothes[] = {ARMOR_CLASS, 0};
static const char accessories[] = {RING_CLASS, AMULET_CLASS, TOOL_CLASS, FOOD_CLASS, 0};
/* the 'T' command */
int

2
src/dogmove.c
View file

@ -274,7 +274,7 @@ register struct monst *mon;
return (struct obj *)0;
}
static NEARDATA const char nofetch[] = { BALL_CLASS, CHAIN_CLASS, ROCK_CLASS, BED_CLASS, 0 };
static const char nofetch[] = { BALL_CLASS, CHAIN_CLASS, ROCK_CLASS, BED_CLASS, 0 };
static boolean FDECL(cursed_object_at, (int, int));

6
src/dokick.c
View file

@ -9,8 +9,8 @@
#define martial() (martial_bonus() || is_bigfoot(youracedata) || \
(uarmf && (uarmf->otyp == KICKING_BOOTS || (uarmf->otyp == IMPERIAL_ELVEN_BOOTS && check_imp_mod(uarmf, IEA_KICKING)))))
static NEARDATA struct rm *maploc;
static NEARDATA const char *gate_str;
static struct rm *maploc;
static const char *gate_str;
extern boolean notonhead; /* for long worms */
@ -20,7 +20,7 @@ static char *FDECL(kickstr, (char *));
static void FDECL(otransit_msg, (struct obj *, BOOLEAN_P, long));
static void FDECL(drop_to, (coord *,SCHAR_P));
static NEARDATA struct obj *kickobj;
static struct obj *kickobj;
static struct attack basickick = { AT_KICK, AD_PHYS, 0, 0 };
static struct attack basictail = { AT_TAIL, AD_PHYS, 1, 3 };

20
src/dothrow.c
View file

@ -16,10 +16,10 @@ static boolean FDECL(mhurtle_step, (genericptr_t,int,int));
extern boolean FDECL(quest_arti_hits_leader, (struct obj *, struct monst *));
static NEARDATA const char toss_objs[] =
static const char toss_objs[] =
{ ALLOW_COUNT, COIN_CLASS, ALL_CLASSES, WEAPON_CLASS, 0 };
/* different default choices when wielding a sling (gold must be included) */
static NEARDATA const char bullets[] =
static const char bullets[] =
{ ALLOW_COUNT, COIN_CLASS, ALL_CLASSES, GEM_CLASS, 0 };
@ -710,12 +710,12 @@ register struct obj *obj;
boolean is_buddy = sgn(mon->data->maligntyp) == sgn(u.ualign.type);
boolean is_gem = obj->obj_material == GEMSTONE;
int ret = 0;
static NEARDATA const char nogood[] = " is not interested in your junk.";
static NEARDATA const char acceptgift[] = " accepts your gift.";
static NEARDATA const char maybeluck[] = " hesitatingly";
static NEARDATA const char noluck[] = " graciously";
static NEARDATA const char addluck[] = " gratefully";
static NEARDATA const char isartifact[] = " drops it in shock!";
static const char nogood[] = " is not interested in your junk.";
static const char acceptgift[] = " accepts your gift.";
static const char maybeluck[] = " hesitatingly";
static const char noluck[] = " graciously";
static const char addluck[] = " gratefully";
static const char isartifact[] = " drops it in shock!";
Strcpy(buf,Monnam(mon));
mon->mpeaceful = 1;
@ -944,8 +944,8 @@ boolean from_invent;
struct monst *shkp = shop_keeper(*o_shop);
if (shkp) { /* (implies *o_shop != '\0') */
static NEARDATA long lastmovetime = 0L;
static NEARDATA boolean peaceful_shk = FALSE;
static long lastmovetime = 0L;
static boolean peaceful_shk = FALSE;
/* We want to base shk actions on her peacefulness
at start of this turn, so that "simultaneous"
multiple breakage isn't drastically worse than

8
src/eat.c
View file

@ -44,10 +44,10 @@ int etype; /* Clockwork's eat type */
static NEARDATA const char comestibles[] = { FOOD_CLASS, 0 };
static const char comestibles[] = { FOOD_CLASS, 0 };
/* Gold must come first for getobj(). */
static NEARDATA const char allobj[] = {
static const char allobj[] = {
COIN_CLASS, WEAPON_CLASS, ARMOR_CLASS, POTION_CLASS, SCROLL_CLASS, TILE_CLASS,
WAND_CLASS, RING_CLASS, AMULET_CLASS, FOOD_CLASS, TOOL_CLASS,
GEM_CLASS, ROCK_CLASS, BALL_CLASS, CHAIN_CLASS, SPBOOK_CLASS, BED_CLASS, SCOIN_CLASS, 0 };
@ -341,12 +341,12 @@ static const struct { const char *txt; int nut; } tintxts[] = {
};
#define TTSZ SIZE(tintxts)
static NEARDATA struct {
static struct {
struct obj *tin;
int usedtime, reqtime;
} tin;
static NEARDATA struct {
static struct {
struct obj *piece; /* the thing being eaten, or last thing that
* was partially eaten, unless that thing was
* a tin, which uses the tin structure above,

4
src/end.c
View file

@ -61,7 +61,7 @@ static boolean FDECL(should_query_disclose_option, (int,char *));
/*
* The order of these needs to match the macros in hack.h.
*/
static NEARDATA const char *deaths[] = { /* the array of death */
static const char *deaths[] = { /* the array of death */
"died", "betrayed", "choked", "poisoned", "starvation", "drowning", /*5*/
"burning", "dissolving under the heat and pressure",
"crushed", "turned to stone", "turned to gold", "turned to glass", "turned into slime",
@ -71,7 +71,7 @@ static NEARDATA const char *deaths[] = { /* the array of death */
"quit", "escaped", "ascended"
};
static NEARDATA const char *ends[] = { /* "when you..." */
static const char *ends[] = { /* "when you..." */
"died", "were betrayed", "choked", "were poisoned", "starved", "drowned",
"burned", "dissolved in the lava",
"were crushed", "turned to stone", "turned to gold", "turned to glass", "turned into slime",

4
src/engrave.c
View file

@ -11,7 +11,7 @@
#define WARD_MODE 2
#define SEAL_MODE 3
static NEARDATA struct engr *head_engr;
static struct engr *head_engr;
/* random engravings */
static const char *random_mesg[] = {
@ -1845,7 +1845,7 @@ freehand()
return(1);*/
}
static NEARDATA const char styluses[] =
static const char styluses[] =
{ ALL_CLASSES, ALLOW_NONE, TOOL_CLASS, WEAPON_CLASS, WAND_CLASS,
GEM_CLASS, RING_CLASS, 0 };

2
src/extralev.c
View file

@ -22,7 +22,7 @@ struct rogueroom {
#define LEFT 4
#define RIGHT 8
static NEARDATA struct rogueroom r[3][3];
static struct rogueroom r[3][3];
static void FDECL(roguejoin,(int,int,int,int,int));
static void FDECL(roguecorr,(int,int,int));
static void FDECL(miniwalk,(int,int));

4
src/hack.c
View file

@ -249,7 +249,7 @@ moverock()
lastmovetime = 0;
#else
/* note: reset to zero after save/restore cycle */
static NEARDATA long lastmovetime;
static long lastmovetime;
#endif
if (!u.usteed) {
if (moves > lastmovetime+2 || moves < lastmovetime)
@ -464,7 +464,7 @@ register xchar ox, oy;
newsym(ox, oy);
}
static NEARDATA const char fell_on_sink[] = "fell onto a sink";
static const char fell_on_sink[] = "fell onto a sink";
static void
dosinkfall()

14
src/invent.c
View file

@ -1639,7 +1639,7 @@ register struct obj *otmp;
W_WEP | W_SWAPWEP | W_QUIVER))));
}
static NEARDATA const char removeables[] =
static const char removeables[] =
{ ARMOR_CLASS, WEAPON_CLASS, RING_CLASS, AMULET_CLASS, TOOL_CLASS, 0 };
/* interactive version of getobj - used for Drop, Identify and */
@ -5566,14 +5566,14 @@ long numused;
* Conversion from a class to a string for printing.
* This must match the object class order.
*/
static NEARDATA const char *names[] = { 0,
static const char *names[] = { 0,
"Illegal objects", "Weapons", "Armor", "Rings", "Amulets",
"Tools", "Comestibles", "Potions", "Scrolls", "Spellbooks",
"Wands", "Coins", "Gems", "Boulders/Statues", "Iron balls",
"Scrap", "Venoms", "Tiles", "Furnature", "Strange coins"
};
static NEARDATA const char *bogusclasses[] = {
static const char *bogusclasses[] = {
"Illegal objects", "Weapons", "Armor", "Rings", "Amulets",
"Tools", "Comestibles", "Potions", "Scrolls", "Spellbooks",
"Wands", "Coins", "Gems", "Boulders/Statues", "Iron balls",
@ -5587,17 +5587,17 @@ static NEARDATA const char *bogusclasses[] = {
"SCPs","Bloat"
};
static NEARDATA const char oth_symbols[] = {
static const char oth_symbols[] = {
CONTAINED_SYM,
'\0'
};
static NEARDATA const char *oth_names[] = {
static const char *oth_names[] = {
"Bagged/Boxed items"
};
static NEARDATA char *invbuf = (char *)0;
static NEARDATA unsigned invbufsiz = 0;
static char *invbuf = (char *)0;
static unsigned invbufsiz = 0;
char *
let_to_name(let,unpaid,showsym)

2
src/lock.c
View file

@ -32,7 +32,7 @@ And I shall endure eternally. \
All hope abandon, ye who enter here!"
};
/* at most one of `door' and `box' should be non-null at any given time */
NEARDATA struct xlock_s {
struct xlock_s {
struct rm *door;
struct obj *box;
int picktyp, chance, usedtime;

2
src/mail.c
View file

@ -246,7 +246,7 @@ md_stop(stopp, startp)
}
/* Let the mail daemon have a larger vocabulary. */
static NEARDATA const char *mail_text[] = {
static const char *mail_text[] = {
"Gangway!",
"Look out!",
"Pardon me!"

12
src/makemon.c
View file

@ -165,12 +165,12 @@ int mkobjflags;
static const int ANGELTWOHANDERCUT = 4;
static NEARDATA int angelwepsbase[] = {
static int angelwepsbase[] = {
SABER, LONG_SWORD, LONG_SWORD, SABER,
TWO_HANDED_SWORD, GLAIVE, LANCE,
LUCERN_HAMMER,
};
static NEARDATA int angelweps[] = {
static int angelweps[] = {
ART_DEMONBANE, ART_SUNSWORD, ART_SWORD_OF_ERATHAOL, ART_SABER_OF_SABAOTH,
ART_SWORD_OF_ONOEL, ART_GLAIVE_OF_SHAMSIEL, ART_LANCE_OF_URIEL,
ART_HAMMER_OF_BARQUIEL,
@ -15317,8 +15317,8 @@ static int
align_shift(ptr)
register struct permonst *ptr;
{
static NEARDATA long oldmoves = 0L; /* != 1, starting value of moves */
static NEARDATA s_level *lev;
static long oldmoves = 0L; /* != 1, starting value of moves */
static s_level *lev;
register int alshift;
if(oldmoves != moves) {
@ -15339,7 +15339,7 @@ register struct permonst *ptr;
return alshift;
}
static NEARDATA struct {
static struct {
int choice_count;
int mchoices[SPECIAL_PM]; /* not at ALL sure the monsters fit into a char, and in this age trying to save such a
small amount of memory seems outdated */
@ -17509,7 +17509,7 @@ struct monst *mtmp;
}
static NEARDATA char syms[] = {
static char syms[] = {
MAXOCLASSES, MAXOCLASSES+1, RING_CLASS, WAND_CLASS, WEAPON_CLASS,
FOOD_CLASS, COIN_CLASS, SCROLL_CLASS, POTION_CLASS, ARMOR_CLASS,
AMULET_CLASS, TOOL_CLASS, ROCK_CLASS, GEM_CLASS, SPBOOK_CLASS,

2
src/mklev.c
View file

@ -694,7 +694,7 @@ int *dy, *xx, *yy;
}
/* there should be one of these per trap, in the same order as trap.h */
static NEARDATA const char *trap_engravings[TRAPNUM] = {
static const char *trap_engravings[TRAPNUM] = {
(char *)0, (char *)0, (char *)0, (char *)0, (char *)0,
(char *)0, (char *)0, (char *)0, (char *)0, (char *)0,
(char *)0, (char *)0, (char *)0, (char *)0,

12
src/monmove.c
View file

@ -2322,14 +2322,14 @@ struct monst *guardian;
}
}
static NEARDATA const char practical[] = { WEAPON_CLASS, ARMOR_CLASS, GEM_CLASS, FOOD_CLASS, 0 };
static NEARDATA const char magical[] = {
static const char practical[] = { WEAPON_CLASS, ARMOR_CLASS, GEM_CLASS, FOOD_CLASS, 0 };
static const char magical[] = {
AMULET_CLASS, POTION_CLASS, SCROLL_CLASS, WAND_CLASS, RING_CLASS,
SPBOOK_CLASS, TILE_CLASS, SCOIN_CLASS, 0 };
static NEARDATA const char indigestion[] = { BALL_CLASS, ROCK_CLASS, 0 };
static NEARDATA const char boulder_class[] = { ROCK_CLASS, 0 };
static NEARDATA const char gem_class[] = { GEM_CLASS, 0 };
static NEARDATA const char tool_class[] = { TOOL_CLASS, 0 };
static const char indigestion[] = { BALL_CLASS, ROCK_CLASS, 0 };
static const char boulder_class[] = { ROCK_CLASS, 0 };
static const char gem_class[] = { GEM_CLASS, 0 };
static const char tool_class[] = { TOOL_CLASS, 0 };
boolean
itsstuck(mtmp)

2
src/monst.c
View file

@ -105,7 +105,7 @@ void NDECL(monst_init);
*/
#ifndef SPLITMON_2
NEARDATA struct permonst mons[] = {
struct permonst mons[] = {
/*
* ants
*/

14
src/music.c
View file

@ -89,7 +89,7 @@ struct songspell {
/* songs based on enchantment spells must be the first ones on list, because of
SNG_LAST_ENCHANTMENT */
NEARDATA const struct songspell songs[] = {
const struct songspell songs[] = {
/* sp_id name level turns instr1 instr2 */
{ 0, "None", 0, 1, 0, 0 },
{ SPE_CAUSE_FEAR, "Fear", 1, 6, DRUM, TOOLED_HORN },
@ -115,16 +115,16 @@ NEARDATA const struct songspell songs[] = {
*/
};
static NEARDATA schar song_delay; /* moves left for this song */
static schar song_delay; /* moves left for this song */
struct obj *song_instr; /* musical instrument being played */
int instr_otyp; /* type of musical instrument being played */
uchar song_played = SNG_NONE; /* song being played (songs[] index)*/
boolean song_penalty; /* instrument penalty (see do_play_instrument) */
static NEARDATA int petsing; /* effect of pets singing with the player */
static NEARDATA int monsing; /* effect of monsters countersinging against the player */
static NEARDATA long petsing_lastcheck = 0L; /* last time pets were checked */
static NEARDATA long monsing_lastcheck = 0L; /* last time monsters were checked */
static NEARDATA char msgbuf[BUFSZ];
static int petsing; /* effect of pets singing with the player */
static int monsing; /* effect of monsters countersinging against the player */
static long petsing_lastcheck = 0L; /* last time pets were checked */
static long monsing_lastcheck = 0L; /* last time monsters were checked */
static char msgbuf[BUFSZ];
/*

2
src/o_init.c
View file

@ -13,7 +13,7 @@ static void NDECL(randomize_nonmatwands);
static boolean FDECL(interesting_to_discover,(int));
static NEARDATA short disco[NUM_OBJECTS] = DUMMY;
static short disco[NUM_OBJECTS] = DUMMY;
#ifdef USE_TILES
static void NDECL(shuffle_tiles);

4
src/objects.c
View file

@ -95,7 +95,7 @@ struct monst { struct monst *dummy; }; /* lint: struct obj's union */
# define OBJECT(names,bits,prp,sym,prob,dly,wt,cost,sdam,ldam,oc1,oc2,oc3,nut,color,...) \
{SETNAMES(names)}
NEARDATA struct objdescr obj_descr[] = {
struct objdescr obj_descr[] = {
#else
/* second pass -- object definitions */
@ -120,7 +120,7 @@ NEARDATA struct objdescr obj_descr[] = {
# define HARDGEM(n) (0)
# endif
NEARDATA struct objclass objects[] = {
struct objclass objects[] = {
#endif
/* dummy object[0] -- description [2nd arg] *must* be NULL */
OBJECT(("strange object",(char *)0), BITS(1,0,0,0,0,0,0,0,0,0,0,0,0,P_NONE,0,0),

8
src/objnam.c
View file

@ -44,7 +44,7 @@ blade would therefore actually look like a cylindrical mirror.
"black": A lightsaber made with a piece of fossil dark absorbs all
but the brightest light and casts darkness
*/
NEARDATA struct colorTextClr LightsaberColor[] = {
struct colorTextClr LightsaberColor[] = {
{"brilliant blue",CLR_BRIGHT_BLUE}, /*MAGICITE_CRYSTAL*/
{"twisting rainbow",CLR_WHITE}, /*DILITHIUM_CRYSTAL*/
{"coruscating white",CLR_WHITE}, /*DIAMOND*/
@ -245,8 +245,8 @@ register const char *pref;
static char *
nextobuf()
{
static char NEARDATA bufs[NUMOBUF][BUFSZ];
static char NEARDATA ibufs[NUMOBUF][BUFSZ];
static char bufs[NUMOBUF][BUFSZ];
static char ibufs[NUMOBUF][BUFSZ];
static int bufidx = 0;
static int ibufidx = 0;
@ -3449,7 +3449,7 @@ struct o_range {
/* wishable subranges of objects */
static NEARDATA const struct o_range o_ranges[] = {
static const struct o_range o_ranges[] = {
{ "bag", TOOL_CLASS, SACK, BAG_OF_TRICKS },
{ "lamp", TOOL_CLASS, OIL_LAMP, MAGIC_LAMP },
{ "candle", TOOL_CLASS, TALLOW_CANDLE, WAX_CANDLE },

12
src/options.c
View file

@ -3375,28 +3375,28 @@ goodfruit:
}
static NEARDATA const char *menutype[] = {
static const char *menutype[] = {
"traditional", "combination", "partial", "full"
};
static NEARDATA const char *burdentype[] = {
static const char *burdentype[] = {
"unencumbered", "burdened", "stressed",
"strained", "overtaxed", "overloaded"
};
static NEARDATA const char *pokedexsections[] = {
static const char *pokedexsections[] = {
"stats", "generation", "weight", "resists", "conveys",
"movement", "thinking", "biology", "mechanics", "race", "vision", "attacks"/*, "summary"*/
};
static NEARDATA const char *runmodes[] = {
static const char *runmodes[] = {
"teleport", "run", "walk", "crawl"
};
static NEARDATA const char *delay_lengths[] = {
static const char *delay_lengths[] = {
"none", "short", "normal"
};
static NEARDATA const char *sortltype[] = {
static const char *sortltype[] = {
"none", "loot", "full"
};

6
src/pickup.c
View file

@ -2126,7 +2126,7 @@ mbag_explodes(obj, depthin)
/* A variable set in use_container(), to be used by the callback routines */
/* in_container(), and out_container() from askchain() and use_container(). */
static NEARDATA struct obj *current_container;
static struct obj *current_container;
#define Icebox (current_container->otyp == ICE_BOX)
static boolean
@ -2490,7 +2490,7 @@ observe_quantum_cat(box, past)
struct obj *box;
boolean past;
{
static NEARDATA const char sc[] = "Schroedinger's Cat";
static const char sc[] = "Schroedinger's Cat";
struct obj *deadcat;
struct monst *livecat;
xchar ox, oy;
@ -2532,7 +2532,7 @@ open_coffin(box, past)
struct obj *box;
boolean past;
{
// static NEARDATA const char sc[] = "Schroedinger's Cat";
// static const char sc[] = "Schroedinger's Cat";
// Would be nice to name the vampire and put the name on the coffin. But not today.
struct monst *vampire;
xchar ox, oy;

4
src/polyself.c
View file

@ -1253,7 +1253,7 @@ dodemonpet()
return MOVE_STANDARD;
}
static NEARDATA const char food_types[] = { FOOD_CLASS, 0 };
static const char food_types[] = { FOOD_CLASS, 0 };
int
dovampminion()
@ -2093,7 +2093,7 @@ mbodypart(mon, part)
struct monst *mon;
int part;
{
static NEARDATA const char
static const char
*humanoid_parts[] = {
"arm", "eye", "face", "finger",
"fingertip", "foot", "hand", "handed",

4
src/potion.c
View file

@ -7,8 +7,8 @@
boolean notonhead = FALSE;
static NEARDATA int nothing, unkn;
static NEARDATA const char beverages[] = { POTION_CLASS, 0 };
static int nothing, unkn;
static const char beverages[] = { POTION_CLASS, 0 };
static long FDECL(itimeout, (long));
static void NDECL(ghost_from_bottle);

4
src/pray.c
View file

@ -354,7 +354,7 @@ register int trouble;
struct obj *otmp = 0;
const char *what = (const char *)0;
char buf[BUFSZ];
static NEARDATA const char ringglowmsg[] = "%s ring softly glows";
static const char ringglowmsg[] = "%s ring softly glows";
switch (trouble) {
case TROUBLE_STONED:
@ -1267,7 +1267,7 @@ int godnum;
angrygods(godnum);
}
static NEARDATA const char sacrifice_types[] = { FOOD_CLASS, AMULET_CLASS, 0 };
static const char sacrifice_types[] = { FOOD_CLASS, AMULET_CLASS, 0 };
static void
eat_offering(otmp, silently, eatflag)

4
src/projectile.c
View file

@ -2261,10 +2261,10 @@ dothrow()
}
/* get object to throw */
static NEARDATA const char toss_objs[] =
static const char toss_objs[] =
{ ALLOW_COUNT, COIN_CLASS, ALL_CLASSES, WEAPON_CLASS, 0 };
/* different default choices when wielding a sling (gold must be included) */
static NEARDATA const char bullets[] =
static const char bullets[] =
{ ALLOW_COUNT, COIN_CLASS, ALL_CLASSES, GEM_CLASS, 0 };
ammo = getobj(uslinging() ? bullets : toss_objs, "throw");

2
src/read.c
View file

@ -20,7 +20,7 @@
boolean known;
static NEARDATA const char readable[] =
static const char readable[] =
{ ALL_CLASSES, SCROLL_CLASS, TILE_CLASS, SPBOOK_CLASS, 0 };
static const char all_count[] = { ALLOW_COUNT, ALL_CLASSES, 0 };
static const int random_cloud_types[] = { AD_FIRE, AD_COLD, AD_ELEC, AD_ACID};

14
src/restore.c
View file

@ -51,8 +51,8 @@ static struct bucket *id_map = 0;
#include "quest.h"
boolean restoring = FALSE;
static NEARDATA struct fruit *oldfruit;
static NEARDATA long omoves;
static struct fruit *oldfruit;
static long omoves;
#define Is_IceBox(o) ((o)->otyp == ICE_BOX ? TRUE : FALSE)
@ -1034,11 +1034,11 @@ boolean ghostly;
#ifndef ZEROCOMP_BUFSIZ
#define ZEROCOMP_BUFSIZ BUFSZ
#endif
static NEARDATA unsigned char inbuf[ZEROCOMP_BUFSIZ];
static NEARDATA unsigned short inbufp = 0;
static NEARDATA unsigned short inbufsz = 0;
static NEARDATA short inrunlength = -1;
static NEARDATA int mreadfd;
static unsigned char inbuf[ZEROCOMP_BUFSIZ];
static unsigned short inbufp = 0;
static unsigned short inbufsz = 0;
static short inrunlength = -1;
static int mreadfd;
static int
mgetc()

2
src/role.c
View file

@ -1068,7 +1068,7 @@ static int FDECL(role_gendercount, (int));
static int FDECL(race_alignmentcount, (int));
/* used by str2XXX() */
static char NEARDATA randomstr[] = "random";
static char randomstr[] = "random";
boolean

10
src/save.c
View file

@ -495,11 +495,11 @@ int mode;
#ifndef ZEROCOMP_BUFSIZ
# define ZEROCOMP_BUFSIZ BUFSZ
#endif
static NEARDATA unsigned char outbuf[ZEROCOMP_BUFSIZ];
static NEARDATA unsigned short outbufp = 0;
static NEARDATA short outrunlength = -1;
static NEARDATA int bwritefd;
static NEARDATA boolean compressing = FALSE;
static unsigned char outbuf[ZEROCOMP_BUFSIZ];
static unsigned short outbufp = 0;
static short outrunlength = -1;
static int bwritefd;
static boolean compressing = FALSE;
/*dbg()
{

18
src/shk.c
View file

@ -22,7 +22,7 @@ static void FDECL(keter_gone, (BOOLEAN_P));
extern const struct shclass shtypes[]; /* defined in shknam.c */
//extern struct obj *thrownobj; /* defined in dothrow.c */
static NEARDATA long int followmsg; /* last time of follow message */
static long int followmsg; /* last time of follow message */
static long FDECL(addupbill, (struct monst *));
static void FDECL(setallstolen, (struct obj *));
@ -4685,16 +4685,16 @@ struct obj *obj;
static NEARDATA const char identify_types[] = { ALL_CLASSES, 0 };
static NEARDATA const char weapon_types[] = { WEAPON_CLASS, TOOL_CLASS, 0 };
static NEARDATA const char armor_types[] = { ARMOR_CLASS, 0 };
static const char identify_types[] = { ALL_CLASSES, 0 };
static const char weapon_types[] = { WEAPON_CLASS, TOOL_CLASS, 0 };
static const char armor_types[] = { ARMOR_CLASS, 0 };
/*
** FUNCTION shk_identify
**
** Pay the shopkeeper to identify an item.
*/
static NEARDATA const char ident_chars[] = "bp";
static const char ident_chars[] = "bp";
static void
shk_identify(slang, shkp)
@ -5508,10 +5508,10 @@ shk_armor_works(slang, shkp)
**
** Charge something (for a price!)
*/
static NEARDATA const char wand_types[] = { WAND_CLASS, 0 };
static NEARDATA const char tool_types[] = { TOOL_CLASS, 0 };
static NEARDATA const char ring_types[] = { RING_CLASS, 0 };
static NEARDATA const char spbook_types[] = { SPBOOK_CLASS, 0 };
static const char wand_types[] = { WAND_CLASS, 0 };
static const char tool_types[] = { TOOL_CLASS, 0 };
static const char ring_types[] = { RING_CLASS, 0 };
static const char spbook_types[] = { SPBOOK_CLASS, 0 };
static void
shk_charge(slang, shkp)

6
src/sp_lev.c
View file

@ -67,14 +67,14 @@ static boolean FDECL(create_subroom, (struct mkroom *, XCHAR_P, XCHAR_P,
#define NewTab(type, size) (type **) alloc(sizeof(type *) * (unsigned)size)
#define Free(ptr) if(ptr) free((genericptr_t) (ptr))
static NEARDATA walk walklist[50];
static walk walklist[50];
extern int min_rx, max_rx, min_ry, max_ry; /* from mkmap.c */
static char Map[COLNO][ROWNO];
static char robjects[10], rloc_x[10], rloc_y[10], rmonst[10];
static aligntyp ralign[3] = { AM_CHAOTIC, AM_NEUTRAL, AM_LAWFUL };
static NEARDATA xchar xstart, ystart;
static NEARDATA char xsize, ysize;
static xchar xstart, ystart;
static char xsize, ysize;
static void FDECL(set_wall_property, (XCHAR_P,XCHAR_P,XCHAR_P,XCHAR_P,int));
static int NDECL(rnddoor);

6
src/spell.c
View file

@ -7,9 +7,9 @@
#include "hack.h"
static NEARDATA schar delay; /* moves left for this spell */
static NEARDATA struct obj *book; /* last/current book being xscribed */
static NEARDATA int RoSbook; /* Read spell or Study Wards?" */
static schar delay; /* moves left for this spell */
static struct obj *book; /* last/current book being xscribed */
static int RoSbook; /* Read spell or Study Wards?" */
#define READ_SPELL 1
#define STUDY_WARD 2

8
src/steed.c
View file

@ -8,19 +8,19 @@
/* Monsters that might be ridden */
static NEARDATA const char steeds[] = {
static const char steeds[] = {
S_QUADRUPED, S_UNICORN, S_LAW_ANGEL, S_NEU_ANGEL, S_CHA_ANGEL, S_CENTAUR, S_DRAGON, S_JABBERWOCK, '\0'
};
static NEARDATA const char drow_steeds[] = {
static const char drow_steeds[] = {
S_SPIDER, S_LIZARD, S_DEMON, '\0'
};
static NEARDATA const char orc_steeds[] = {
static const char orc_steeds[] = {
S_DOG, S_DEMON, '\0'
};
static NEARDATA const char valk_steeds[] = {
static const char valk_steeds[] = {
S_DOG, '\0'
};

16
src/timeout.c
View file

@ -111,7 +111,7 @@ const struct propname {
};
/* He is being petrified - dialogue by inmet!tower */
static NEARDATA const char * const stoned_texts[] = {
static const char * const stoned_texts[] = {
"You are slowing down.", /* 5 */
"Your limbs are stiffening.", /* 4 */
"Your limbs have turned to stone.", /* 3 */
@ -135,7 +135,7 @@ stoned_dialogue()
exercise(A_DEX, FALSE);
}
static NEARDATA const char * const golded_texts[] = {
static const char * const golded_texts[] = {
"You are slowing down.", /* 5 */
"Your limbs are stiffening.", /* 4 */
"Your limbs have turned to gold.", /* 3 */
@ -192,7 +192,7 @@ phasing_dialogue()
}
/* He is getting sicker and sicker prior to vomiting */
static NEARDATA char * const vomiting_texts[] = {
static char * const vomiting_texts[] = {
"are feeling mildly nauseated.", /* 14 */
"feel slightly confused.", /* 11 */
"can't seem to think straight.", /* 8 */
@ -201,7 +201,7 @@ static NEARDATA char * const vomiting_texts[] = {
};
/* He is getting sicker and sicker prior to vomiting */
static NEARDATA char * const non_vomiting_texts[] = {
static char * const non_vomiting_texts[] = {
"are somehow feeling nauseated.", /* 14 */
"feel slightly confused.", /* 11 */
"can't seem to think straight.", /* 8 */
@ -235,7 +235,7 @@ vomiting_dialogue()
exercise(A_CON, FALSE);
}
static NEARDATA const char * const choke_texts[] = {
static const char * const choke_texts[] = {
"You find it hard to breathe.",
"You're gasping for air.",
"You can no longer breathe.",
@ -243,7 +243,7 @@ static NEARDATA const char * const choke_texts[] = {
"You suffocate."
};
static NEARDATA const char * const choke_texts2[] = {
static const char * const choke_texts2[] = {
"Your %s is becoming constricted.",
"Your blood is having trouble reaching your brain.",
"The pressure on your %s increases.",
@ -251,7 +251,7 @@ static NEARDATA const char * const choke_texts2[] = {
"You suffocate."
};
static NEARDATA const char * const choke_texts3[] = {
static const char * const choke_texts3[] = {
"You can't dislodge your meal.",
"You're gasping for air.",
"You can no longer breathe.",
@ -285,7 +285,7 @@ printchokestr:
exercise(A_STR, FALSE);
}
static NEARDATA const char * const slime_texts[] = {
static const char * const slime_texts[] = {
"You are turning a little %s.", /* 5 */
"Your limbs are getting oozy.", /* 4 */
"Your skin begins to peel away.", /* 3 */

2
src/topten.c
View file

@ -77,7 +77,7 @@ static void FDECL(writeachieveX, (char *));
static long FDECL(encode_xlogflags, (void));
/* must fit with end.c; used in rip.c */
NEARDATA const char * const killed_by_prefix[] = {
const char * const killed_by_prefix[] = {
"killed by ", "betrayed by ", "choked on ", "poisoned by ", "died of ", "drowned in ",
"burned by ", "dissolved in ", "crushed to death by ", "petrified by ",
"turned to slime by ", "exploded by ", "died by ", "disintegrated by ", "killed by ",

4
src/track.c
View file

@ -7,8 +7,8 @@
#define UTSZ 200
static NEARDATA int utcnt, utpnt;
static NEARDATA coord utrack[UTSZ];
static int utcnt, utpnt;
static coord utrack[UTSZ];
void

10
src/trap.c
View file

@ -113,9 +113,9 @@ boolean print;
struct monst *victim;
boolean candestroy;
{
static NEARDATA const char * const action[] = { "smolder", "rust", "rot", "corrode" };
static NEARDATA const char * const msg[] = { "burnt", "rusted", "rotten", "corroded" };
static NEARDATA const char * const destruction[] = { "burn", "rust", "rot", "corrode" };
static const char * const action[] = { "smolder", "rust", "rot", "corrode" };
static const char * const msg[] = { "burnt", "rusted", "rotten", "corroded" };
static const char * const destruction[] = { "burn", "rust", "rot", "corrode" };
boolean vulnerable = FALSE;
boolean grprot = FALSE;
boolean is_primary = TRUE;
@ -4260,8 +4260,8 @@ genericptr_t poolcnt;
}
/* getobj will filter down to cans of grease and known potions of oil */
static NEARDATA const char oil[] = { ALL_CLASSES, TOOL_CLASS, POTION_CLASS, 0 };
static NEARDATA const char disarmpotion[] = { ALL_CLASSES, POTION_CLASS, 0 };
static const char oil[] = { ALL_CLASSES, TOOL_CLASS, POTION_CLASS, 0 };
static const char disarmpotion[] = { ALL_CLASSES, POTION_CLASS, 0 };
/* water disarms, oil will explode */
static int

18
src/u_init.c
View file

@ -3184,16 +3184,16 @@ register struct trobj *trop;
obj->spe = rne(3);
fix_object(obj);
} else { /* UNDEF_TYP */
static NEARDATA short nocreate = STRANGE_OBJECT;
static NEARDATA short nocreate2 = STRANGE_OBJECT;
static NEARDATA short nocreate3 = STRANGE_OBJECT;
static NEARDATA short nocreate4 = STRANGE_OBJECT;
static NEARDATA short nocreate5 = STRANGE_OBJECT;
static NEARDATA short nocreate6 = STRANGE_OBJECT;
static NEARDATA short nocreate7 = STRANGE_OBJECT;
static short nocreate = STRANGE_OBJECT;
static short nocreate2 = STRANGE_OBJECT;
static short nocreate3 = STRANGE_OBJECT;
static short nocreate4 = STRANGE_OBJECT;
static short nocreate5 = STRANGE_OBJECT;
static short nocreate6 = STRANGE_OBJECT;
static short nocreate7 = STRANGE_OBJECT;
static NEARDATA short nocreateam1 = STRANGE_OBJECT;
static NEARDATA short nocreateam2 = STRANGE_OBJECT;
static short nocreateam1 = STRANGE_OBJECT;
static short nocreateam2 = STRANGE_OBJECT;
/*
* For random objects, do not create certain overly powerful
* items: wand of wishing, ring of levitation, or the

16
src/weapon.c
View file

@ -62,7 +62,7 @@ static void FDECL(mon_ignite_lightsaber, (struct obj *, struct monst *));
static void FDECL(give_may_advance_msg, (int));
static NEARDATA const short skill_names_indices[P_NUM_SKILLS] = {
static const short skill_names_indices[P_NUM_SKILLS] = {
0, DAGGER, KNIFE, AXE,
PICK_AXE, SHORT_SWORD, BROADSWORD, LONG_SWORD,
TWO_HANDED_SWORD, SCIMITAR, PN_SABER, CLUB,
@ -87,7 +87,7 @@ static NEARDATA const short skill_names_indices[P_NUM_SKILLS] = {
};
/* note: entry [0] isn't used */
static NEARDATA const char * const odd_skill_names[] = {
static const char * const odd_skill_names[] = {
"no skill",
"bare hands", /* use barehands_or_martial[] instead */
"two weapon combat",
@ -125,7 +125,7 @@ static NEARDATA const char * const odd_skill_names[] = {
"shield",
};
/* indexed vis `is_martial() */
static NEARDATA const char * const barehands_or_martial[] = {
static const char * const barehands_or_martial[] = {
"bare handed combat", "martial arts"
};
@ -155,7 +155,7 @@ static char *FDECL(max_skill_level_name, (int,char *));
static void FDECL(skill_advance, (int));
static NEARDATA const char kebabable[] = {
static const char kebabable[] = {
S_XORN, S_DRAGON, S_JABBERWOCK, S_NAGA, S_GIANT, '\0'
};
@ -1525,7 +1525,7 @@ struct monst *mtmp;
return obest;
}
static NEARDATA const int rwep[] =
static const int rwep[] =
{
RAZOR_WIRE/*damage plus lost turns*/,
BANDS/*lost turns*/,
@ -1561,7 +1561,7 @@ static NEARDATA const int rwep[] =
CREAM_PIE/*0*/
};
static NEARDATA const int pwep[] =
static const int pwep[] =
{
FORCE_PIKE,/*3d6+6/3d8+8*/
GOLD_BLADED_VIBROSPEAR,/*2d6+3/2d8+3*/
@ -1791,7 +1791,7 @@ register struct monst *mtmp;
}
/* Weapons in order of preference */
static const NEARDATA short hwep[] = {
static const short hwep[] = {
CORPSE, /* cockatrice corpse */
KAMEREL_VAJRA /*quite a lot plus elect plus blindness*/,
GOLD_BLADED_VIBROZANBATO,/*2d16+8/2d8+4d6+10*/
@ -1897,7 +1897,7 @@ static const NEARDATA short hwep[] = {
WORM_TOOTH/*1d2/1d2*/
};
static const NEARDATA short hpwep[] = {
static const short hpwep[] = {
CORPSE, /* cockatrice corpse */
KAMEREL_VAJRA /*quite a lot plus elect plus blindness*/,
GOLD_BLADED_VIBROZANBATO,/*2d16+8/2d8+4d6+10*/

6
src/wield.c
View file

@ -247,11 +247,11 @@ register struct obj *obj;
/*** Commands to change particular slot(s) ***/
static NEARDATA const char wield_objs[] =
static const char wield_objs[] =
{ ALL_CLASSES, ALLOW_NONE, WEAPON_CLASS, TOOL_CLASS, 0 };
static NEARDATA const char ready_objs[] =
static const char ready_objs[] =
{ ALL_CLASSES, ALLOW_NONE, WEAPON_CLASS, 0 };
static NEARDATA const char bullets[] = /* (note: different from dothrow.c) */
static const char bullets[] = /* (note: different from dothrow.c) */
{ ALL_CLASSES, ALLOW_NONE, GEM_CLASS, WEAPON_CLASS, 0 };
int

2
src/windows.c
View file

@ -12,7 +12,7 @@ extern struct window_procs curses_procs;
static void FDECL(def_raw_print, (const char *s));
NEARDATA struct window_procs windowprocs;
struct window_procs windowprocs;
static
struct win_choices {

4
src/wizard.c
View file

@ -28,7 +28,7 @@ static void FDECL(aglaopesong, (struct monst *));
static int xprime = 0, yprime = 0;
static NEARDATA const int nasties[] = {
static const int nasties[] = {
/* neutral */
PM_COCKATRICE, PM_ETTIN, PM_STALKER, PM_MINOTAUR,
PM_OWLBEAR, PM_PURPLE_WORM, PM_XAN, PM_UMBER_HULK,
@ -52,7 +52,7 @@ static NEARDATA const int nasties[] = {
PM_GREEN_STEEL_GOLEM, PM_MAID, PM_HELLCAT
};
static NEARDATA const unsigned wizapp[] = {
static const unsigned wizapp[] = {
PM_HUMAN, PM_MARID, PM_VAMPIRE,
PM_RED_DRAGON, PM_TROLL, PM_UMBER_HULK,
PM_XORN, PM_XAN, PM_COCKATRICE,

2
src/write.c
View file

@ -70,7 +70,7 @@ register struct obj *otmp;
return(1000);
}
static NEARDATA const char write_on[] = { SCROLL_CLASS, SPBOOK_CLASS, 0 };
static const char write_on[] = { SCROLL_CLASS, SPBOOK_CLASS, 0 };
int
dowrite(pen)

6
src/zap.c
View file

@ -14,8 +14,8 @@
*/
#define MAGIC_COOKIE 1000
static NEARDATA boolean obj_zapped;
static NEARDATA int poly_zapped;
static boolean obj_zapped;
static int poly_zapped;
extern boolean notonhead; /* for long worms */
@ -2577,7 +2577,7 @@ struct obj *otmp;
useup(otmp);
}
static NEARDATA const char zap_syms[] = { ARMOR_CLASS, WAND_CLASS, TOOL_CLASS, RING_CLASS, 0 };
static const char zap_syms[] = { ARMOR_CLASS, WAND_CLASS, TOOL_CLASS, RING_CLASS, 0 };
int
dozap()

2
util/lev_main.c
View file

@ -1591,7 +1591,7 @@ char SAVEF[ARBITRARY_SIZE];
/* termcap.c */
struct tc_lcl_data tc_lcl_data;
# ifdef TEXTCOLOR
char NEARDATA *hilites[CLR_MAX];
char *hilites[CLR_MAX];
# endif
/* trap.c */
const char *traps[TRAPNUM];

2
util/makedefs.c
View file

@ -2124,7 +2124,7 @@ clear_path(you_row,you_col,y2,x2)
#endif /* VISION_TABLES */
#ifdef STRICT_REF_DEF
NEARDATA struct flag flags;
struct flag flags;
# ifdef ATTRIB_H
struct attribs attrmax, attrmin;
# endif

2
win/tty/termcap.c
View file

@ -50,7 +50,7 @@ static char tbuf[512];
#endif
#ifdef TEXTCOLOR
char NEARDATA *hilites[CLR_MAX]; /* terminal escapes for the various colors */
char *hilites[CLR_MAX]; /* terminal escapes for the various colors */
#endif
static char *KS = (char *)0, *KE = (char *)0; /* keypad sequences */