Author: euschn
Date: Mon Jun 22 14:09:57 2009
New Revision: 36349
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36349&view=rev
Log:
removed gamestatus member from class attack
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/replay.cpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=36349&r1=36348&r2=36349&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Mon Jun 22 14:09:57 2009
@@ -905,7 +905,6 @@
int attack_with,
int defend_with,
unit_map& units,
- const gamestatus& state,
const tod_manager& tod_mng,
bool update_display) :
gui_(gui),
@@ -917,7 +916,6 @@
a_(attacker, attack_with, units),
d_(defender, defend_with, units),
units_(units),
- state_(state),
tod_manager_(tod_mng),
errbuf_(),
update_display_(update_display),
Modified: trunk/src/actions.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.hpp?rev=36349&r1=36348&r2=36349&view=diff
==============================================================================
--- trunk/src/actions.hpp (original)
+++ trunk/src/actions.hpp Mon Jun 22 14:09:57 2009
@@ -181,7 +181,6 @@
int attack_with,
int defend_with,
unit_map& units,
- const gamestatus& state,
const tod_manager& tod_mng,
bool update_display = true);
~attack();
@@ -219,7 +218,6 @@
unit_info a_, d_;
unit_map& units_;
- const gamestatus& state_;
const tod_manager& tod_manager_;
std::stringstream errbuf_;
Modified: trunk/src/ai/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/actions.cpp?rev=36349&r1=36348&r2=36349&view=diff
==============================================================================
--- trunk/src/ai/actions.cpp (original)
+++ trunk/src/ai/actions.cpp Mon Jun 22 14:09:57 2009
@@ -260,7 +260,7 @@
try {
attack(get_info().disp, get_info().map, get_info().teams,
attacker_loc_,
defender_loc_,attacker_weapon,defender_weapon,
get_info().units,
- get_info().state, get_info().tod_manager_);
+ get_info().tod_manager_);
}
catch (end_level_exception&)
{
Modified: trunk/src/ai/contexts.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/contexts.cpp?rev=36349&r1=36348&r2=36349&view=diff
==============================================================================
--- trunk/src/ai/contexts.cpp (original)
+++ trunk/src/ai/contexts.cpp Mon Jun 22 14:09:57 2009
@@ -542,7 +542,7 @@
}
try {
attack(get_info().disp, get_info().map, get_info().teams, u,
target, weapon, def_weapon,
- get_info().units, get_info().state,
get_info().tod_manager_);
+ get_info().units, get_info().tod_manager_);
}
catch (end_level_exception&)
{
Modified: trunk/src/mouse_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mouse_events.cpp?rev=36349&r1=36348&r2=36349&view=diff
==============================================================================
--- trunk/src/mouse_events.cpp (original)
+++ trunk/src/mouse_events.cpp Mon Jun 22 14:09:57 2009
@@ -676,7 +676,7 @@
current_team().set_action_bonus_count(1 +
current_team().action_bonus_count());
try {
-
attack(gui(),map_,teams_,attacker_loc,defender_loc,att.attack_num,def.attack_num,units_,status_,
tod_manager_);
+
attack(gui(),map_,teams_,attacker_loc,defender_loc,att.attack_num,def.attack_num,units_,tod_manager_);
} catch(end_level_exception&) {
//if the level ends due to a unit being killed, still
see if
//either the attacker or defender should advance
Modified: trunk/src/replay.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/replay.cpp?rev=36349&r1=36348&r2=36349&view=diff
==============================================================================
--- trunk/src/replay.cpp (original)
+++ trunk/src/replay.cpp Mon Jun 22 14:09:57 2009
@@ -1116,7 +1116,7 @@
DBG_REPLAY << "Attacker XP (before attack): " <<
u->second.experience() << "\n";;
- DELAY_END_LEVEL(delayed_exception, attack(disp, map,
teams, src, dst, weapon_num, def_weapon_num, units, state,
controller.get_tod_manager(), !get_replay_source().is_skipping()));
+ DELAY_END_LEVEL(delayed_exception, attack(disp, map,
teams, src, dst, weapon_num, def_weapon_num, units,
controller.get_tod_manager(), !get_replay_source().is_skipping()));
DBG_REPLAY << "Attacker XP (after attack): " <<
u->second.experience() << "\n";;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
