Attachment #160074 for bug #118255





#ifdef UNIX
/* path and file name extension for compression program */
#define COMPRESS "/usr/bin/bzip2"   /* Lempel-Ziv compression */                                      
#define COMPRESS_EXTENSION ".bz2"        /* compress's extension */                                        
/* An example of one alternative you might want to use: */
/* #define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */                                
/* #define COMPRESS_EXTENSION ".gz" */     /* normal gzip extension */                                   

 * otherwise it will be the current directory.
 */
# ifndef HACKDIR
#  define HACKDIR "GENTOO_HACKDIR"
# endif

/*

 * functions that have been macroized.
 */

#define VISION_TABLES /* use vision tables generated at compile time */
#ifndef VISION_TABLES
# ifndef NO_MACRO_CPATH
#  define MACRO_CPATH	/* use clear_path macros instead of functions */

Lines 40-46 Link Here

(-)vultures-2.1.1.orig/nethack/include/monst.h (-1 / +1 lines)
40	struct monst {	40	struct monst {
41	struct monst *nmon;	41	struct monst *nmon;
42	struct permonst *data;	42	struct permonst *data;
43	unsigned m_id;	43	unsigned long m_id;
44	short mnum; /* permanent monster index number */	44	short mnum; /* permanent monster index number */
45	short movement; /* movement points (derived from permonst definition and added effects */	45	short movement; /* movement points (derived from permonst definition and added effects */
46	uchar m_lev; /* adjusted difficulty level of monster */	46	uchar m_lev; /* adjusted difficulty level of monster */

Lines 22-28 Link Here

(-)vultures-2.1.1.orig/nethack/include/obj.h (-1 / +1 lines)
22	#define ocarry v.v_ocarry	22	#define ocarry v.v_ocarry
23		23
24	struct obj cobj; / contents list for containers */	24	struct obj cobj; / contents list for containers */
25	unsigned o_id;	25	unsigned long o_id;
26	xchar ox,oy;	26	xchar ox,oy;
27	short otyp; /* object class number */	27	short otyp; /* object class number */
28	unsigned owt;	28	unsigned owt;




 */

/* #define NO_FILE_LINKS */	/* if no hard links */
#define LOCKDIR "GENTOO_STATEDIR"	/* where to put locks */

/*
 * If you want the static parts of your playground on a read-only file
 * system, define VAR_PLAYGROUND to be where the variable parts are kept.
 */
#define VAR_PLAYGROUND "GENTOO_STATEDIR" 


/*




    boolean ghostly;
{
    char which;
    unsigned long nid;
    light_source *ls;

    for (ls = light_base; ls; ls = ls->next) {
	if (ls->flags & LSF_NEEDS_FIXUP) {
	    if (ls->type == LS_OBJECT || ls->type == LS_MONSTER) {
		if (ghostly) {
		    if (!lookup_id_mapping((unsigned long)ls->id, &nid))
			impossible("relink_light_sources: no id mapping");
		} else
		    nid = (unsigned long) ls->id;
		if (ls->type == LS_OBJECT) {
		    which = 'o';
		    ls->id = (genericptr_t) find_oid(nid);

Return to bug 118255

Lines 179-186 Link Here

(-)vultures-2.1.1.orig/nethack/include/config.h (-4 / +4 lines)
179		179
180	#ifdef UNIX	180	#ifdef UNIX
181	/* path and file name extension for compression program */	181	/* path and file name extension for compression program */
182	#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */	182	#define COMPRESS "/usr/bin/bzip2" /* Lempel-Ziv compression */
183	#define COMPRESS_EXTENSION ".Z" /* compress's extension */	183	#define COMPRESS_EXTENSION ".bz2" /* compress's extension */
184	/* An example of one alternative you might want to use: */	184	/* An example of one alternative you might want to use: */
185	/* #define COMPRESS "/usr/local/bin/gzip" / / FSF gzip compression */	185	/* #define COMPRESS "/usr/local/bin/gzip" / / FSF gzip compression */
186	/* #define COMPRESS_EXTENSION ".gz" / / normal gzip extension */	186	/* #define COMPRESS_EXTENSION ".gz" / / normal gzip extension */
Lines 214-220 Link Here
214	* otherwise it will be the current directory.	214	* otherwise it will be the current directory.
215	*/	215	*/
216	# ifndef HACKDIR	216	# ifndef HACKDIR
217	# define HACKDIR "/usr/games/lib/nethackdir"	217	# define HACKDIR "GENTOO_HACKDIR"
218	# endif	218	# endif
219		219
220	/*	220	/*
Lines 310-316 Link Here
310	* functions that have been macroized.	310	* functions that have been macroized.
311	*/	311	*/
312		312
313	/* #define VISION_TABLES / / use vision tables generated at compile time */	313	#define VISION_TABLES /* use vision tables generated at compile time */
314	#ifndef VISION_TABLES	314	#ifndef VISION_TABLES
315	# ifndef NO_MACRO_CPATH	315	# ifndef NO_MACRO_CPATH
316	# define MACRO_CPATH /* use clear_path macros instead of functions */	316	# define MACRO_CPATH /* use clear_path macros instead of functions */

Lines 96-108 Link Here

(-)vultures-2.1.1.orig/nethack/include/unixconf.h (-2 / +2 lines)
96	*/	96	*/
97		97
98	/* #define NO_FILE_LINKS / / if no hard links */	98	/* #define NO_FILE_LINKS / / if no hard links */
99	/* #define LOCKDIR "/usr/games/lib/nethackdir" / / where to put locks */	99	#define LOCKDIR "GENTOO_STATEDIR" /* where to put locks */
100		100
101	/*	101	/*
102	* If you want the static parts of your playground on a read-only file	102	* If you want the static parts of your playground on a read-only file
103	* system, define VAR_PLAYGROUND to be where the variable parts are kept.	103	* system, define VAR_PLAYGROUND to be where the variable parts are kept.
104	*/	104	*/
105	/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */	105	#define VAR_PLAYGROUND "GENTOO_STATEDIR"
106		106
107		107
108	/*	108	/*

Lines 301-317 Link Here

(-)vultures-2.1.1.orig/nethack/src/light.c (-3 / +3 lines)
301	boolean ghostly;	301	boolean ghostly;
302	{	302	{
303	char which;	303	char which;
304	unsigned nid;	304	unsigned long nid;
305	light_source *ls;	305	light_source *ls;
306		306
307	for (ls = light_base; ls; ls = ls->next) {	307	for (ls = light_base; ls; ls = ls->next) {
308	if (ls->flags & LSF_NEEDS_FIXUP) {	308	if (ls->flags & LSF_NEEDS_FIXUP) {
309	if (ls->type == LS_OBJECT \|\| ls->type == LS_MONSTER) {	309	if (ls->type == LS_OBJECT \|\| ls->type == LS_MONSTER) {
310	if (ghostly) {	310	if (ghostly) {
311	if (!lookup_id_mapping((unsigned)ls->id, &nid))	311	if (!lookup_id_mapping((unsigned long)ls->id, &nid))
312	impossible("relink_light_sources: no id mapping");	312	impossible("relink_light_sources: no id mapping");
313	} else	313	} else
314	nid = (unsigned) ls->id;	314	nid = (unsigned long) ls->id;
315	if (ls->type == LS_OBJECT) {	315	if (ls->type == LS_OBJECT) {
316	which = 'o';	316	which = 'o';
317	ls->id = (genericptr_t) find_oid(nid);	317	ls->id = (genericptr_t) find_oid(nid);