Author: euschn
Date: Mon Jun 22 14:19:24 2009
New Revision: 36350
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36350&view=rev
Log:
removed unused gamestatus parameter from check_victory()
Modified:
trunk/src/actions.cpp
trunk/src/actions.hpp
trunk/src/ai/actions.cpp
trunk/src/ai/contexts.cpp
trunk/src/mouse_events.cpp
trunk/src/playsingle_controller.cpp
trunk/src/replay.cpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=36350&r1=36349&r2=36350&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Mon Jun 22 14:19:24 2009
@@ -1891,7 +1891,7 @@
game_events::fire("post_advance",loc);
}
-void check_victory(const gamestatus& /*status*/, unit_map& units,
std::vector<team>& teams, display& disp)
+void check_victory(unit_map& units, std::vector<team>& teams, display& disp)
{
std::vector<unsigned int> seen_leaders;
for(unit_map::const_iterator i = units.begin();
Modified: trunk/src/actions.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.hpp?rev=36350&r1=36349&r2=36350&view=diff
==============================================================================
--- trunk/src/actions.hpp (original)
+++ trunk/src/actions.hpp Mon Jun 22 14:19:24 2009
@@ -289,7 +289,7 @@
* an end_level_exception if one has.
* Will also remove control of villages from sides with dead leaders.
*/
-void check_victory(const gamestatus& status, unit_map& units,
std::vector<team>& teams, display& disp);
+void check_victory(unit_map& units, std::vector<team>& teams, display& disp);
/**
* Gets the time of day at a certain tile.
Modified: trunk/src/ai/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/actions.cpp?rev=36350&r1=36349&r2=36350&view=diff
==============================================================================
--- trunk/src/ai/actions.cpp (original)
+++ trunk/src/ai/actions.cpp Mon Jun 22 14:19:24 2009
@@ -288,7 +288,7 @@
}
}
- check_victory(get_info().state,get_info().units,get_info().teams,
get_info().disp);
+ check_victory(get_info().units,get_info().teams, get_info().disp);
manager::raise_enemy_attacked();
set_gamestate_changed();
}
Modified: trunk/src/ai/contexts.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/contexts.cpp?rev=36350&r1=36349&r2=36350&view=diff
==============================================================================
--- trunk/src/ai/contexts.cpp (original)
+++ trunk/src/ai/contexts.cpp Mon Jun 22 14:19:24 2009
@@ -570,7 +570,7 @@
}
}
- check_victory(get_info().state,get_info().units,get_info().teams,
get_info().disp);
+ check_victory(get_info().units,get_info().teams, get_info().disp);
raise_enemy_attacked();
recalculate_move_maps();
Modified: trunk/src/mouse_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mouse_events.cpp?rev=36350&r1=36349&r2=36350&view=diff
==============================================================================
--- trunk/src/mouse_events.cpp (original)
+++ trunk/src/mouse_events.cpp Mon Jun 22 14:19:24 2009
@@ -696,7 +696,7 @@
dialogs::advance_unit(map_,units_,defender_loc,gui(),!defender_human);
}
- check_victory(status_, units_, teams_, gui());
+ check_victory(units_, teams_, gui());
gui().draw();
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=36350&r1=36349&r2=36350&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Mon Jun 22 14:19:24 2009
@@ -592,7 +592,7 @@
ai_testing::log_turn_end(player_number_);
}
- check_victory(status_, units_, teams_, *gui_);
+ check_victory(units_, teams_, *gui_);
}
// Time has run out
Modified: trunk/src/replay.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/replay.cpp?rev=36350&r1=36349&r2=36350&view=diff
==============================================================================
--- trunk/src/replay.cpp (original)
+++ trunk/src/replay.cpp Mon Jun 22 14:19:24 2009
@@ -805,7 +805,7 @@
//if there are no more advancing units, then we
check for victory,
//in case the battle that led to advancement
caused the end of scenario
if(advancing_units.empty()) {
- check_victory(state, units, teams,
disp);
+ check_victory(units, teams, disp);
}
continue;
@@ -1135,7 +1135,7 @@
//check victory now if we don't have any advancements.
If we do have advancements,
//we don't check until the advancements are processed.
if(advancing_units.empty()) {
- check_victory(state, units, teams, disp);
+ check_victory(units, teams, disp);
}
fix_shroud = !get_replay_source().is_skipping();
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
