Author: euschn
Date: Mon Jun 22 10:15:02 2009
New Revision: 36346
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36346&view=rev
Log:
removed gamestatus parameters from class battle_context
Modified:
trunk/src/actions.cpp
trunk/src/actions.hpp
trunk/src/ai/actions.cpp
trunk/src/ai/default/ai.cpp
trunk/src/ai/default/attack.cpp
trunk/src/ai/formula/ai.cpp
trunk/src/mouse_events.cpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=36346&r1=36345&r2=36346&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Mon Jun 22 10:15:02 2009
@@ -264,7 +264,7 @@
}
battle_context::battle_context(const gamemap& map, const std::vector<team>&
teams, const unit_map& units,
- const gamestatus& status, const tod_manager& tod_mng,
+ const tod_manager& tod_mng,
const map_location& attacker_loc, const map_location&
defender_loc,
int attacker_weapon, int defender_weapon, double aggression,
const combatant *prev_def, const unit* attacker_ptr)
: attacker_stats_(NULL), defender_stats_(NULL), attacker_combatant_(NULL),
defender_combatant_(NULL)
@@ -278,11 +278,11 @@
if (attacker_weapon == -1) {
attacker_weapon = choose_attacker_weapon(attacker, defender,
map, teams, units,
- status, tod_mng, attacker_loc, defender_loc,
+ tod_mng, attacker_loc, defender_loc,
harm_weight, &defender_weapon, prev_def);
} else if (defender_weapon == -1) {
defender_weapon = choose_defender_weapon(attacker, defender,
attacker_weapon, map, teams,
- units, status, tod_mng, attacker_loc,
defender_loc, prev_def);
+ units, tod_mng, attacker_loc, defender_loc,
prev_def);
}
// If those didn't have to generate statistics, do so now.
@@ -348,7 +348,7 @@
/** @todo FIXME: Hand previous defender unit in here. */
int battle_context::choose_defender_weapon(const unit &attacker, const unit
&defender, unsigned attacker_weapon,
const gamemap& map, const std::vector<team>& teams, const
unit_map& units,
- const gamestatus& status, const tod_manager& tod_mng,
+ const tod_manager& tod_mng,
const map_location& attacker_loc, const map_location&
defender_loc,
const combatant *prev_def)
{
@@ -444,7 +444,7 @@
int battle_context::choose_attacker_weapon(const unit &attacker, const unit
&defender,
const gamemap& map, const std::vector<team>& teams, const
unit_map& units,
- const gamestatus& status, const tod_manager& tod_mng,
+ const tod_manager& tod_mng,
const map_location& attacker_loc, const map_location&
defender_loc,
double harm_weight, int *defender_weapon, const combatant
*prev_def)
{
@@ -462,7 +462,7 @@
return -1;
if (choices.size() == 1) {
*defender_weapon = choose_defender_weapon(attacker, defender,
choices[0], map, teams, units,
- status, tod_mng, attacker_loc, defender_loc,
prev_def);
+ tod_mng, attacker_loc, defender_loc, prev_def);
return choices[0];
}
@@ -473,7 +473,7 @@
for (i = 0; i < choices.size(); i++) {
const attack_type &att = attacker.attacks()[choices[i]];
int def_weapon = choose_defender_weapon(attacker, defender,
choices[i], map, teams, units,
- status, tod_mng, attacker_loc, defender_loc,
prev_def);
+ tod_mng, attacker_loc, defender_loc, prev_def);
// If that didn't simulate, do so now.
if (!attacker_combatant_) {
const attack_type *def = NULL;
@@ -848,7 +848,7 @@
return;
}
- *bc_ = battle_context(map_, teams_, units_, state_, tod_manager_,
a_.loc_, d_.loc_, a_.weapon_, d_.weapon_);
+ *bc_ = battle_context(map_, teams_, units_, tod_manager_, a_.loc_,
d_.loc_, a_.weapon_, d_.weapon_);
a_stats_ = &bc_->get_attacker_stats();
d_stats_ = &bc_->get_defender_stats();
a_.cth_ = a_stats_->chance_to_hit;
@@ -948,7 +948,7 @@
// If the attacker was invisible, she isn't anymore!
a_.get_unit().set_state(unit::STATE_HIDDEN,false);
- bc_ = new battle_context(map_, teams_, units_, state_, tod_manager_,
a_.loc_, d_.loc_, a_.weapon_, d_.weapon_);
+ bc_ = new battle_context(map_, teams_, units_, tod_manager_, a_.loc_,
d_.loc_, a_.weapon_, d_.weapon_);
a_stats_ = &bc_->get_attacker_stats();
d_stats_ = &bc_->get_defender_stats();
if(a_stats_->weapon) {
Modified: trunk/src/actions.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.hpp?rev=36346&r1=36345&r2=36346&view=diff
==============================================================================
--- trunk/src/actions.hpp (original)
+++ trunk/src/actions.hpp Mon Jun 22 10:15:02 2009
@@ -123,7 +123,7 @@
* prev_def is for predicting multiple attacks against a defender.
*/
battle_context(const gamemap& map, const std::vector<team>& teams,
const unit_map& units,
- const gamestatus& status, const tod_manager&
tod_mng,
+ const tod_manager& tod_mng,
const map_location& attacker_loc, const
map_location& defender_loc,
int attacker_weapon = -1, int
defender_weapon = -1, double aggression = 0.0, const combatant *prev_def =
NULL, const unit* attacker_ptr=NULL);
@@ -155,13 +155,13 @@
int choose_attacker_weapon(const unit &attacker, const unit &defender,
const gamemap&
map, const std::vector<team>& teams, const unit_map& units,
- const
gamestatus& status, const tod_manager& tod_mng,
+ const
tod_manager& tod_mng,
const
map_location& attacker_loc, const map_location& defender_loc,
double
harm_weight, int *defender_weapon, const combatant *prev_def);
int choose_defender_weapon(const unit &attacker, const unit &defender,
unsigned attacker_weapon,
const gamemap& map,
const std::vector<team>& teams, const unit_map& units,
- const gamestatus&
status, const tod_manager& tod_mng,
+ const tod_manager&
tod_mng,
const map_location&
attacker_loc, const map_location& defender_loc, const combatant *prev_def);
/** Statistics of the units. */
Modified: trunk/src/ai/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/actions.cpp?rev=36346&r1=36345&r2=36346&view=diff
==============================================================================
--- trunk/src/ai/actions.cpp (original)
+++ trunk/src/ai/actions.cpp Mon Jun 22 10:15:02 2009
@@ -248,7 +248,7 @@
//CHECK ATTACKER WEAPON
battle_context bc(get_info().map, get_info().teams, get_info().units,
- get_info().state, get_info().tod_manager_, attacker_loc_,
+ get_info().tod_manager_, attacker_loc_,
defender_loc_, attacker_weapon_, -1,
get_my_team(get_info()).aggression());
int attacker_weapon = bc.get_attacker_stats().attack_num;
Modified: trunk/src/ai/default/ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/default/ai.cpp?rev=36346&r1=36345&r2=36346&view=diff
==============================================================================
--- trunk/src/ai/default/ai.cpp (original)
+++ trunk/src/ai/default/ai.cpp Mon Jun 22 10:15:02 2009
@@ -152,7 +152,7 @@
if(best_defense != -1) {
move_unit(best_movement.second,best_movement.first,possible_moves);
battle_context bc(get_info().map,
get_info().teams,
-
get_info().units, get_info().state, get_info().tod_manager_,
+
get_info().units, get_info().tod_manager_,
best_movement.first,
i->first, -1, -1, current_team().aggression());
attack_enemy(best_movement.first,i->first,
@@ -460,7 +460,7 @@
const unit_map::const_iterator itor =
units_.find(*adj_i);
if(itor != units_.end() &&
current_team().is_enemy(itor->second.side()) &&
!itor->second.incapacitated()) {
- battle_context bc(map_, teams_, units_,
state_, tod_manager_,
+ battle_context bc(map_, teams_, units_,
tod_manager_,
res,
*adj_i, -1, -1, current_team().aggression());
attack_enemy(res,itor->first,bc.get_attacker_stats().attack_num,bc.get_defender_stats().attack_num);
break;
@@ -862,7 +862,7 @@
}
// Recalc appropriate weapons here: AI uses approximations.
- battle_context bc(map_, teams_, units_, state_, tod_manager_,
+ battle_context bc(map_, teams_, units_, tod_manager_,
to, target_loc, -1, -1,
current_team().aggression());
attack_enemy(to, target_loc, bc.get_attacker_stats().attack_num,
@@ -1150,7 +1150,7 @@
if (!enemy ||
!current_team().is_enemy(enemy->side()) || enemy->incapacitated())
continue;
// Current behavior is to only make risk-free
attacks.
- battle_context bc(map_, teams_, units_, state_,
tod_manager_, arrived_at, adj[n], -1, -1, 100.0);
+ battle_context bc(map_, teams_, units_,
tod_manager_, arrived_at, adj[n], -1, -1, 100.0);
#ifndef SUOKKO
if (bc.get_defender_stats().damage ==
0) {
attack_enemy(arrived_at,
adj[n], bc.get_attacker_stats().attack_num,
Modified: trunk/src/ai/default/attack.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/default/attack.cpp?rev=36346&r1=36345&r2=36346&view=diff
==============================================================================
--- trunk/src/ai/default/attack.cpp (original)
+++ trunk/src/ai/default/attack.cpp Mon Jun 22 10:15:02 2009
@@ -125,7 +125,7 @@
from_cache = true;
bc = new battle_context(usc->second.first,
usc->second.second);
} else {
- bc = new battle_context(map, teams, units, status,
tod_mng, m->second, target, att_weapon, def_weapon, aggression, prev_def);
+ bc = new battle_context(map, teams, units, tod_mng,
m->second, target, att_weapon, def_weapon, aggression, prev_def);
}
const combatant &att = bc->get_attacker_combatant(prev_def);
const combatant &def = bc->get_defender_combatant(prev_def);
@@ -362,7 +362,7 @@
// Skip weapons with attack_weight=0
if (attacks[i].attack_weight() == 0)
continue;
- battle_context bc(map_, teams_, units_, state_,
tod_manager_, loc, adj[n], i);
+ battle_context bc(map_, teams_, units_, tod_manager_,
loc, adj[n], i);
combatant att(bc.get_attacker_stats());
combatant def(bc.get_defender_stats());
att.fight(def);
@@ -394,7 +394,7 @@
// SKip weapons with attack_weight=0
if (attacks[i].attack_weight() == 0)
continue;
- battle_context bc(map_, teams_, units_, state_,
tod_manager_, adj[n], loc, i);
+ battle_context bc(map_, teams_, units_, tod_manager_,
adj[n], loc, i);
combatant att(bc.get_attacker_stats());
combatant def(bc.get_defender_stats());
att.fight(def);
@@ -407,7 +407,7 @@
// It is possible that there were no adjacent units to attack...
if (least_hp != u.hitpoints() + 1) {
- battle_context bc(map_, teams_, units_, state_, tod_manager_,
loc, adj[best_dir], -1, -1, 0.5);
+ battle_context bc(map_, teams_, units_, tod_manager_, loc,
adj[best_dir], -1, -1, 0.5);
attack_enemy(loc, adj[best_dir],
bc.get_attacker_stats().attack_num,
bc.get_defender_stats().attack_num);
return true;
Modified: trunk/src/ai/formula/ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/formula/ai.cpp?rev=36346&r1=36345&r2=36346&view=diff
==============================================================================
--- trunk/src/ai/formula/ai.cpp (original)
+++ trunk/src/ai/formula/ai.cpp Mon Jun 22 10:15:02 2009
@@ -509,7 +509,7 @@
}
battle_context bc(ai_.get_info().map, ai_.get_info().teams,
ai_.get_info().units,
- ai_.get_info().state, ai_.get_info().tod_manager_,
convert_variant<location_callable>(args()[1]->evaluate(variables))->loc(),
+ ai_.get_info().tod_manager_,
convert_variant<location_callable>(args()[1]->evaluate(variables))->loc(),
defender_location, weapon, -1, 1.0, NULL,
&ai_.get_info().units.find(attacker_location)->second);
std::vector<double> hp_dist =
bc.get_attacker_combatant().hp_dist;
std::vector<double>::iterator it = hp_dist.begin();
@@ -895,7 +895,7 @@
int weapon)
: move_from_(move_from), src_(src), dst_(dst),
bc_(ai.get_info().map, ai.get_info().teams, ai.get_info().units,
- ai.get_info().state, ai.get_info().tod_manager_, src,
dst, weapon, -1, 1.0, NULL,
+ ai.get_info().tod_manager_, src, dst, weapon, -1, 1.0,
NULL,
&ai.get_info().units.find(move_from)->second)
{
}
@@ -2138,7 +2138,7 @@
if(get_info().units.count(att_src)) {
battle_context bc(get_info().map,
get_info().teams,
- get_info().units,
get_info().state, get_info().tod_manager_,
+ get_info().units,
get_info().tod_manager_,
att_src, att_dst, -1, -1,
1.0, NULL,
&get_info().units.find(att_src)->second);
attack_enemy(attack_analysis->movements.front().second,
@@ -2269,11 +2269,11 @@
} else if(key == "turn")
{
- return variant(get_info().state.turn());
+ return variant(get_info().tod_manager_.turn());
} else if(key == "time_of_day")
{
- return variant(get_info().state.get_time_of_day().id);
+ return variant(get_info().tod_manager_.get_time_of_day().id);
} else if(key == "my_side")
{
Modified: trunk/src/mouse_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mouse_events.cpp?rev=36346&r1=36345&r2=36346&view=diff
==============================================================================
--- trunk/src/mouse_events.cpp (original)
+++ trunk/src/mouse_events.cpp Mon Jun 22 10:15:02 2009
@@ -583,7 +583,7 @@
for (i = 0; i < attacker->second.attacks().size(); i++) {
// skip weapons with attack_weight=0
if (attacker->second.attacks()[i].attack_weight() > 0) {
- battle_context bc(map_, teams_, units_, status_,
tod_manager_, attacker->first, defender->first, i);
+ battle_context bc(map_, teams_, units_, tod_manager_,
attacker->first, defender->first, i);
bc_vector.push_back(bc);
if (bc.better_attack(bc_vector[best], 0.5)) {
best = i;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
