Author: boucman
Date: Fri Mar 27 18:26:05 2009
New Revision: 34186
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34186&view=rev
Log:
add the run_file FAI command, mainly to ease debugging, patch by Crab
Modified:
trunk/src/formula_ai.cpp
trunk/src/formula_ai.hpp
Modified: trunk/src/formula_ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/formula_ai.cpp?rev=34186&r1=34185&r2=34186&view=diff
==============================================================================
--- trunk/src/formula_ai.cpp (original)
+++ trunk/src/formula_ai.cpp Fri Mar 27 18:26:05 2009
@@ -20,6 +20,7 @@
#include "unit.hpp"
#include "menu_events.hpp"
+#include "filesystem.hpp"
#include "foreach.hpp"
#include "formula_ai.hpp"
#include "log.hpp"
@@ -186,6 +187,38 @@
const formula_ai& ai_;
};
+/** FormulaAI function to run fai script from file. Usable from in-game
console.
+* arguments[0] - required file name, follows the usual wml convention
+*/
+class run_file_function : public function_expression {
+public:
+ explicit run_file_function(const args_list& args, formula_ai& ai)
+ : function_expression("run_file", args, 1, 1), ai_(ai)
+ {}
+private:
+ variant execute(const formula_callable& variables) const {
+ const args_list& arguments = args();
+ const variant var0 = arguments[0]->evaluate(variables);
+ const std::string filename = var0.string_cast();
+
+ //NOTE: get_wml_location also filters file path to ensure it
doesn't contain things like "../../top/secret"
+ std::string path = get_wml_location(filename);
+ if(path.empty()) {
+ return variant(); //no suitable file
+ }
+
+ std::string formula_string = read_file(path);
+ //need to get function_table from somewhere or delegate to
someone who has access to it
+ formula_ptr parsed_formula =
ai_.create_optional_formula(formula_string);
+ if(parsed_formula == game_logic::formula_ptr()) {
+ return variant(); //was unable to create a formula from
file
+ }
+ return parsed_formula->execute(variables);
+ }
+
+ formula_ai& ai_;
+
+};
class castle_locs_function : public function_expression {
public:
@@ -1392,6 +1425,8 @@
return expression_ptr(new calculate_outcome_function(args,
ai_));
} else if(fn == "distance_between") {
return expression_ptr(new distance_between_function(args));
+ } else if(fn == "run_file") {
+ return expression_ptr(new run_file_function(args, ai_));
} else {
return function_symbol_table::create_function(fn, args);
}
@@ -1539,6 +1574,16 @@
get_info().disp.add_chat_message(time(NULL), "fai", get_info().
team_num, msg,
game_display::MESSAGE_PUBLIC, false);
+}
+
+formula_ptr formula_ai::create_optional_formula(const std::string&
formula_string){
+ try{
+ return
game_logic::formula::create_optional_formula(formula_string, &function_table);
+ }
+ catch(formula_error& e) {
+ handle_exception(e);
+ return game_logic::formula_ptr();
+ }
}
void formula_ai::new_turn()
Modified: trunk/src/formula_ai.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/formula_ai.hpp?rev=34186&r1=34185&r2=34186&view=diff
==============================================================================
--- trunk/src/formula_ai.hpp (original)
+++ trunk/src/formula_ai.hpp Fri Mar 27 18:26:05 2009
@@ -167,7 +167,17 @@
std::set<map_location> get_allowed_teleports(unit_map::iterator&
unit_it) const;
paths::route shortest_path_calculator(const map_location& src, const
map_location& dst, unit_map::iterator& unit_it, std::set<map_location>&
allowed_teleports) const;
- void invalidate_move_maps() const { move_maps_valid_ = false; }
+ void invalidate_move_maps() const { move_maps_valid_ = false; }
+
+ /** Create a new formula from the string, using the symbol table which
is stored in the AI.
+ *
+ * @param formula_string the string from which a formula should be
created
+ * @return pointer to created function or
+ * @retval game_logic::formula_ptr() if there were any problems
+ */
+ game_logic::formula_ptr create_optional_formula(const std::string&
formula_string);
+
+
private:
void display_message(const std::string& msg) const;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
