Mercurial > hg > early-roguelike
view rogue3/Makefile.in @ 111:7f8f43943b1f
Fix some terribly depressing corruption during restore.
In rogue5/state.c, rs_read_daemons() zeroes out the argument and delay
if the daemon slot is empty. Unfortunately that code ended up on the
wrong side of the brace that closes the for loop, so instead of running
after each daemon, it got run once after the loop exited, when the
index was of course out of bounds.
This tended to manifest, when compiled with -O2, by overwriting hw and
setting it to NULL. When inventory() next ran, hw would be passed to
wgetch(), which returns ERR when it gets a NULL argument. This made
md_readchar() think something was wrong and autosave the game.
Upon investigation, rogue3 was found to commit the same mistake.
rogue4 and srogue don't zero the data. arogue5 already does it
properly.
Someday I am going to run all this through Valgrind. Someday when I
am a kinder person who will not be driven to invoke hordes of trolls
and centaurs upon the original authors.
author | John "Elwin" Edwards |
---|---|
date | Wed, 08 Jan 2014 16:44:16 -0500 |
parents | 53e69c17c313 |
children | 97f8fdf9595c |
line wrap: on
line source
# # Makefile for rogue # %W% (Berkeley) %G% # # Rogue: Exploring the Dungeons of Doom # Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman # All rights reserved. # # See the file LICENSE.TXT for full copyright and licensing information. # DISTNAME=@PACKAGE_TARNAME@@PACKAGE_VERSION@ PACKAGE_TARNAME=@PACKAGE_TARNAME@-@PACKAGE_VERSION@ PROGRAM=@PROGRAM@ SCOREFILE=@SCOREFILE@ LOGFILE=@LOGFILE@ SAVEDIR=@SAVEDIR@ GROUPOWNER=@GROUPOWNER@ DESTDIR= prefix=@prefix@ exec_prefix=@exec_prefix@ datarootdir=@datarootdir@ bindir=@bindir@ mandir=@mandir@ man6dir=$(mandir)/man6 docdir=@docdir@ O=o HDRS= rogue.h machdep.h config.h OBJS1 = vers.$(O) armor.$(O) chase.$(O) command.$(O) daemon.$(O) daemons.$(O) \ fight.$(O) init.$(O) io.$(O) list.$(O) main.$(O) mdport.$(O) \ misc.$(O) monsters.$(O) move.$(O) newlevel.$(O) options.$(O) OBJS2 = pack.$(O) passages.$(O) potions.$(O) rings.$(O) rip.$(O) rooms.$(O) \ save.$(O) scrolls.$(O) state.$(O) sticks.$(O) things.$(O) \ weapons.$(O) wizard.$(O) xcrypt.$(O) OBJS = $(OBJS1) $(OBJS2) CFILES= vers.c armor.c chase.c command.c daemon.c daemons.c fight.c \ init.c io.c list.c main.c mdport.c misc.c monsters.c move.c newlevel.c \ options.c pack.c passages.c potions.c rings.c rip.c rooms.c \ save.c scrolls.c state.c sticks.c things.c weapons.c wizard.c xcrypt.c MISC_C= DOCSRC= rogue.6 rogue.r DOCS = $(PROGRAM).doc $(PROGRAM).cat $(PROGRAM).html readme36.html MISC = Makefile $(MISC_C) LICENSE.TXT $(PROGRAM).sln $(PROGRAM).vcproj $(DOCS)\ $(DOCSRC) CC = gcc CPPFLAGS =@DEFS@ ROPTS = COPTS = -O3 CFLAGS= $(COPTS) $(ROPTS) LIBS = -lcurses RM = rm -f LD = $(CC) LDOUT = -o INSTALL=@INSTALL@ .SUFFIXES: .obj .c.obj: $(CC) $(CFLAGS) /c $*.c $(PROGRAM)$(EXE): $(HDRS) $(OBJS) $(LD) $(LDFLAGS) $(OBJS) $(LIBS) $(LDOUT)$@ clean: $(RM) $(OBJS1) $(RM) $(OBJS2) $(RM) core $(PROGRAM) $(PROGRAM).exe $(DISTNAME).tar $(DISTNAME).tar.gz $(RM) $(DISTNAME).zip install: $(PROGRAM) -touch test -if test ! -f $(DESTDIR)$(SCOREFILE) ; \ then $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi -if test "x$(LOGFILE)" != "x" && test ! -f $(DESTDIR)$(LOGFILE) ; then \ $(INSTALL) -m 0664 test $(DESTDIR)$(LOGFILE) ; fi -if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \ mkdir -p $(DESTDIR)$(SAVEDIR) ; fi -$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) -if test "x$(GROUPOWNER)" != "x" ; then \ chgrp $(GROUPOWNER) $(DESTDIR)$(SCOREFILE) ; \ chgrp $(GROUPOWNER) $(DESTDIR)$(LOGFILE) ; \ chgrp $(GROUPOWNER) $(DESTDIR)$(bindir)/$(PROGRAM) ; \ chgrp $(GROUPOWNER) $(DESTDIR)$(SAVEDIR) ; \ chmod 02755 $(DESTDIR)$(bindir)/$(PROGRAM) ; \ chmod 0464 $(DESTDIR)$(SCOREFILE) ; \ chmod 0464 $(DESTDIR)$(LOGFILE) ; \ chmod 0775 $(DESTDIR)$(SAVEDIR) ; \ fi -if test -d $(DESTDIR)$(man6dir) ; \ then $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(man6dir)/$(PROGRAM).6 ; fi -if test ! -d $(DESTDIR)$(man6dir) ; \ then $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(mandir)/$(PROGRAM).6 ; fi -if test ! -d $(DESTDIR)$(docdir) ; \ then mkdir -p $(DESTDIR)$(docdir) ; fi -$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT -$(INSTALL) -m 0644 rogue.r $(DESTDIR)$(docdir)/$(PROGRAM).r -$(RM) test uninstall: -$(RM) $(DESTDIR)$(bindir)/$(PROGRAM) -$(RM) $(DESTDIR)$(man6dir)/$(PROGRAM).6 -$(RM) $(DESTDIR)$(docdir)$(PROGRAM)/$(PROGRAM).doc -$(RMDIR) $(DESTDIR)$(docdir)$(PROGRAM) reinstall: uninstall install dist.src: make clean tar cf $(DISTNAME)-src.tar $(CFILES) $(HDRS) $(MISC) $(DOCS) gzip -f $(DISTNAME)-src.tar dist.irix: @$(MAKE) clean @$(MAKE) CC=cc CFLAGS="-woff 1116 -O3" $(PROGRAM) # tbl rogue.r | nroff -ms | colcrt - > $(PROGRAM).doc # nroff -man rogue.6 | colcrt - > $(PROGRAM).cat tar cf $(DISTNAME)-irix.tar $(PROGRAM) LICENSE.TXT $(DOCS) gzip -f $(DISTNAME)-irix.tar dist.aix: @$(MAKE) clean @$(MAKE) CC=xlc CFLAGS="-qmaxmem=16768 -O3 -qstrict" $(PROGRAM) # tbl rogue.r | nroff -ms | colcrt - > $(ROGUE).doc # nroff -man rogue.6 | colcrt - > $(ROGUE).cat tar cf $(DISTNAME)-aix.tar $(PROGRAM) LICENSE.TXT $(DOCS) gzip -f $(DISTNAME)-aix.tar dist.linux: @$(MAKE) clean @$(MAKE) $(PROGRAM) # groff -P-c -t -ms -Tascii rogue.r | sed -e 's/.\x08//g' > $(PROGRAM).doc # groff -man rogue.6 | sed -e 's/.\x08//g' > $(PROGRAM).cat tar cf $(DISTNAME)-linux.tar $(PROGRAM) LICENSE.TXT $(DOCS) gzip -f $(DISTNAME)-linux.tar debug.linux: @$(MAKE) clean @$(MAKE) COPTS="-g" $(PROGRAM) # groff -P-c -t -ms -Tascii rogue.r | sed -e 's/.\x08//g' > $(PROGRAM).doc # groff -man rogue.6 | sed -e 's/.\x08//g' > $(PROGRAM).cat dist.interix: @$(MAKE) clean @$(MAKE) COPTS="-ansi" $(PROGRAM) # groff -P-b -P-u -t -ms -Tascii rogue.r > $(PROGRAM).doc # groff -P-b -P-u -man -Tascii rogue.6 > $(PROGRAM).cat tar cf $(DISTNAME)-interix.tar $(PROGRAM) LICENSE.TXT $(DOCS) gzip -f $(DISTNAME)-interix.tar dist.cygwin: @$(MAKE) --no-print-directory clean @$(MAKE) COPTS="-I/usr/include/ncurses" --no-print-directory $(PROGRAM) # groff -P-c -t -ms -Tascii rogue.r | sed -e 's/.\x08//g' > $(PROGRAM).doc # groff -P-c -man -Tascii rogue.6 | sed -e 's/.\x08//g' > $(PROGRAM).cat tar cf $(DISTNAME)-cygwin.tar $(PROGRAM).exe LICENSE.TXT $(DOCS) gzip -f $(DISTNAME)-cygwin.tar # # Use MINGW32-MAKE to build this target # dist.mingw32: @$(MAKE) --no-print-directory RM="cmd /c del" clean @$(MAKE) --no-print-directory COPTS="-I../pdcurses" LIBS="../pdcurses/pdcurses.a" $(PROGRAM) cmd /c del $(DISTNAME)-mingw32.zip zip $(DISTNAME)-mingw32.zip $(PROGRAM).exe LICENSE.TXT $(DOCS) # # Seperate doc targets for DJGPP prevent strange SIGSEGV in groff # in that environment. # doc.djgpp: groff -t -ms -Tascii rogue.r | sed -e 's/.\x08//g' > $(PROGRAM).doc cat.djgpp: groff -man -Tascii rogue.6 | sed -e 's/.\x08//g' > $(PROGRAM).cat dist.djgpp: @$(MAKE) --no-print-directory clean @$(MAKE) --no-print-directory LDFLAGS="-L$(DJDIR)/LIB" \ LIBS="-lpdcur" $(PROGRAM) # @$(MAKE) --no-print-directory doc.djgpp # @$(MAKE) --no-print-directory cat.djgpp rm -f $(DISTNAME)-djgpp.zip zip $(DISTNAME)-djgpp.zip $(PROGRAM) LICENSE.TXT $(DOCS) # # Use NMAKE to build this target # dist.win32: @$(MAKE) /NOLOGO O="obj" RM="-del" clean @$(MAKE) /NOLOGO O="obj" CC="@CL" LD="link" LDOUT="/OUT:" EXE=".exe"\ LIBS="/NODEFAULTLIB:LIBC ..\pdcurses\pdcurses.lib shell32.lib user32.lib Advapi32.lib" \ COPTS="-nologo -D_CRT_SECURE_NO_DEPRECATE -I..\pdcurses \ -Ox -wd4033 -wd4716" $(PROGRAM).exe -del $(DISTNAME)-win32.zip zip $(DISTNAME)-win32.zip $(PROGRAM).exe LICENSE.TXT $(DOCS)