Author: alfie Date: 2008-12-13 22:45:02 +0000 (Sat, 13 Dec 2008) New Revision: 8504
Added: packages/trunk/wesnoth/debian/patches/03recruite_more_than_99_castle_tiles_away Modified: packages/trunk/wesnoth/debian/changelog packages/trunk/wesnoth/debian/patches/series Log: * Fetch upstream revision 28805 to allow recruit more than 99 castle tiles away (LP: #256345). Have fun, Toni! Modified: packages/trunk/wesnoth/debian/changelog =================================================================== --- packages/trunk/wesnoth/debian/changelog 2008-12-13 22:33:32 UTC (rev 8503) +++ packages/trunk/wesnoth/debian/changelog 2008-12-13 22:45:02 UTC (rev 8504) @@ -1,3 +1,10 @@ +wesnoth (1:1.4.7-2) unstable; urgency=low + + * Fetch upstream revision 28805 to allow recruit more than 99 castle tiles + away (LP: #256345). Have fun, Toni! + + -- Gerfried Fuchs <[email protected]> Sat, 13 Dec 2008 23:43:16 +0100 + wesnoth (1:1.4.7-1) unstable; urgency=low * New stable upstream release, bugfixes and translation updates, fixing: Added: packages/trunk/wesnoth/debian/patches/03recruite_more_than_99_castle_tiles_away =================================================================== --- packages/trunk/wesnoth/debian/patches/03recruite_more_than_99_castle_tiles_away (rev 0) +++ packages/trunk/wesnoth/debian/patches/03recruite_more_than_99_castle_tiles_away 2008-12-13 22:45:02 UTC (rev 8504) @@ -0,0 +1,19 @@ +Author: Eric S. Raymond <[email protected]> vim:ft=diff: +Description: Address bug #12185: Cannot recruit more than 99 castle tiles away. + +Index: wesnoth-1.4.7/src/actions.cpp +=================================================================== +--- wesnoth-1.4.7.orig/src/actions.cpp ++++ wesnoth-1.4.7/src/actions.cpp +@@ -112,7 +112,10 @@ bool can_recruit_on(const gamemap& map, + return false; + + castle_cost_calculator calc(map); +- const paths::route& rt = a_star_search(leader, loc, 100.0, &calc, map.w(), map.h()); ++ // The limit computed in the third argument is more than enough for ++ // any convex castle on the map. Strictly speaking it could be ++ // reduced to sqrt(map.w()**2 + map.h()**2). ++ const paths::route& rt = a_star_search(leader, loc, map.w()+map.h(), &calc, map.w(), map.h()); + + if(rt.steps.empty()) + return false; Modified: packages/trunk/wesnoth/debian/patches/series =================================================================== --- packages/trunk/wesnoth/debian/patches/series 2008-12-13 22:33:32 UTC (rev 8503) +++ packages/trunk/wesnoth/debian/patches/series 2008-12-13 22:45:02 UTC (rev 8504) @@ -1 +1,2 @@ 02wesnoth-nolog-desktop-file +03recruite_more_than_99_castle_tiles_away _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

