Imported tome-234-src

Imported tome-234-src
into srivasta@debian.org--etch/tome--upstream--2.3



git-archimport-id: srivasta@debian.org--etch/tome--upstream--2.3--patch-2

15 files changed, 165 insertions, 75 deletions

diff --git a/changes.old b/changes.old
index bc3d64d0..d1733884 100644
--- a/changes.old
+++ b/changes.old
@@ -5911,3 +5911,101 @@ becomes 0, allowing spells to summon fiery blades and such
 
 2005/07/27
 [V]  T.o.M.E 2.3.2 aka "Unrealized Reality"
+
+28/07/2005
+[G]- Lost sword quest rewards always give a minimum skill modifier of 0.3.
+     -- gwooledge
+
+29/07/2005
+[D]- Edit one vault to open up some inaccessible rooms -- Neil
+
+11/08/2005
+[B]- Alchemy: disallow repowering double-ego items, unless the character has
+     the artifact creation ability.  Based on patch by Andrey Egoshin.
+     -- gwooledge
+[B]- Lost sword quest skill reward probabilities were computed incorrectly.
+     Fix suggested by Dan Rosenberry. -- gwooledge
+[I]- Miscellaneous documentation, spelling and grammar fixes. -- gwooledge
+
+12/08/2005
+[B]- Don't let a player trick the Valar by getting drained and re-gaining
+     levels -- Neil
+[I]- Update AC display after fixing armor in the buildings. -- gwooledge
+
+16/08/2005
+[B]- Don't allow Runecraft and Thaumaturgy spells to go explode inside walls
+     and seep through --  Neil
+
+17/08/2005
+[I]- Fix damage display for Thaumaturgy ball spells. -- gwooledge
+[O]- Removed pointless slays, brands, and bonuses on Pick of Erebor --  Neil
+
+19/08/2005
+[B]- When consuming magic essences, don't stop prematurely.  Based on patch
+     by Andrey Egoshin. -- gwooledge
+
+30/08/2005
+[B]- Upkeep cost for partial summons was not always charged. -- gwooledge
+
+05/09/2005
+[B]- Some staves were being generated with the wrong tval, causing several bugs
+     including (but not limited to) staves being unrechargeable. -- gwooledge
+
+11/09/2005
+[B]- Saving throw was not calculated correctly. -- gwooledge
+
+14/09/2005
+[P]- All new partial summon upkeep formula -- neil
+
+26/09/2005
+[B]- Disallow negative experience alchemy abuses.  Based on patch by Andrey
+     Egoshin. -- gwooledge
+[O]- When examining books, demonology equipment and instruments in stores, show
+     both the object's powers and its spells. -- gwooledge
+[B]- Nonliving and undead pets won't be angered by lack of breathable air.
+     -- gwooledge
+[D]- A certain early trap should be less deadly (and appear a bit later).
+     -- gwooledge
+[I]- Honor exp_need option when displaying object experience. -- gwooledge
+
+27/09/2005
+[I]- Restored and updated some missing help files. -- gwooledge
+[G]- (Mass) Genocide damage is applied all at once to avoid bug #228.
+     -- gwooledge
+
+28/09/2005
+[B]- Don't use the "POSIX" setuid calls on Mac OS X, as they apparently break
+     compilation -- neil
+
+29/09/2005
+[O]- Junk should stack just like skeletons.  Patch by StarweaverBlue.
+     -- gwooledge
+[M]- Kavlax should be many-headed. -- gwooledge
+
+14/10/2005
+[B]- Certain monster spells were hard-coded for the wrong number of equipment
+     slots. -- gwooledge
+
+18/10/2005
+[B]- Incorrect operator used in cave generation code.  Effect unknown, but it
+     *might* possibly fix some of the Orc cave crashes.-- gwooledge
+
+26/10/2005
+[M]- Regular (non-Joke, non-Cth, non-Z) monsters should not breathe nuke,
+     because it has a side effect we don't want in ToME -- Neil
+
+29/10/2005
+[O]- Mac OS X builds now put all the game data into the bundle, storing all
+     user data in the user's Library (some preferences in
+     Library/Preferences/net.t-o-m-e.tome.plist, the rest in
+     Library/Application Support/ToME. -- Neil
+
+16/11/2005
+[I]- Handling of Command key modified in Mac OS X UI.  It should be accessible
+     in macros now if it wasn't before -- Neil
+
+26/11/2005
+[B]- Don't allow uniques or quest monsters to just disappear to the move of
+     another monster -- Neil
+
+14/12/2005 - ToME 2.3.3 "Realized Unreality"
diff --git a/changes.txt b/changes.txt
index 2cf511bd..e4037032 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,70 +1,11 @@
-T.o.M.E 2.3.3 aka "Realized Unreality" changes
+T.o.M.E 2.3.4 aka "An Unexpected Party" changes
 
 Interface changes:
