Author: euschn
Date: Mon Jun 22 09:45:41 2009
New Revision: 36345
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36345&view=rev
Log:
removed gamestatus parameter from set_specials_context() and struct unit_type
Modified:
trunk/src/actions.cpp
trunk/src/actions.hpp
trunk/src/ai/default/contexts.cpp
trunk/src/attack_prediction_display.cpp
trunk/src/unit_abilities.cpp
trunk/src/unit_types.hpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=36345&r1=36344&r2=36345&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Mon Jun 22 09:45:41 2009
@@ -302,10 +302,10 @@
assert(!defender_stats_ && !attacker_combatant_ &&
!defender_combatant_);
attacker_stats_ = new unit_stats(attacker, attacker_loc,
attacker_weapon,
true, defender, defender_loc, ddef,
- units, teams, status, tod_mng, map);
+ units, teams, tod_mng, map);
defender_stats_ = new unit_stats(defender, defender_loc,
defender_weapon, false,
attacker, attacker_loc, adef,
- units, teams, status, tod_mng, map);
+ units, teams, tod_mng, map);
}
}
@@ -384,7 +384,7 @@
max_weight = def.defense_weight();
unit_stats *def_stats = new unit_stats(defender,
defender_loc, choices[i], false,
attacker, attacker_loc, &att,
- units, teams, status, tod_mng, map);
+ units, teams, tod_mng, map);
min_rating = static_cast<int>(def_stats->num_blows *
def_stats->damage *
def_stats->chance_to_hit *
def.defense_weight());
@@ -393,7 +393,7 @@
else if (def.defense_weight() == max_weight) {
unit_stats *def_stats = new unit_stats(defender,
defender_loc, choices[i], false,
attacker, attacker_loc, &att,
- units, teams, status, tod_mng, map);
+ units, teams, tod_mng, map);
int simple_rating =
static_cast<int>(def_stats->num_blows * def_stats->damage *
def_stats->chance_to_hit *
def.defense_weight());
@@ -408,10 +408,10 @@
const attack_type &def = defender.attacks()[choices[i]];
unit_stats *att_stats = new unit_stats(attacker, attacker_loc,
attacker_weapon,
true, defender, defender_loc, &def,
- units, teams, status, tod_mng, map);
+ units, teams, tod_mng, map);
unit_stats *def_stats = new unit_stats(defender, defender_loc,
choices[i], false,
attacker, attacker_loc, &att,
- units, teams, status, tod_mng, map);
+ units, teams, tod_mng, map);
combatant *att_comb = new combatant(*att_stats);
combatant *def_comb = new combatant(*def_stats, prev_def);
@@ -482,10 +482,10 @@
}
attacker_stats_ = new unit_stats(attacker,
attacker_loc, choices[i],
true, defender, defender_loc, def,
- units, teams, status, tod_mng, map);
+ units, teams, tod_mng, map);
defender_stats_ = new unit_stats(defender,
defender_loc, def_weapon, false,
attacker, attacker_loc, &att,
- units, teams, status, tod_mng, map);
+ units, teams, tod_mng, map);
attacker_combatant_ = new combatant(*attacker_stats_);
defender_combatant_ = new combatant(*defender_stats_,
prev_def);
attacker_combatant_->fight(*defender_combatant_);
@@ -584,7 +584,6 @@
const attack_type *opp_weapon,
const unit_map& units,
const std::vector<team>& teams,
- const gamestatus& status,
const tod_manager& tod_mng,
const gamemap& map) :
weapon(0),
@@ -640,9 +639,9 @@
// Get the weapon characteristics, if any.
if (weapon) {
- weapon->set_specials_context(*aloc, *dloc, &units, &map,
&status, &tod_mng, &teams, attacking, opp_weapon);
+ weapon->set_specials_context(*aloc, *dloc, &units, &map,
&tod_mng, &teams, attacking, opp_weapon);
if (opp_weapon)
- opp_weapon->set_specials_context(*aloc, *dloc, &units,
&map, &status, &tod_mng, &teams, !attacking, weapon);
+ opp_weapon->set_specials_context(*aloc, *dloc, &units,
&map, &tod_mng, &teams, !attacking, weapon);
slows = weapon->get_special_bool("slow");
drains = weapon->get_special_bool("drains") &&
!utils::string_bool(opp.get_state("not_living"));
petrifies = weapon->get_special_bool("petrifies");
Modified: trunk/src/actions.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.hpp?rev=36345&r1=36344&r2=36345&view=diff
==============================================================================
--- trunk/src/actions.hpp (original)
+++ trunk/src/actions.hpp Mon Jun 22 09:45:41 2009
@@ -109,7 +109,7 @@
const attack_type *opp_weapon,
const unit_map& units,
const std::vector<team>& teams,
- const gamestatus& status, const tod_manager&
tod_mng, const gamemap& map);
+ const tod_manager& tod_mng, const gamemap&
map);
~unit_stats();
/** Dumps the statistics of a unit on stdout. Remove it
eventually. */
Modified: trunk/src/ai/default/contexts.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/default/contexts.cpp?rev=36345&r1=36344&r2=36345&view=diff
==============================================================================
--- trunk/src/ai/default/contexts.cpp (original)
+++ trunk/src/ai/default/contexts.cpp Mon Jun 22 09:45:41 2009
@@ -267,7 +267,7 @@
std::vector<attack_type>& attacks = unit_itor->second.attacks();
for(std::vector<attack_type>::iterator a = attacks.begin(); a
!= attacks.end(); ++a) {
a->set_specials_context(map_location(),map_location(),
-
&units_,&map_,&get_info().state,&get_info().tod_manager_,&teams_,true,NULL);
+
&units_,&map_,&get_info().tod_manager_,&teams_,true,NULL);
if(a->get_special_bool("backstab")) {
backstab = true;
}
Modified: trunk/src/attack_prediction_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/attack_prediction_display.cpp?rev=36345&r1=36344&r2=36345&view=diff
==============================================================================
--- trunk/src/attack_prediction_display.cpp (original)
+++ trunk/src/attack_prediction_display.cpp Mon Jun 22 09:45:41 2009
@@ -162,7 +162,7 @@
// Set specials context (for safety, it should not have changed
normally).
const attack_type *weapon = stats.weapon;
- weapon->set_specials_context(u_loc, opp_loc, &units_, &map_,
&status_, &tod_manager_, &teams_, stats.is_attacker, opp_weapon);
+ weapon->set_specials_context(u_loc, opp_loc, &units_, &map_,
&tod_manager_, &teams_, stats.is_attacker, opp_weapon);
// Get damage modifiers.
unit_ability_list dmg_specials = weapon->get_specials("damage");
Modified: trunk/src/unit_abilities.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_abilities.cpp?rev=36345&r1=36344&r2=36345&view=diff
==============================================================================
--- trunk/src/unit_abilities.cpp (original)
+++ trunk/src/unit_abilities.cpp Mon Jun 22 09:45:41 2009
@@ -742,7 +742,7 @@
}
void attack_type::set_specials_context(const map_location& aloc,const
map_location& dloc,
const unit_map* unitmap,
- const gamemap* map,
const gamestatus* game_status, const tod_manager* tod_mng,
+ const gamemap* map,
const tod_manager* tod_mng,
const
std::vector<team>* teams, bool attacker,const attack_type* other_attack) const
{
aloc_ = aloc;
Modified: trunk/src/unit_types.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_types.hpp?rev=36345&r1=36344&r2=36345&view=diff
==============================================================================
--- trunk/src/unit_types.hpp (original)
+++ trunk/src/unit_types.hpp Mon Jun 22 09:45:41 2009
@@ -61,7 +61,7 @@
std::string weapon_specials(bool force=false) const;
void set_specials_context(const map_location& aloc,const map_location&
dloc,
const unit_map* unitmap,
- const gamemap* map,
const gamestatus* game_status, const tod_manager* tod_mng,
+ const gamemap* map,
const tod_manager* tod_mng,
const
std::vector<team>* teams,bool attacker,const attack_type* other_attack) const;
void set_specials_context(const map_location& loc,const map_location&
dloc, const unit& un, bool attacker =true) const;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
