Author: dragonking
Date: Tue Mar 25 17:31:18 2008
New Revision: 25124
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25124&view=rev
Log:
Fixed the switch() function bug which made this function always return second
argument instead of proper result
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=25124&r1=25123&r2=25124&view=diff
==============================================================================
--- trunk/src/formula_function.cpp (original)
+++ trunk/src/formula_function.cpp Tue Mar 25 17:31:18 2008
@@ -66,13 +66,13 @@
class switch_function : public function_expression {
public:
explicit switch_function(const args_list& args)
- : function_expression("switch", args, 4, -1)
+ : function_expression("switch", args, 3, -1)
{}
private:
variant execute(const formula_callable& variables) const {
variant var = args()[0]->evaluate(variables);
- for(int n = 0; n < args().size()-1; n += 2) {
+ for(int n = 1; n < args().size()-1; n += 2) {
variant val = args()[n]->evaluate(variables);
if(val == var) {
return args()[n+1]->evaluate(variables);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
