Re: Biodiversity patch

After making a few additions to the makefiles in sys/autoconf, I have
successfully compiled T. J. Brumfield's port of the biodiversity patch.
The game now runs but (immediately after creating a character) panics
at line 283 of dungeon.c "level_range: base value out of range". I have
attached my changes in a file slashem-k1.patch

I had to change the makefiles in sys/autoconf to make sure that both
photo.c and the riddles are part of the build. I did not change the
other makefiles in sys/unix, so the Unix build only works if I run the
configure script instead of the sys/unix/setup.sh script.

Meanwhile, I also added a line to sys/autoconf/configure.ac (to match
Brumfield's changes to configure, in case I try to regenerate the
configure script later) and I fixed a bug in photo.c (my
compiler's "char" defaults to unsigned so it cannot store -1, I changed
a short_desc argument to "schar").

First checkout slashem from cvs and apply T. J. Brumfield's patch
http://enderandrew.com/pub/slashem-biodiversity.patch.bz2

Then apply the attached slashem-k1.patch
$ patch -p1 < ../slashem-k1.patch

[slashem-k1.patch]

---

diff -apruN slashem-bio/src/photo.c slashem-k1/src/photo.c
--- slashem-bio/src/photo.c Fri Oct 12 20:56:16 2007
+++ slashem-k1/src/photo.c Fri Oct 12 21:56:24 2007
@@ -5,7 +5,7 @@
 #include "hack.h"
 #ifdef NEPHI_PHOTOGRAPHY
 
-STATIC_DCL char *FDECL(short_desc,(struct photograph*,char,char* (*)(const char*)));
+STATIC_DCL char *FDECL(short_desc,(struct photograph*,schar,char* (*)(const char*)));
 STATIC_DCL boolean FDECL(photographable, (struct permonst*));
 STATIC_DCL void FDECL(film_mon, (struct mon_photo *,struct monst *,char*));
 STATIC_DCL void FDECL(film_obj, (struct obj_photo *,struct obj *,char*));
@@ -108,7 +108,7 @@ scc fly_the_bird[] = "%s seems to be mak
 STATIC_OVL char*
 short_desc(photo,override,article_func)
 struct photograph* photo;
