Skip to content

Commit

Permalink
Attempt to fix Travis build... again
Browse files Browse the repository at this point in the history
  • Loading branch information
CelticMinstrel committed Apr 5, 2016
1 parent e1534f0 commit 73739a1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions data/lua/wml-tags.lua
Expand Up @@ -308,7 +308,7 @@ function wml_actions.test_condition(cfg)
if tag == "variable" then
explanation = string.format("%s\n\tNote: The variable %s currently has the value %q.", explanation, this_cfg.name, tostring(wesnoth.get_variable(this_cfg.name)))
end
wesnoth.wml_actions.wml_message{message = explanation, logger = logger}
wesnoth.log(logger, explanation, true)
return true
end
end
Expand Down Expand Up @@ -1018,7 +1018,7 @@ end

function wml_actions.wml_message(cfg)
local logger = cfg.logger or ''
wesnoth.log(cfg.logger, cfg.message. cfg.to_chat)
wesnoth.log(cfg.logger, cfg.message, cfg.to_chat)
end

local function parse_fog_cfg(cfg)
Expand Down
2 changes: 1 addition & 1 deletion src/whiteboard/manager.cpp
Expand Up @@ -480,7 +480,7 @@ namespace
public:
move_owners_finder(): move_owners_() { }

void operator()(action_ptr action) {
void operator()(action* action) {
action->accept(*this);
}

Expand Down
6 changes: 4 additions & 2 deletions src/whiteboard/utility.cpp
Expand Up @@ -165,15 +165,17 @@ bool team_has_visible_plan(team &t)
return !t.get_side_actions()->hidden();
}

void for_each_action(std::function<void(action_ptr)> function, team_filter team_filter)
void for_each_action(std::function<void(action*)> function, team_filter team_filter)
{
bool end = false;
for(size_t turn=0; !end; ++turn) {
end = true;
for(team &side : *resources::teams) {
side_actions &actions = *side.get_side_actions();
if(turn < actions.num_turns() && team_filter(side)) {
std::for_each(actions.turn_begin(turn), actions.turn_end(turn), function);
for(auto iter = actions.turn_begin(turn); iter != actions.turn_end(turn); ++iter) {
function(iter->get());
}
end = false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/whiteboard/utility.hpp
Expand Up @@ -126,7 +126,7 @@ bool team_has_visible_plan(team&);
* @param function the function to execute.
* @param team_filter select whether a team is visited (default to @ref team_has_visible_plan).
*/
void for_each_action(std::function<void(action_ptr)> function,
void for_each_action(std::function<void(action*)> function,
team_filter team_filter = team_has_visible_plan);

/**
Expand Down

0 comments on commit 73739a1

Please sign in to comment.