Package: crawl
Version: 2:0.4.4-1
Followup-For: Bug #523694
User: [email protected]
Usertags: origin-ubuntu jaunty ubuntu-patch
Attached to this mail is debdiff from Ubuntu 9.04 which updates crawl
to 0.4.5. It's stripped from ubuntu bits in debian/changelog
and debian/control.
*** /tmp/tmpJ7bUPE
In Ubuntu, we've applied the attached patch to achieve the following:
* New upstream release (LP: #320142)
We thought you might be interested in doing the same.
-- System Information:
Debian Release: 5.0
APT prefers jaunty-updates
APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500, 'jaunty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.28-11-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru crawl-0.4.4/debian/changelog crawl-0.4.5/debian/changelog
diff -Nru crawl-0.4.4/docs/changes.stone_soup crawl-0.4.5/docs/changes.stone_soup
--- crawl-0.4.4/docs/changes.stone_soup 2008-12-20 03:23:07.000000000 +0100
+++ crawl-0.4.5/docs/changes.stone_soup 2009-01-15 02:55:20.000000000 +0100
@@ -1,3 +1,10 @@
+Stone Soup 0.4.5 (20090114)
+---------------------------
+
+* Fixed infinite loop when attempting to create randarts named after gods.
+* Fixed re-do command (`) wasting a turn.
+* Fixed corpses not appearing in Tiles inventory.
+
Stone Soup 0.4.4 (20081220)
---------------------------
diff -Nru crawl-0.4.4/source/acr.cc crawl-0.4.5/source/acr.cc
--- crawl-0.4.4/source/acr.cc 2008-12-20 03:23:05.000000000 +0100
+++ crawl-0.4.5/source/acr.cc 2009-01-13 03:40:36.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: Main entry point, event loop, and some initialization functions
* Written by: Linley Henzell
*
- * Modified for Crawl Reference by $Author: j-p-e-g $ on $Date: 2008-12-08 16:53:05 -0500 (Mon, 08 Dec 2008) $
+ * Modified for Crawl Reference by $Author: zelgadis $ on $Date: 2008-12-31 19:54:21 -0500 (Wed, 31 Dec 2008) $
*
* Change History (most recent first):
*
@@ -1539,6 +1539,12 @@
// the keys to repeat are recorded.
if (cmd == CMD_REPEAT_CMD)
return;
+
+ // If the command was CMD_PREV_CMD_AGAIN then _input() has been
+ // recursively called by _do_prev_cmd_again() via process_command()
+ // to re-do the command, so there's nothing more to do.
+ if (cmd == CMD_PREV_CMD_AGAIN)
+ return;
}
if (need_to_autoinscribe())
diff -Nru crawl-0.4.4/source/dat/descript/skills.txt crawl-0.4.5/source/dat/descript/skills.txt
--- crawl-0.4.4/source/dat/descript/skills.txt 2008-12-20 03:23:05.000000000 +0100
+++ crawl-0.4.5/source/dat/descript/skills.txt 2009-01-13 03:40:36.000000000 +0100
@@ -72,7 +72,7 @@
Slings
Being skilled in a particular type of ranged attack will let you deal
-more damage when using the appropriate launcher an dammunition.
+more damage when using the appropriate launcher and ammunition.
If you're already trained in Throwing, you'll pick up the Slings skill
faster, and vice versa.
@@ -90,7 +90,7 @@
Darts
Being skilled in a particular type of ranged attack will let you deal
-more damage when using the appropriate launcher an dammunition.
+more damage when using the appropriate launcher and ammunition.
%%%%
Throwing
diff -Nru crawl-0.4.4/source/decks.cc crawl-0.4.5/source/decks.cc
--- crawl-0.4.4/source/decks.cc 2008-12-20 03:23:06.000000000 +0100
+++ crawl-0.4.5/source/decks.cc 2009-01-15 02:55:20.000000000 +0100
@@ -2,7 +2,7 @@
* File: decks.cc
* Summary: Functions with decks of cards.
*
- * Modified for Crawl Reference by $Author: j-p-e-g $ on $Date: 2008-12-08 15:15:03 -0500 (Mon, 08 Dec 2008) $
+ * Modified for Crawl Reference by $Author: j-p-e-g $ on $Date: 2009-01-13 16:20:39 -0500 (Tue, 13 Jan 2009) $
*
* Change History (most recent first):
*
@@ -1362,6 +1362,15 @@
{
monsters& mon(*mon_to_swap);
const coord_def newpos = mon.pos();
+
+ // Be nice: no swapping into uninhabitable environments.
+ if (is_grid_dangerous(grd(newpos))
+ || !monster_habitable_grid(mon_to_swap, grd(you.pos())))
+ {
+ mpr("You spin around.");
+ return;
+ }
+
bool mon_caught = mons_is_caught(&mon);
bool you_caught = you.attribute[ATTR_HELD];
@@ -1382,6 +1391,7 @@
}
// Move you to its previous location.
+ // FIXME: this should also handle merfolk swimming, etc.
you.moveto(newpos);
if (mon_caught)
diff -Nru crawl-0.4.4/source/initfile.cc crawl-0.4.5/source/initfile.cc
--- crawl-0.4.4/source/initfile.cc 2009-04-22 16:40:12.000000000 +0200
+++ crawl-0.4.5/source/initfile.cc 2009-04-22 16:40:13.000000000 +0200
@@ -3,7 +3,7 @@
* Summary: Simple reading of an init file and system variables
* Written by: David Loewenstern
*
- * Modified for Crawl Reference by $Author: ennewalker $ on $Date: 2008-12-15 22:51:01 -0500 (Mon, 15 Dec 2008) $
+ * Modified for Crawl Reference by $Author: ennewalker $ on $Date: 2008-12-24 12:37:41 -0500 (Wed, 24 Dec 2008) $
*
* Change History (most recent first):
*
@@ -829,7 +829,7 @@
#endif
#ifdef USE_TILE
- strcpy(tile_show_items, "!?/%=([)X}+\\_.");
+ strcpy(tile_show_items, "!?/%=([)x}+\\_.");
tile_title_screen = true;
// minimap colours
tile_player_col = MAP_WHITE;
diff -Nru crawl-0.4.4/source/makefile.unix crawl-0.4.5/source/makefile.unix
--- crawl-0.4.4/source/makefile.unix 2009-04-22 16:40:12.000000000 +0200
+++ crawl-0.4.5/source/makefile.unix 2009-04-22 16:40:13.000000000 +0200
@@ -1,7 +1,7 @@
# -*- Makefile -*- for Dungeon Crawl (unix)
#
-# Modified for Crawl Reference by $Author: ennewalker $ on $Date: 2008-07-04 18:50:41 -0400 (Fri, 04 Jul 2008) $
+# Modified for Crawl Reference by $Author: zelgadis $ on $Date: 2008-12-20 01:20:09 -0500 (Sat, 20 Dec 2008) $
#
GAME = crawl
@@ -280,8 +280,9 @@
$(GAME): $(GAME_DEPENDS)
${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
-debug: $(GAME_DEPENDS)
- ${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+.PHONY : debug
+
+debug: $(GAME)
profile: $(GAME_DEPENDS)
${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
diff -Nru crawl-0.4.4/source/randart.cc crawl-0.4.5/source/randart.cc
--- crawl-0.4.4/source/randart.cc 2008-12-20 03:23:06.000000000 +0100
+++ crawl-0.4.5/source/randart.cc 2009-01-13 03:40:36.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: Random and unrandom artefact functions.
* Written by: Linley Henzell
*
- * Modified for Crawl Reference by $Author: zelgadis $ on $Date: 2008-12-03 01:31:03 -0500 (Wed, 03 Dec 2008) $
+ * Modified for Crawl Reference by $Author: j-p-e-g $ on $Date: 2009-01-12 16:11:00 -0500 (Mon, 12 Jan 2009) $
*
* Change History (most recent first):
*
@@ -95,7 +95,8 @@
if (type_bad && !name_check_only)
{
ASSERT(!"God attempting to gift invalid type of item.");
- mprf(MSGCH_ERROR, "%s attempting to gift invalid type of item.");
+ mprf(MSGCH_ERROR, "%s attempting to gift invalid type of item.",
+ god_name(which_god).c_str());
// Prevent infinite loop in make_item_randart()
return (true);
}
@@ -276,7 +277,7 @@
{
which_god = static_cast<god_type>(random2(NUM_GODS - 1) + 1);
}
- while (!_god_fits_artefact(which_god, item), true);
+ while (!_god_fits_artefact(which_god, item, true));
}
name = replace_all(name, "@god_name@", god_name(which_god, false));
diff -Nru crawl-0.4.4/source/transfor.cc crawl-0.4.5/source/transfor.cc
--- crawl-0.4.4/source/transfor.cc 2008-12-20 03:23:06.000000000 +0100
+++ crawl-0.4.5/source/transfor.cc 2009-01-13 03:40:36.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: Misc function related to player transformations.
* Written by: Linley Henzell
*
- * Modified for Crawl Reference by $Author: j-p-e-g $ on $Date: 2008-12-08 15:15:03 -0500 (Mon, 08 Dec 2008) $
+ * Modified for Crawl Reference by $Author: zelgadis $ on $Date: 2008-12-19 22:04:07 -0500 (Fri, 19 Dec 2008) $
*
* Change History (most recent first):
*
@@ -796,6 +796,8 @@
you.hp = you.hp_max;
}
calc_hp();
+
+ handle_interrupted_swap(true);
} // end untransform()
// XXX: This whole system is a mess as it still relies on special
diff -Nru crawl-0.4.4/source/version.h crawl-0.4.5/source/version.h
--- crawl-0.4.4/source/version.h 2008-12-20 03:23:05.000000000 +0100
+++ crawl-0.4.5/source/version.h 2009-01-15 02:55:20.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: Contains version information
* Written by: ??
*
- * Modified for Crawl Reference by $Author: dshaligram $ on $Date: 2008-08-04 01:36:31 -0400 (Mon, 04 Aug 2008) $
+ * Modified for Crawl Reference by $Author: j-p-e-g $ on $Date: 2009-01-13 16:20:39 -0500 (Tue, 13 Jan 2009) $
*
* Change History (most recent first):
*
@@ -37,7 +37,7 @@
#define CRAWL "Dungeon Crawl Stone Soup"
-#define VER_NUM "0.4.4"
+#define VER_NUM "0.4.5"
#define VER_QUAL ""
// last updated 07august2001 {mv}