-- Miscellaneous documentation, spelling and grammar fixes. -- gwooledge
-- Update AC display after fixing armor in the buildings. -- gwooledge
-- Fix damage display for Thaumaturgy ball spells. -- gwooledge
-- Honor exp_need option when displaying object experience. -- gwooledge
-- Restored and updated some missing help files. -- gwooledge
-- Handling of Command key modified in Mac OS X UI.  It should be accessible
-  in macros now if it wasn't before -- Neil
-
-Gameplay changes:
-- Lost sword quest rewards always give a minimum skill modifier of 0.3.
-  -- gwooledge
-- (Mass) Genocide damage is applied all at once to avoid bug #228.
-  -- gwooledge
-
-Monster changes:
-- Kavlax should be many-headed. -- gwooledge
-- Regular (non-Joke, non-Cth, non-Z) monsters should not breathe nuke,
-  because it has a side effect we don't want in ToME -- Neil
-
-Object changes:
-- Removed pointless slays, brands, and bonuses on Pick of Erebor --  Neil
-- When examining books, demonology equipment and instruments in stores, show
-  both the object's powers and its spells. -- gwooledge
-- Junk should stack just like skeletons.  Patch by StarweaverBlue.
-  -- gwooledge
-- Mac OS X builds now put all the game data into the bundle, storing all
-  user data in the user's Library (some preferences in
-  Library/Preferences/net.t-o-m-e.tome.plist, the rest in
-  Library/Application Support/ToME. -- Neil
-
-Player changes:
-- All new partial summon upkeep formula -- neil
-
-Dungeon changes:
-- Edit one vault to open up some inaccessible rooms -- Neil
-- A certain early trap should be less deadly (and appear a bit later).
-  -- gwooledge
+- Fix window position saving on Mac OS, patch by John Love-Jensen
+  -- Neil
 
 Bug fixes:
-- Alchemy: disallow repowering double-ego items, unless the character has
-  the artifact creation ability.  Based on patch by Andrey Egoshin.
-  -- gwooledge
-- Lost sword quest skill reward probabilities were computed incorrectly.
-  Fix suggested by Dan Rosenberry. -- gwooledge
-- Don't let a player trick the Valar by getting drained and re-gaining
-  levels -- Neil
-- Don't allow Runecraft and Thaumaturgy spells to go explode inside walls
-  and seep through --  Neil
-- When consuming magic essences, don't stop prematurely.  Based on patch
-  by Andrey Egoshin. -- gwooledge
-- Upkeep cost for partial summons was not always charged. -- gwooledge
-- Some staves were being generated with the wrong tval, causing several bugs
-  including (but not limited to) staves being unrechargeable. -- gwooledge
-- Saving throw was not calculated correctly. -- gwooledge
-- Disallow negative experience alchemy abuses.  Based on patch by Andrey
-  Egoshin. -- gwooledge
-- Nonliving and undead pets won't be angered by lack of breathable air.
-  -- gwooledge
-- Don't use the "POSIX" setuid calls on Mac OS X, as they apparently break
-  compilation -- neil
-- Certain monster spells were hard-coded for the wrong number of equipment
-  slots. -- gwooledge
-- Incorrect operator used in cave generation code.  Effect unknown, but it
-  *might* possibly fix some of the Orc cave crashes.-- gwooledge
-- Don't allow uniques or quest monsters to just disappear to the move of
-  another monster -- Neil
-- Attempt to work around some crashes in the fractal cave generator -- Neil
+- Remove buggy trap of Stair Movement -- Neil
+- Fix typo in one monster's flags - Iain
+- Fix word wrapping in character sheet, patch from "ZizzoTheInfinite"
+  -- Neil
diff --git a/lib/edit/tr_info.txt b/lib/edit/tr_info.txt
index bdb27ff7..d6518305 100644
--- a/lib/edit/tr_info.txt
+++ b/lib/edit/tr_info.txt
@@ -276,7 +276,7 @@ D:You feel as if you've just lost something...
 F:FLOOR | CHEST | DOOR
 
 N:48:Trap of Stair Movement
-I:6:100:50:3:4:0d0:o
+I:6:0:50:3:4:0d0:o
 D:The dungeon seems different...
 F:FLOOR | CHEST | DOOR
 
