Index: configure.ac =================================================================== --- configure.ac (.../angband-3.0.8) (revision 836) +++ configure.ac (.../angband-3.0.9b) (revision 836) @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([Angband], [3.0.9], [bugs@rephial.org], [angband]) +AC_INIT([Angband], [3.0.9b], [bugs@rephial.org], [angband]) AC_PREREQ([2.50]) AC_CONFIG_HEADER(src/autoconf.h) @@ -87,28 +87,23 @@ AC_CHECK_LIB(curses , initscr, found_curses=yes,found_curses=no) AC_CHECK_LIB(ncurses , initscr, found_ncurses=yes,found_ncurses=no) AC_CHECK_LIB(pdcurses, initscr, found_pdcurses=yes,found_pdcurses=no) - if test "$found_ncurses" = "no"; then - if test "$found_pdcurses" = "no"; then - if test "$found_curses" = "no"; then - AC_DEFINE(USE_NCURSES, 0, [Define to 1 if NCurses is found.]) - AC_DEFINE(USE_CURSES, 0, [Define to 1 if Curses or PDCurses is found, but NCurses is not.]) - AC_DEFINE(USE_GCU, 0, [Define to 1 if using the Curses frontend.]) + if test "x$found_ncurses" = "xno"; then + if test "x$found_pdcurses" = "xno"; then + if test "x$found_curses" = "xno"; then + with_curses=no else - AC_DEFINE(USE_NCURSES, 0, [Define to 1 if NCurses is found.]) AC_DEFINE(USE_CURSES, 1, [Define to 1 if Curses or PDCurses is found, but NCurses is not.]) AC_DEFINE(USE_GCU, 1, [Define to 1 if using the Curses frontend.]) LDFLAGS="${LDFLAGS} -lcurses" with_curses=yes fi else - AC_DEFINE(USE_NCURSES, 0, [Define to 1 if NCurses is found.]) AC_DEFINE(USE_CURSES, 1, [Define to 1 if Curses or PDCurses is found, but NCurses is not.]) AC_DEFINE(USE_GCU, 1, [Define to 1 if using the Curses frontend.]) LDFLAGS="${LDFLAGS} -lpdcurses" with_curses=yes fi else - AC_DEFINE(USE_CURSES, 0, [Define to 1 if Curses or PDCurses is found, but NCurses is not.]) AC_DEFINE(USE_NCURSES, 1, [Define to 1 if NCurses is found.]) AC_DEFINE(USE_GCU, 1, [Define to 1 if using the Curses frontend.]) LDFLAGS="${LDFLAGS} -lncurses" Index: changes.txt =================================================================== --- changes.txt (.../angband-3.0.8) (revision 836) +++ changes.txt (.../angband-3.0.9b) (revision 836) @@ -1,86 +1,100 @@ -Angband 3.0.9 -============= - -Angband 3.0.9 is a bugfix version of 3.0.8, mostly. Thanks go to the -many people who reported bugs, helped track them down, and especially -to those who provided patches. - - * Add 'K' command to "mark item kind as squelch". - * Add squelch_worthless option; does what it says on the tin. - * Fix use of an uninitialised variable. (ctate) - * Restore the "jump into trap and don't autopickup" command. It - doesn't "flip pickup" in the same way the old command did. - * Always cast to (unsigned char) for the islower(), isdigit(), etc - functions - * Make graphics for flavoured items work properly in the object browser. - * Fix command menu display in bigtile menu via something of a hack. - * Display full monster picture in monster list in bigtile mode. - * Fix obviously wrong code in main-gcu. (William McBrine) - * Make disturb_panel work again (this is a 3.0.6 bug). - * Add _GNU_SOURCE define to silence setresgid() errors. - * Give items that provide light descriptions in obj-info.c. - * Describe the NO_FUEL flag. - * Fix behaviour of the LITE flag. - * Collect Banishment effects into one big lump sum. Death now comes - quickly. - * Use better spell and object descriptions. (Hugo Kornelis) - * Added or 'g' to some prompts where they are now acceptable - inputs. - * Fix acid damage of objects to make it a chance rather than a certainty. - * Don't count hidden squelchable objects when deciding where to place - things in monster drops (or whatever). This should stop drops from - killing a monster appearing miles away from that monster with - nothing appearing in between. - * Make 'Glyph of Warding' 'shove' items out of the way when created on - a spot. - * Fix bug in removal of autoinscriptions - * "!d" stops squelch auto-dropping things, and "!k" marks an object - not to be squelched. - * (Windows) Open windows in reverse order so the Term 5 is behind - Term 4 is behind Term 3 and so on. - * (GTK) Remember user preferences. - * Miscellaneous small things reported by Hugo Kornelis. - (for more info, see ) - * Rewrite description of birth_no_preserve to make it even less - ambiguous. - * Allow use of objects from the floor when blind. - * Reset text indent after squelch help. This means monster recall no - longer gets 1-char indents from the side of the screen. - * (Linux only) Always enter stores when moving onto them. - * Only mark things as squelchable if we know the 'flavour' through ID - or whatever. - * Fixed object detection behaviour w.r.t the hide_squelchable option. - * Add 'link' to the high score table from knowledge menu. - * Mark starting equipment as 'everseen' for squelching & object - knowledge purposes. - * Add missing entries in the monster knowledge list. - * Tidied up the knowledge screens, so that recalled text is always at - the top of the screen, and stop giving artifact spoilers. - * Report the right number of items in your inventory after a store - transaction. - * Stop superfluous '-more-'s in the shops. - * Avoid possible out-of-bounds array access if you're clev50 when when - entering the store. - * Rearrange object knowledge menu, so flavoured items come first. - * Make EAT_LITE monsters eat light again. - * Show resist blindness properly in self knowledge displays. - * Let 'h' work in stores with the roguelike keyset. - * Removed the x11 "keycode translations" (i.e. rewriting "^_]3244" - type sequences to "\[PgUp]" type sequences) for '-' and '=' from - the pref files to prevent x11's automatic macros from breaking - those keys. This was most often manifested when trying to use items - on the floor. - * Fixed bug in "Interact with macros" menu where the echoing of macros +Angband 3.0.9b +============= + +Angband 3.0.9b is a bugfix version of 3.0.9. It makes the following +changes on top of those mentioned below: + - Monsters are back up to their pre-3.0.9 levels of smartness. + - Store UI behaviour changed so that pressing Enter no longer + initiates buying. + - Fix detection of curses libraries using autoconf. + - Fix broken install using autoconf. + - Add the tvals for oil and dragon armor to the tval squelch list. + - Once again dump modified colour information to pref files. + - Fix warnings when compiling the SDL port. + - Fix up roguelike keys in the store (vs. 3.0.9a) + +Angband 3.0.9 had the following changelist: + +Angband 3.0.9 is a bugfix version of 3.0.8, mostly. Thanks go to the +many people who reported bugs, helped track them down, and especially +to those who provided patches. + + * Add 'K' command to "mark item kind as squelch". + * Add squelch_worthless option; does what it says on the tin. + * Fix use of an uninitialised variable. (ctate) + * Restore the "jump into trap and don't autopickup" command. It + doesn't "flip pickup" in the same way the old command did. + * Always cast to (unsigned char) for the islower(), isdigit(), etc + functions + * Make graphics for flavoured items work properly in the object browser. + * Fix command menu display in bigtile menu via something of a hack. + * Display full monster picture in monster list in bigtile mode. + * Fix obviously wrong code in main-gcu. (William McBrine) + * Make disturb_panel work again (this is a 3.0.6 bug). + * Add _GNU_SOURCE define to silence setresgid() errors. + * Give items that provide light descriptions in obj-info.c. + * Describe the NO_FUEL flag. + * Fix behaviour of the LITE flag. + * Collect Banishment effects into one big lump sum. Death now comes + quickly. + * Use better spell and object descriptions. (Hugo Kornelis) + * Added or 'g' to some prompts where they are now acceptable + inputs. + * Fix acid damage of objects to make it a chance rather than a certainty. + * Don't count hidden squelchable objects when deciding where to place + things in monster drops (or whatever). This should stop drops from + killing a monster appearing miles away from that monster with + nothing appearing in between. + * Make 'Glyph of Warding' 'shove' items out of the way when created on + a spot. + * Fix bug in removal of autoinscriptions + * "!d" stops squelch auto-dropping things, and "!k" marks an object + not to be squelched. + * (Windows) Open windows in reverse order so the Term 5 is behind + Term 4 is behind Term 3 and so on. + * (GTK) Remember user preferences. + * Miscellaneous small things reported by Hugo Kornelis. + (for more info, see ) + * Rewrite description of birth_no_preserve to make it even less + ambiguous. + * Allow use of objects from the floor when blind. + * Reset text indent after squelch help. This means monster recall no + longer gets 1-char indents from the side of the screen. + * (Linux only) Always enter stores when moving onto them. + * Only mark things as squelchable if we know the 'flavour' through ID + or whatever. + * Fixed object detection behaviour w.r.t the hide_squelchable option. + * Add 'link' to the high score table from knowledge menu. + * Mark starting equipment as 'everseen' for squelching & object + knowledge purposes. + * Add missing entries in the monster knowledge list. + * Tidied up the knowledge screens, so that recalled text is always at + the top of the screen, and stop giving artifact spoilers. + * Report the right number of items in your inventory after a store + transaction. + * Stop superfluous '-more-'s in the shops. + * Avoid possible out-of-bounds array access if you're clev50 when when + entering the store. + * Rearrange object knowledge menu, so flavoured items come first. + * Make EAT_LITE monsters eat light again. + * Show resist blindness properly in self knowledge displays. + * Let 'h' work in stores with the roguelike keyset. + * Removed the x11 "keycode translations" (i.e. rewriting "^_]3244" + type sequences to "\[PgUp]" type sequences) for '-' and '=' from + the pref files to prevent x11's automatic macros from breaking + those keys. This was most often manifested when trying to use items + on the floor. + * Fixed bug in "Interact with macros" menu where the echoing of macros as you typed them would be messed up if any "keycode translations" - took place. - -Autoconf --------- -Please use gmake on BSDs. It should work OK. - - * Install all files properly. - * Expand DEFAULT_PATH correctly. - * Remember to include X11 paths. - * Chown the angband executable when appropriate. - * Fix SDL sound support. - * Fix the "cannot find .depend" error. + took place. + +Autoconf +-------- +Please use gmake on BSDs. It should work OK. + + * Install all files properly. + * Expand DEFAULT_PATH correctly. + * Remember to include X11 paths. + * Chown the angband executable when appropriate. + * Fix SDL sound support. + * Fix the "cannot find .depend" error. Index: copying.txt =================================================================== --- copying.txt (.../angband-3.0.8) (revision 836) +++ copying.txt (.../angband-3.0.9b) (revision 836) @@ -38,8 +38,8 @@ * Adam Bolt's (16x16) graphics may be redistributed and used for any purpose, with or without modification. - * David Gervais' (32x32) graphics may be redistributed and used but only - not-for-profit, and may only be distributed over the Internet. + * David Gervais' (32x32) graphics may be redistributed and used under the + Creative Commons Attribution 3.0 licence. * the sounds are freeware, whatever that means. Index: lib/file/news.txt =================================================================== --- lib/file/news.txt (.../angband-3.0.8) (revision 836) +++ lib/file/news.txt (.../angband-3.0.9b) (revision 836) @@ -6,7 +6,7 @@ /_/ \_\_| |_|\__, |_.__/ \__,_|_| |_|\__,_| |___/ - Version 3.0.9 + Version 3.0.9b Bug reports to For resources and links to places you can talk about the game, please see: Index: lib/xtra/graf/mask32.bmp =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: lib/xtra/graf/mask32.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: lib/xtra/graf/32x32.bmp =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: lib/xtra/graf/32x32.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: scripts/pkg_win =================================================================== --- scripts/pkg_win (.../angband-3.0.8) (revision 836) +++ scripts/pkg_win (.../angband-3.0.9b) (revision 836) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Simple packaging file for the Windows port. Only really useful when # cross-compiling, or using Cygwin. Originally by Robert Ruehlmann. @@ -61,15 +61,15 @@ cp ../lib/xtra/graf/8x8.bmp lib/xtra/graf cp ../lib/xtra/graf/16x16.bmp lib/xtra/graf +cp ../lib/xtra/graf/32x32.bmp lib/xtra/graf cp ../lib/xtra/graf/mask.bmp lib/xtra/graf cp ../lib/xtra/sound/sound.cfg lib/xtra/sound cp ../lib/xtra/sound/*.wav lib/xtra/sound + upx -9 angband.exe cd .. - zip -9 -r $1.zip $1 - rm -rf $1 Index: src/Makefile.osx =================================================================== --- src/Makefile.osx (.../angband-3.0.8) (revision 836) +++ src/Makefile.osx (.../angband-3.0.9b) (revision 836) @@ -22,7 +22,7 @@ NAME =Angband APPNAME =$(NAME).app EXE =angband -COPYRIGHT =1995-2007 Contributors +COPYRIGHT =1995-2008 Contributors # Some Developer CD tools we need - the standard installation location TOOLDIR = /Developer/Tools Index: src/h-basic.h =================================================================== --- src/h-basic.h (.../angband-3.0.8) (revision 836) +++ src/h-basic.h (.../angband-3.0.9b) (revision 836) @@ -129,6 +129,7 @@ /*** Include the library header files ***/ /* Use various POSIX functions if available */ +#undef _GNU_SOURCE #define _GNU_SOURCE /** ANSI C headers **/ Index: src/cmd4.c =================================================================== --- src/cmd4.c (.../angband-3.0.8) (revision 836) +++ src/cmd4.c (.../angband-3.0.9b) (revision 836) @@ -3529,7 +3529,7 @@ /* Dump a comment */ fprintf(fff, "# Color '%s'\n", name); - + fprintf(fff, "V:%d:0x%02X:0x%02X:0x%02X:0x%02X\n\n", i, kv, rv, gv, bv); } } Index: src/Makefile =================================================================== --- src/Makefile (.../angband-3.0.8) (revision 836) +++ src/Makefile (.../angband-3.0.9b) (revision 836) @@ -19,10 +19,14 @@ $(CC) $(OBJECTS) $(LDFLAGS) $(LDADD) -o $@ @printf "%10s %-20s\n" LINK $@ +clean-prehook: + -rm autoconf.h + install-posthook: @if [ "x$(SETEGID)" != "x" ]; then \ printf "%10s $(DESTDIR)$(BINDIR)/angband\n" CHOWN; \ if [ "x$(DRY)" = "x" ]; then \ chown root:${SETEGID} $(DESTDIR)$(BINDIR)/angband; \ + chmod g+s $(DESTDIR)$(BINDIR)/angband; \ fi; \ fi Index: src/squelch.c =================================================================== --- src/squelch.c (.../angband-3.0.8) (revision 836) +++ src/squelch.c (.../angband-3.0.9b) (revision 836) @@ -89,7 +89,6 @@ { TYPE_ARMOR, TV_HELM }, { TYPE_ARMOR, TV_GLOVES }, { TYPE_ARMOR, TV_BOOTS }, - { TYPE_ARMOR, TV_DRAG_ARMOR }, { TYPE_ARMOR, TV_HARD_ARMOR }, { TYPE_ARMOR, TV_SOFT_ARMOR }, { TYPE_ARMOR, TV_CLOAK }, @@ -154,6 +153,8 @@ { TV_PRAYER_BOOK, "Prayer books" }, { TV_SPIKE, "Spikes" }, { TV_LITE, "Lights" }, + { TV_FLASK, "Flasks of oil" }, + { TV_DRAG_ARMOR, "Dragon mail armor" }, }; Index: src/store.c =================================================================== --- src/store.c (.../angband-3.0.8) (revision 836) +++ src/store.c (.../angband-3.0.9b) (revision 836) @@ -1722,14 +1722,14 @@ else text_out_c(TERM_L_GREEN, "l"); - text_out("' examines and "); - text_out_c(TERM_L_GREEN, "Enter"); + text_out("' examines and '"); + text_out_c(TERM_L_GREEN, "p"); - if (store_current == STORE_HOME) text_out(" picks up"); - else text_out(" purchases"); + if (store_current == STORE_HOME) text_out("' picks up"); + else text_out("' purchases"); text_out(" the selected item. '"); - + text_out_c(TERM_L_GREEN, "d"); if (store_current == STORE_HOME) text_out("' drops"); else text_out("' sells"); @@ -2338,9 +2338,8 @@ } /* Buy */ - case '\xff': - case '\n': - case '\r': + case 'p': + case 'g': { /* On successful purchase, redraw */ if (store_purchase(oid)) @@ -2613,16 +2612,16 @@ if (rogue_like_commands) { /* These two can't intersect! */ - menu.cmd_keys = "\n\x04\x10\r?=CPdeEiIsTwx\x8B\x8Chl"; /* \x10 = ^p , \x04 = ^D */ - menu.selections = "abcfgmnopqruvyz1234567890"; + menu.cmd_keys = "\n\x04\x10\r?=CEIPTdegilpswx\x8B\x8C"; /* \x10 = ^p , \x04 = ^D */ + menu.selections = "abcfmnoqrtuvyz13456790ABDFGH"; } /* Original */ else { /* These two can't intersect! */ - menu.cmd_keys = "\n\x010\r?=CbdeEiIklstw\x8B\x8C"; /* \x10 = ^p */ - menu.selections = "acfghmnopqruvxyz13456790"; + menu.cmd_keys = "\n\x010\r?=CEIbdegiklpstw\x8B\x8C"; /* \x10 = ^p */ + menu.selections = "acfhmnoqruvxyz13456790ABDFGH"; } /* Keep the cursor in range of the stock */ Index: src/Makefile.src =================================================================== --- src/Makefile.src (.../angband-3.0.8) (revision 836) +++ src/Makefile.src (.../angband-3.0.9b) (revision 836) @@ -5,7 +5,7 @@ # across a range of different makefiles, to cut down on maintenance. # -VERSION = 3.0.9 +VERSION = 3.0.9b HDRS = h-basic.h INCS = angband.h config.h defines.h externs.h types.h \ Index: src/defines.h =================================================================== --- src/defines.h (.../angband-3.0.8) (revision 836) +++ src/defines.h (.../angband-3.0.9b) (revision 836) @@ -36,7 +36,7 @@ * Name of the version/variant and its version string */ #define VERSION_NAME "Angband" -#define VERSION_STRING "3.0.9" +#define VERSION_STRING "3.0.9b" /* @@ -1411,7 +1411,7 @@ /* * Maximum flow depth when using "MONSTER_FLOW" */ -#define MONSTER_FLOW_DEPTH 3 +#define MONSTER_FLOW_DEPTH 32 Index: readme.txt =================================================================== --- readme.txt (.../angband-3.0.8) (revision 836) +++ readme.txt (.../angband-3.0.9b) (revision 836) @@ -1,4 +1,4 @@ -Angband 3.0.9 +Angband 3.0.9b ============= Angband is a graphical dungeon adventure game that uses textual characters @@ -12,9 +12,6 @@ The Angband website: http://rephial.org/ Angband forums: http://angband.oook.cz/forum/ - 32x32 graphics for X11 and Windows: - http://angband.oook.cz/download/extra/graf-32x32-306.zip - When upgrading, please read changes.txt! '?' in-game lets you browse the help system.