Author: dragonking
Date: Thu Jul 31 14:54:21 2008
New Revision: 28288
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28288&view=rev
Log:
Formula function improvement
Modified:
trunk/src/formula_function.cpp
Modified: trunk/src/formula_function.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/formula_function.cpp?rev=28288&r1=28287&r2=28288&view=diff
==============================================================================
--- trunk/src/formula_function.cpp (original)
+++ trunk/src/formula_function.cpp Thu Jul 31 14:54:21 2008
@@ -266,19 +266,27 @@
class debug_print_function : public function_expression {
public:
explicit debug_print_function(const args_list& args)
- : function_expression("debug_print", args, 1, 1)
- {}
-
-private:
- variant execute(const formula_callable& variables) const {
- const variant var = args()[0]->evaluate(variables);
-
- std::string str;
-
- var.serialize_to_string(str);
- std::cerr<< str << std::endl;
-
- return var;
+ : function_expression("debug_print", args, 1, 2)
+ {}
+
+private:
+ variant execute(const formula_callable& variables) const {
+ const variant var1 = args()[0]->evaluate(variables);
+
+ std::string str1,str2;
+
+ if( args().size() == 1)
+ {
+ var1.serialize_to_string(str1);
+ std::cout<< str1 << std::endl;
+ return var1;
+ } else {
+ str1 = var1.string_cast();
+ const variant var2 = args()[1]->evaluate(variables);
+ var2.serialize_to_string(str2);
+ std::cout<< str1 << str2 << std::endl;
+ return var2;
+ }
}
};
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
