Update to 1.2.1:

2004 Oct 21: version 1.2.1
* Introduced a basic stepping-control UI, and added stepping information to
  the solution file format.
* Fixed a bug (MS logic) reported by David Stolp, involving blocks going
  out and back into the slip list so quickly that they weren't sent to the
  end of the list.
* Fixed a bug (MS logic) reported by David Stolp where block and creatures
  were not moving into key tiles if the bottom tile prevented it (e.g. a
  wall).
* Fixed a bug in sdltext.c, reported by Dale Bryan caused a segfault in
  16-bit color mode.
* Added -r (read-only) cmdline option.

2004 Oct 04: version 1.2.0
* Fixed a bug (MS logic) preventing cloned tanks from turning around when
  they hadn't yet left the clone machine.
* Fixed another longstanding bug (MS logic) involving a tank indirectly
  pushing a blue button. Again, the bug was fixed explicitly instead of
  trying to make the behavior arise naturally from the code.
* Improved some of the behavior of blocks being pushed (Lynx logic).
* Improved some of the behavior of blocked teleports (Lynx logic).
* Altered animations to run for either 11 or 12 frames, depending on the
  parity of their initial frame, as discovered by ccexplore. (This finally
  killed the nine-lived clone-boosting bug in ICEHOUSE!) Also modified the
  point during the frame when animations get removed.
* Changed the Lynx walker to use a PRNG equivalent to the original, as
  worked out by ccexplore.
* Fixed bug (MS logic) in how a block is removed from the slip list when
  being pushed by Chip (reported by Shmuel Siegel).
* Fixed bug (MS logic) with deferred button presses; TW was incorrectly
  deferring Chip's button presses and not just those caused by block
  pushing.
* Fixed a horrid bug when encountering bogus values in a dat file. (The
  code was meant to gracefully ignore the broken level and continue reading
  the next level, but it failed to move the file position out of the broken
  level before doing so.)
* Fixed keyboard routines so that they now understand characters as well as
  keystrokes (thus e.g. the program recognizes "?" when entered on a
  European keyboard).
* Added a help screen for the initial file menu.
* A few other minor bug fixes and miscellaneous improvements.

3 files changed, 27 insertions, 24 deletions

diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index a2be4ae884e..ccb6539b81e 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/12/03 15:14:58 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/05 20:43:21 wiz Exp $
 
-DISTNAME=	tworld-1.1.3
+DISTNAME=	tworld-1.2.1
 PKGNAME=	${DISTNAME:S/^t/tile/}
-PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.muppetlabs.com/~breadbox/pub/software/tworld/
 
diff --git a/games/tileworld/distinfo b/games/tileworld/distinfo
index 4e3b13ec279..3f184de1fc1 100644
--- a/games/tileworld/distinfo
+++ b/games/tileworld/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/03/10 00:53:37 snj Exp $
+$NetBSD: distinfo,v 1.3 2004/12/05 20:43:21 wiz Exp $
 
-SHA1 (tworld-1.1.3.tar.gz) = fb6aad7187a668893882d5ab9bb18bced05b2582
-Size (tworld-1.1.3.tar.gz) = 1041017 bytes
-SHA1 (patch-aa) = d4ef59946368c438bd4977ad64be3e46314dbff7
+SHA1 (tworld-1.2.1.tar.gz) = 1d9b20fc6408e6ba9e1378bb7ca31d2cad3ffa30
+Size (tworld-1.2.1.tar.gz) = 1045723 bytes
+SHA1 (patch-aa) = 4acbb879f881d08c3b9af5c5850efa65460ba43b
diff --git a/games/tileworld/patches/patch-aa b/games/tileworld/patches/patch-aa
index 8eda296e2ef..68a8d3a9b8b 100644
--- a/games/tileworld/patches/patch-aa
+++ b/games/tileworld/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/03/10 00:53:37 snj Exp $
+$NetBSD: patch-aa,v 1.3 2004/12/05 20:43:21 wiz Exp $
 