diff --git a/lib/module.lua b/lib/module.lua
index 154a76e8..09cd9e02 100644
--- a/lib/module.lua
+++ b/lib/module.lua
@@ -1,7 +1,7 @@
 add_module
 {
 	["name"]    = "ToME",
-	["version"] = { 2, 3, 3 },
+	["version"] = { 2, 3, 4 },
 	["author"]  = { "DarkGod", "darkgod@t-o-m-e.net" },
 	["desc"] = {
 		"The Tales of Middle-earth, the standard and official game.",
diff --git a/src/carbon/Angband.icns b/src/carbon/Angband.icns
index d55777d9..3d775739 100644
--- a/src/carbon/Angband.icns
+++ b/src/carbon/Angband.icns
diff --git a/src/carbon/Carbon.r b/src/carbon/Carbon.r
index a4537aa3..e3194dd2 100644
--- a/src/carbon/Carbon.r
+++ b/src/carbon/Carbon.r
@@ -37,7 +37,7 @@ type AngbandSignature as 'STR ';
 
 resource AngbandSignature (0, "Owner resource", purgeable)
 {
-	"T.o.M.E. 2.3.3"
+	"T.o.M.E. 2.3.4"
 };
 
 
diff --git a/src/carbon/Image-DS_Store b/src/carbon/Image-DS_Store
new file mode 100644
index 00000000..efd42e72
--- /dev/null
+++ b/src/carbon/Image-DS_Store
diff --git a/src/carbon/Info.plist b/src/carbon/Info.plist
index a28b0122..fff3fb15 100644
--- a/src/carbon/Info.plist
+++ b/src/carbon/Info.plist
@@ -6,8 +6,8 @@
     <key>CFBundleExecutable</key><string>tome</string>
     <key>CFBundlePackageType</key><string>APPL</string>
     <key>CFBundleSignature</key><string>PrnA</string>
-    <key>CFBundleVersion</key><string>2.3.3</string>
-    <key>CFBundleShortVersionString</key><string>233</string>
+    <key>CFBundleVersion</key><string>2.3.4</string>
+    <key>CFBundleShortVersionString</key><string>234</string>
     <key>CFBundleIconFile</key><string>Angband</string>
     <key>CFBundleIdentifier</key><string>net.t-o-m-e.tome</string>
     <key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
diff --git a/src/carbon/getversion b/src/carbon/getversion
new file mode 100755
index 00000000..786fd14b
--- /dev/null
+++ b/src/carbon/getversion
@@ -0,0 +1,2 @@
+#! /bin/sh
+grep CFBundleVersion carbon/Info.plist | perl -pe "s,.*<string>([^<]*)<.*,\\1,"
diff --git a/src/defines.h b/src/defines.h
index 30cfcca1..8627daa3 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -37,8 +37,8 @@
  */
 
 #ifndef IS_CVS
-/*#define IS_CVS          ""*/
 #define IS_CVS          ""
+/*#define IS_CVS          ""*/
 #endif
 
 #define USER_PATH_VERSION "/2.3"
diff --git a/src/files.c b/src/files.c
index ac57af81..61555886 100644
--- a/src/files.c
+++ b/src/files.c
@@ -3001,9 +3001,7 @@ void file_character_print_item(FILE *fff, char label, object_type *obj, bool ful
 	if ((artifact_p(obj) || ego_item_p(obj) || obj->tval == TV_RING || obj->tval == TV_AMULET || full) &&
 	                (obj->ident & IDENT_MENTAL))
 	{
-		fprintf(fff, "    ");
 		object_out_desc(obj, fff, TRUE, TRUE);
-		fprintf(fff, "\n");
 	}
 }
 
diff --git a/src/main-crb.c b/src/main-crb.c
index d107728b..7c8d11b7 100644
--- a/src/main-crb.c
+++ b/src/main-crb.c
@@ -3457,6 +3457,20 @@ static void cf_save_prefs()
 	{
 		term_data *td = &data[i];
 
+		save_pref_short(format("term%d.font_mono", i), td->font_mono); 
+		save_pref_short(format("term%d.font_o_x", i), td->font_o_x);
+		save_pref_short(format("term%d.font_o_y", i), td->font_o_y);
+		save_pref_short(format("term%d.font_wid", i), td->font_wid);
+		save_pref_short(format("term%d.font_hgt", i), td->font_hgt);
+		save_pref_short(format("term%d.tile_o_x", i), td->tile_o_x);
+		save_pref_short(format("term%d.tile_o_y", i), td->tile_o_y);
+		save_pref_short(format("term%d.right", i), td->r.right);
+		save_pref_short(format("term%d.bottom", i), td->r.bottom);
+		save_pref_short(format("term%d.ow1", i), td->size_ow1);
+		save_pref_short(format("term%d.oh1", i), td->size_oh1);
+		save_pref_short(format("term%d.ow2", i), td->size_ow2);
+		save_pref_short(format("term%d.oh2", i), td->size_oh2);
+
 		save_pref_short(format("term%d.mapped", i), td->mapped);
 
 		save_pref_short(format("term%d.font_id", i), td->font_id);
@@ -3570,6 +3584,20 @@ static void cf_load_prefs()
 		load_pref_short(format("term%d.rows", i), &td->rows);
 		load_pref_short(format("term%d.left", i), &td->r.left);
 		load_pref_short(format("term%d.top", i), &td->r.top);
+
+		load_pref_short(format("term%d.font_mono", i), &td->font_mono); 
+		load_pref_short(format("term%d.font_o_x", i), &td->font_o_x);
+		load_pref_short(format("term%d.font_o_y", i), &td->font_o_y);
+		load_pref_short(format("term%d.font_wid", i), &td->font_wid);
+		load_pref_short(format("term%d.font_hgt", i), &td->font_hgt);
+		load_pref_short(format("term%d.tile_o_x", i), &td->tile_o_x);
+		load_pref_short(format("term%d.tile_o_y", i), &td->tile_o_y);
+		load_pref_short(format("term%d.right", i), &td->r.right);
+		load_pref_short(format("term%d.bottom", i), &td->r.bottom);
+		load_pref_short(format("term%d.ow1", i), &td->size_ow1);
+		load_pref_short(format("term%d.oh1", i), &td->size_oh1);
+		load_pref_short(format("term%d.ow2", i), &td->size_ow2);
+		load_pref_short(format("term%d.oh2", i), &td->size_oh2);
 	}
 }
 
@@ -3595,6 +3623,7 @@ static void term_data_hack(term_data *td)
 	/* Default borders */
 	td->size_ow1 = 2;
 	td->size_ow2 = 2;
+	td->size_oh1 = 2;
 	td->size_oh2 = 2;
 
 	/* Start hidden */
diff --git a/src/makefile.osx b/src/makefile.osx
index 7c33347e..6dbccb68 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -131,6 +131,23 @@ install: default
 	rsync ../lib/mods/*.lua $(RESOURCEDIR)/core
 	rsync ../lib/xtra/graf/*.png $(RESOURCEDIR)
 
+BUNDLEDIR := ../ToME.app
+APPVERSION := `carbon/getversion`
+IMAGENAME := ToME $(APPVERSION)
+IMAGEPATH := /Volumes/$(IMAGENAME)
+
+image: install
+	[ -d "$(IMAGEPATH)" ] && diskutil unmount "$(IMAGEPATH)" || true
+
+	hdiutil create -fs HFS+ -volname "$(IMAGENAME)" -ov -type SPARSE -attach "$(IMAGENAME)"
+	cp -r "$(BUNDLEDIR)" ../changes.txt ../credits.txt ../changes.old "$(IMAGEPATH)"
+	cp carbon/Image-DS_Store "$(IMAGEPATH)/.DS_Store"
+	diskutil unmount "$(IMAGEPATH)"
+
+	rm -f "$(IMAGENAME).dmg"
+	hdiutil convert "$(IMAGENAME).sparseimage" -format UDZO -o "$(IMAGENAME)"
+	rm "$(IMAGENAME).sparseimage"
+
 #
 # Clean up old junk
 #
diff --git a/src/modules.c b/src/modules.c
index 1378e69c..2914efeb 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -12,6 +12,8 @@
 
 #include "angband.h"
 
+#ifdef PRIVATE_USER_PATH
+
 static void module_reset_dir_aux(cptr dir, cptr new_path)
 {
 	char buf[1025];
@@ -28,6 +30,8 @@ static void module_reset_dir_aux(cptr dir, cptr new_path)
 		quit(format("Unable to create module dir %s\n", *d));
 }
 
+#endif
+
 void module_reset_dir(cptr dir, cptr new_path)
 {
 	cptr *d = 0;
diff --git a/src/object1.c b/src/object1.c
index 61f243fd..b675b8c5 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -4004,7 +4004,8 @@ bool object_out_desc(object_type *o_ptr, FILE *fff, bool trim_down, bool wait_fo
 
 	if (fff)
 	{
-		if (!trim_down) fprintf(fff, "\n");
+		/* Flush the line position. */
+		text_out("\n");
 		text_out_file = NULL;
 	}
 	else