[Wesnoth-cvs-commits] wesnoth/src actions.cpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/08/30 02:05:28

Modified files:
        src            : actions.cpp 

Log message:
        made recall work properly

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.152&tr2=1.153&r1=text&r2=text

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.152 wesnoth/src/actions.cpp:1.153
--- wesnoth/src/actions.cpp:1.152       Mon Aug 30 01:36:32 2004
+++ wesnoth/src/actions.cpp     Mon Aug 30 02:05:28 2004
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.152 2004/08/30 01:36:32 Sirp Exp $ */
+/* $Id: actions.cpp,v 1.153 2004/08/30 02:05:28 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -97,7 +97,7 @@
                return _("You must have your leader on a keep to recruit or 
recall units.");
        }
 
-       if(map.on_board(recruit_location)) {
+       if(need_castle && map.on_board(recruit_location)) {
                const paths::route& rt = 
a_star_search(u->first,recruit_location,
                                                   
100.0,castle_cost_calculator(map));
                if(rt.steps.empty() || units.find(recruit_location) != 
units.end() ||