---- Makefile.in.orig	2002-04-25 07:02:56.000000000 -0700
-+++ Makefile.in	2004-03-09 16:45:56.000000000 -0800
-@@ -68,14 +68,14 @@ err.o      : err.c oshw.h err.h
+--- Makefile.in.orig	2004-09-26 10:35:50.000000000 +0200
++++ Makefile.in
+@@ -69,14 +69,14 @@ err.o      : err.c oshw.h err.h
  #
  
  comptime.h:
@@ -19,33 +19,37 @@ $NetBSD: patch-aa,v 1.2 2004/03/10 00:53:37 snj Exp $
  
  #
  # Resources
-@@ -89,17 +89,18 @@ tworldres.o: tworld.ico
+@@ -90,18 +90,21 @@ tworldres.o: tworld.ico
  #
  
  install: tworld
--	cp -i ./tworld $(bindir)/.
+-	mkdir -p $(bindir)
 -	mkdir -p $(sharedir)/sets
 -	mkdir -p $(sharedir)/data
 -	mkdir -p $(sharedir)/res
 -	mkdir -p $(mandir)/man6
+-	cp -i ./tworld $(bindir)/.
 -	cp -i sets/*.dac $(sharedir)/sets/.
 -	cp -i data/*.dat $(sharedir)/data/.
--	cp -i resources/rc $(sharedir)/res/.
--	cp -i resources/*.bmp $(sharedir)/res/.
--	cp -i resources/*.wav $(sharedir)/res/.
+-	cp -i res/rc $(sharedir)/res/.
+-	cp -i res/*.bmp $(sharedir)/res/.
+-	cp -i res/*.wav $(sharedir)/res/.
 -	cp -i docs/tworld.6 $(mandir)/man6/.
-+	${BSD_INSTALL_PROGRAM} tworld $(bindir)/
++	${BSD_INSTALL_DATA_DIR} $(bindir)
 +	${BSD_INSTALL_DATA_DIR} $(sharedir)/sets
 +	${BSD_INSTALL_DATA_DIR} $(sharedir)/data
 +	${BSD_INSTALL_DATA_DIR} $(sharedir)/res
-+	${BSD_INSTALL_DATA} sets/*.dac $(sharedir)/sets/
-+	${BSD_INSTALL_DATA} data/*.dat $(sharedir)/data/
-+	${BSD_INSTALL_DATA} resources/rc resources/*.bmp \
-+			resources/*.wav $(sharedir)/res/
-+	${BSD_INSTALL_MAN} docs/tworld.6 $(mandir)/man6/
++	${BSD_INSTALL_DATA_DIR} $(mandir)/man6
++	${BSD_INSTALL_PROGRAM} ./tworld $(bindir)/.
++	${BSD_INSTALL_DATA} sets/*.dac $(sharedir)/sets/.
++	${BSD_INSTALL_DATA} data/*.dat $(sharedir)/data/.
++	${BSD_INSTALL_DATA} res/rc $(sharedir)/res/.
++	${BSD_INSTALL_DATA} res/*.bmp $(sharedir)/res/.
++	${BSD_INSTALL_DATA} res/*.wav $(sharedir)/res/.
++	${BSD_INSTALL_MAN} docs/tworld.6 $(mandir)/man6/.
 +	${BSD_INSTALL_DATA_DIR} $(prefix)/share/doc/tworld
-+	${BSD_INSTALL_DATA} README $(prefix)/share/doc/tworld/
-+	${BSD_INSTALL_DATA} docs/tworld.html $(prefix)/share/doc/tworld/
++	${BSD_INSTALL_DATA} README $(prefix)/share/doc/tworld
++	${BSD_INSTALL_DATA} docs/tworld.html $(prefix)/share/doc/tworld
  
  clean:
  	rm -f $(OBJS) tworld mklynxcc comptime.h config.*