[patch] include all the previous patches + some warning fixes

2.1.1-default-options.patch (text/plain), 4.15 KB, created by Jon Daniel on 2008-07-10 20:18:51 UTC

diff -ru vultures-2.1.1.orig/nethack/include/config.h vultures-2.1.1/nethack/include/config.h
--- vultures-2.1.1.orig/nethack/include/config.h	2006-09-18 17:04:06.000000000 +0200
+++ vultures-2.1.1/nethack/include/config.h	2008-07-10 14:23:36.000000000 +0200
@@ -179,8 +179,8 @@
 
 #ifdef UNIX
 /* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress"   /* Lempel-Ziv compression */                                      
-#define COMPRESS_EXTENSION ".Z"        /* compress's extension */                                        
+#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 */                                   
@@ -214,7 +214,7 @@
  * otherwise it will be the current directory.
  */
 # ifndef HACKDIR
-#  define HACKDIR "/usr/games/lib/nethackdir"
+#  define HACKDIR "GENTOO_HACKDIR"
 # endif
 
 /*
@@ -310,7 +310,7 @@
  * functions that have been macroized.
  */
 
-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
+#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 */
diff -ru vultures-2.1.1.orig/nethack/include/monst.h vultures-2.1.1/nethack/include/monst.h
--- vultures-2.1.1.orig/nethack/include/monst.h	2006-09-18 17:04:06.000000000 +0200
+++ vultures-2.1.1/nethack/include/monst.h	2008-07-10 16:14:23.000000000 +0200
@@ -40,7 +40,7 @@
 struct monst {
 	struct monst *nmon;
 	struct permonst *data;
-	unsigned m_id;
+	unsigned long m_id;
 	short mnum;		/* permanent monster index number */
 	short movement;		/* movement points (derived from permonst definition and added effects */
 	uchar m_lev;		/* adjusted difficulty level of monster */
diff -ru vultures-2.1.1.orig/nethack/include/obj.h vultures-2.1.1/nethack/include/obj.h
--- vultures-2.1.1.orig/nethack/include/obj.h	2006-09-18 17:04:06.000000000 +0200
+++ vultures-2.1.1/nethack/include/obj.h	2008-07-10 16:07:22.000000000 +0200
@@ -22,7 +22,7 @@
 #define ocarry		v.v_ocarry
 
 	struct obj *cobj;	/* contents list for containers */
-	unsigned o_id;
+	unsigned long o_id;
 	xchar ox,oy;
 	short otyp;		/* object class number */
 	unsigned owt;
diff -ru vultures-2.1.1.orig/nethack/include/unixconf.h vultures-2.1.1/nethack/include/unixconf.h
--- vultures-2.1.1.orig/nethack/include/unixconf.h	2006-09-18 17:04:06.000000000 +0200
+++ vultures-2.1.1/nethack/include/unixconf.h	2008-07-10 15:21:57.000000000 +0200
@@ -96,13 +96,13 @@
  */
 
 /* #define NO_FILE_LINKS */	/* if no hard links */
-/* #define LOCKDIR "/usr/games/lib/nethackdir" */	/* where to put locks */
+#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 "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "GENTOO_STATEDIR" 
 
 
 /*
diff -ru vultures-2.1.1.orig/nethack/src/light.c vultures-2.1.1/nethack/src/light.c
--- vultures-2.1.1.orig/nethack/src/light.c	2006-09-18 17:04:06.000000000 +0200
+++ vultures-2.1.1/nethack/src/light.c	2008-07-10 16:15:29.000000000 +0200
@@ -301,17 +301,17 @@
     boolean ghostly;
 {
     char which;
-    unsigned nid;
+    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)ls->id, &nid))
+		    if (!lookup_id_mapping((unsigned long)ls->id, &nid))
 			impossible("relink_light_sources: no id mapping");
 		} else
-		    nid = (unsigned) ls->id;
+		    nid = (unsigned long) ls->id;
 		if (ls->type == LS_OBJECT) {
 		    which = 'o';
 		    ls->id = (genericptr_t) find_oid(nid);