-char override;
+schar override;
 char* FDECL((*article_func), (const char*));
 {
 #ifdef LINT /* static char buf[BUFSZ]; */
diff -apruN slashem-bio/sys/autoconf/Makefile.dat slashem-k1/sys/autoconf/Makefile.dat
--- slashem-bio/sys/autoconf/Makefile.dat Sat Sep 17 10:58:33 2005
+++ slashem-k1/sys/autoconf/Makefile.dat Fri Oct 12 21:17:12 2007
@@ -11,7 +11,7 @@ EXEEXT = @EXEEXT@
 # SHELL=E:/GEMINI2/MUPFEL.TTP
 # UUDECODE=uudecode
 
-VARDAT = data rumors quest.dat oracles options
+VARDAT = data rumors quest.dat oracles riddles options
 
 all: $(VARDAT) spec_levs quest_levs dungeon
 
@@ -279,6 +279,9 @@ quest.dat: quest.txt ../util/makedefs
 
 oracles: oracles.txt ../util/makedefs
  ../util/makedefs -h
+
+riddles: riddles.txt ../util/makedefs
+ ../util/makedefs -b
 
 # note: 'options' should have already been made when include/date.h was created
 options: ../util/makedefs
diff -apruN slashem-bio/sys/autoconf/Makefile.src slashem-k1/sys/autoconf/Makefile.src
--- slashem-bio/sys/autoconf/Makefile.src Sat Sep 17 10:58:33 2005
+++ slashem-k1/sys/autoconf/Makefile.src Fri Oct 12 20:58:34 2007
@@ -206,7 +206,7 @@ HACKCSRC = $(srcdir)/allmain.c $(srcdir)
  $(srcdir)/version.c $(srcdir)/vision.c $(srcdir)/weapon.c \
  $(srcdir)/were.c $(srcdir)/wield.c $(srcdir)/windows.c \
  $(srcdir)/wizard.c $(srcdir)/worm.c $(srcdir)/worn.c $(srcdir)/write.c \
- $(srcdir)/zap.c $(srcdir)/gypsy.c $(srcdir)/tech.c
+ $(srcdir)/zap.c $(srcdir)/gypsy.c $(srcdir)/tech.c $(srcdir)/photo.c
 
 # all operating-system-dependent .c (for dependencies and such)
 SYSCSRC = $(srcdir)/../sys/share/nhlan.c $(srcdir)/../sys/share/ioctl.c \
@@ -269,7 +269,7 @@ HOBJ = $(FIRSTOBJ) allmain.o apply.o art
  steal.o steed.o teleport.o timeout.o topten.o track.o trap.o u_init.o \
  uhitm.o vault.o vision.o vis_tab.o weapon.o were.o wield.o windows.o \
  wizard.o worm.o worn.o write.o zap.o \
- gypsy.o tech.o \
+ gypsy.o tech.o photo.o \
  $(RANDOBJ) $(SYSOBJ) $(WINOBJ) version.o
 # the .o files from the HACKCSRC, SYSSRC, and WINSRC lists
 
diff -apruN slashem-bio/sys/autoconf/Makefile.top slashem-k1/sys/autoconf/Makefile.top
--- slashem-bio/sys/autoconf/Makefile.top Sat Dec 30 07:48:19 2006
+++ slashem-k1/sys/autoconf/Makefile.top Fri Oct 12 21:15:38 2007
@@ -104,7 +104,7 @@ CNF_SHARE_PROXYND = gltile64.png gltile3
 # CNF_SHARE_DATND = $(CNF_SHARE_PROXYND)
 CNF_SHARE_DATND = @CNF_SHARE_DATND@
 
-CNF_SHARE_DATD = data oracles options quest.dat rumors
+CNF_SHARE_DATD = data oracles options quest.dat riddles rumors
 CNF_SHARE_DAT = $(CNF_SHARE_DATD) $(CNF_SHARE_DATND)
 
 # Some versions of make use the SHELL environment variable as the shell
@@ -131,7 +131,7 @@ DATHELP = help hh cmdhelp history opthel
 SPEC_LEVS = asmodeus.lev baalz.lev bigrm-?.lev castle.lev fakewiz?.lev \
  juiblex.lev knox.lev medusa-?.lev minend-?.lev minefill.lev \
  minetn-?.lev oracle.lev orcus.lev sanctum.lev soko?-?.lev \
- tower?.lev valley.lev wizard?.lev \
+ tower?.lev valley.lev wizard?.lev heck-?-?.lev \
  astral.lev air.lev earth.lev fire.lev water.lev \
  beholder.lev blkmar.lev cav2fill.lev \
  grund-?.lev demogorg.lev dispater.lev dragons.lev geryon.lev \
@@ -170,6 +170,9 @@ rumors: $(GAME)
 
 oracles: $(GAME)
  ( cd dat ; $(MAKE) oracles )
+
+riddles: $(GAME)
+ ( cd dat ; $(MAKE) riddles )
 
 # Note: options should have already been made with make, but...
 options: $(GAME)
diff -apruN slashem-bio/sys/autoconf/configure.ac slashem-k1/sys/autoconf/configure.ac
--- slashem-bio/sys/autoconf/configure.ac Mon Jan 29 01:42:23 2007
+++ slashem-k1/sys/autoconf/configure.ac Fri Oct 12 22:08:07 2007
@@ -402,6 +402,7 @@ NETHACK_LINKS_ADD([include/file.h])
 NETHACK_LINKS_ADD([dat/data.base])
 NETHACK_LINKS_ADD([dat/rumors.tru])
 NETHACK_LINKS_ADD([dat/rumors.fal])
+NETHACK_LINKS_ADD([dat/riddles.txt])
 NETHACK_LINKS_ADD([dat/quest.txt])
 NETHACK_LINKS_ADD([dat/oracles.txt])
 NETHACK_LINKS_ADD([dat/dungeon.def])

---

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Slashem-devel mailing list
Slashem-devel@...
https://lists.sourceforge.net/lists/listinfo/slashem-devel