Author: euschn
Date: Mon Jun 22 13:32:52 2009
New Revision: 36348
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36348&view=rev
Log:
removed unused gamestatus parameter from unit ctors
Modified:
trunk/src/actions.cpp
trunk/src/ai/actions.cpp
trunk/src/ai/contexts.cpp
trunk/src/ai/default/ai.cpp
trunk/src/game_events.cpp
trunk/src/gamestatus.cpp
trunk/src/menu_events.cpp
trunk/src/replay.cpp
trunk/src/unit.cpp
trunk/src/unit.hpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=36348&r1=36347&r2=36348&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Mon Jun 22 13:32:52 2009
@@ -1220,7 +1220,7 @@
reanimitor =
unit_type_data::types().find_unit_type(a_stats_->plague_type);
LOG_NG << "found unit type:" <<
reanimitor->second.id() << std::endl;
if(reanimitor !=
unit_type_data::types().end()) {
- unit newunit(&units_, &map_,
&state_, &tod_manager_, &teams_, &reanimitor->second,
+ unit newunit(&units_, &map_,
&tod_manager_, &teams_, &reanimitor->second,
a_.get_unit().side(), true, true);
newunit.set_attacks(0);
// Apply variation
@@ -1491,7 +1491,7 @@
reanimitor =
unit_type_data::types().find_unit_type(d_stats_->plague_type);
LOG_NG << "found unit type:" <<
reanimitor->second.id() << std::endl;
if(reanimitor !=
unit_type_data::types().end()) {
- unit newunit(&units_, &map_,
&state_, &tod_manager_, &teams_, &reanimitor->second,
+ unit newunit(&units_, &map_,
&tod_manager_, &teams_, &reanimitor->second,
d_.get_unit().side(), true, true);
// Apply variation
if(strcmp(undead_variation.c_str(),"null")){
Modified: trunk/src/ai/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/actions.cpp?rev=36348&r1=36347&r2=36348&view=diff
==============================================================================
--- trunk/src/ai/actions.cpp (original)
+++ trunk/src/ai/actions.cpp Mon Jun 22 13:32:52 2009
@@ -640,7 +640,7 @@
recorder.add_recruit(num_,recruit_location_);
replay_undo replay_guard(recorder);
unit_type_data::unit_type_map::const_iterator u =
unit_type_data::types().find_unit_type(unit_name_);
- unit
new_unit(&info.units,&info.map,&info.state,&info.tod_manager_,&info.teams,&u->second,get_side(),true);
+ unit
new_unit(&info.units,&info.map,&info.tod_manager_,&info.teams,&u->second,get_side(),true);
std::string recruit_err =
recruit_unit(info.map,get_side(),info.units,new_unit,recruit_location_,false,preferences::show_ai_moves());
if(recruit_err.empty()) {
statistics::recruit_unit(new_unit);
Modified: trunk/src/ai/contexts.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/contexts.cpp?rev=36348&r1=36347&r2=36348&view=diff
==============================================================================
--- trunk/src/ai/contexts.cpp (original)
+++ trunk/src/ai/contexts.cpp Mon Jun 22 13:32:52 2009
@@ -173,7 +173,7 @@
" gold=" << (current_team().gold()) <<
" (-> " << (current_team().gold()-u->second.cost()) << ")\n";
- unit
new_unit(&get_info().units,&get_info().map,&get_info().state,&get_info().tod_manager_,&get_info().teams,&u->second,get_side(),true);
+ unit
new_unit(&get_info().units,&get_info().map,&get_info().tod_manager_,&get_info().teams,&u->second,get_side(),true);
// See if we can actually recruit (i.e. have enough room etc.)
std::string recruit_err =
recruit_unit(get_info().map,get_side(),get_info().units,new_unit,loc,false,preferences::show_ai_moves());
Modified: trunk/src/ai/default/ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/default/ai.cpp?rev=36348&r1=36347&r2=36348&view=diff
==============================================================================
--- trunk/src/ai/default/ai.cpp (original)
+++ trunk/src/ai/default/ai.cpp Mon Jun 22 13:32:52 2009
@@ -1402,7 +1402,7 @@
}
const unit temp_unit(&get_info().units,&get_info().map,
- &get_info().state, &get_info().tod_manager_,
&get_info().teams, &info->second, get_side());
+ &get_info().tod_manager_, &get_info().teams,
&info->second, get_side());
// since we now use the ignore_units switch, no need to use a
empty unit_map
// unit_map units;
// const temporary_unit_placer placer(units,start,temp_unit);
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=36348&r1=36347&r2=36348&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Mon Jun 22 13:32:52 2009
@@ -1074,7 +1074,7 @@
const unit_race::GENDER gender = string_gender(cfg["gender"]);
const unit_type_data::unit_type_map::const_iterator itor =
unit_type_data::types().find_unit_type(type);
if(itor != unit_type_data::types().end()) {
- unit dummy_unit(rsrc.units, rsrc.game_map,
rsrc.status_ptr, &rsrc.controller->get_tod_manager(), rsrc.teams,
&itor->second, side_num + 1, false, true, gender, variation);
+ unit dummy_unit(rsrc.units, rsrc.game_map,
&rsrc.controller->get_tod_manager(), rsrc.teams, &itor->second, side_num + 1,
false, true, gender, variation);
const std::vector<std::string> xvals = utils::split(x);
const std::vector<std::string> yvals = utils::split(y);
std::vector<map_location> path;
@@ -1998,7 +1998,7 @@
const game_events::resources_t &rsrc = *game_events::resources;
const config& parsed_cfg = cfg.get_parsed_config();
- unit new_unit(rsrc.units, rsrc.game_map, rsrc.status_ptr,
&rsrc.controller->get_tod_manager(), rsrc.teams, parsed_cfg, true,
rsrc.state_of_game);
+ unit new_unit(rsrc.units, rsrc.game_map,
&rsrc.controller->get_tod_manager(), rsrc.teams, parsed_cfg, true,
rsrc.state_of_game);
if(cfg.has_attribute("to_variable")) {
config &var =
rsrc.state_of_game->get_variable_cfg(parsed_cfg["to_variable"]);
new_unit.write(var);
@@ -2496,7 +2496,7 @@
const config &var =
rsrc.state_of_game->get_variable_cfg(cfg["variable"]);
try {
- const unit u(rsrc.units, rsrc.game_map, rsrc.status_ptr,
&rsrc.controller->get_tod_manager(), rsrc. teams, var, false);
+ const unit u(rsrc.units, rsrc.game_map,
&rsrc.controller->get_tod_manager(), rsrc. teams, var, false);
preferences::encountered_units().insert(u.type_id());
map_location loc = cfg_to_loc(
Modified: trunk/src/gamestatus.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gamestatus.cpp?rev=36348&r1=36347&r2=36348&view=diff
==============================================================================
--- trunk/src/gamestatus.cpp (original)
+++ trunk/src/gamestatus.cpp Mon Jun 22 13:32:52 2009
@@ -953,7 +953,7 @@
// If this side tag describes the leader of the side
if(!utils::string_bool(cfg["no_leader"]) && cfg["controller"] !=
"null") {
- unit new_unit(&units, &map, &game_status, &tod_mng, &teams,
cfg, true);
+ unit new_unit(&units, &map, &tod_mng, &teams, cfg, true);
// Search the recall list for leader units, and if there is one,
// use it in place of the config-described unit
@@ -1018,7 +1018,7 @@
player->available_units.clear();
}
for(config::child_list::const_iterator su = starting_units.begin(); su
!= starting_units.end(); ++su) {
- unit new_unit(&units, &map, &game_status, &tod_mng,
&teams,**su,true);
+ unit new_unit(&units, &map, &tod_mng, &teams,**su,true);
new_unit.set_side(side);
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=36348&r1=36347&r2=36348&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Mon Jun 22 13:32:52 2009
@@ -781,7 +781,7 @@
//create a unit with traits
recorder.add_recruit(recruit_num, last_hex);
- unit new_unit(&units_, &map_, &status_, &tod_manager_,
&teams_, &u_type->second, side_num, true);
+ unit new_unit(&units_, &map_, &tod_manager_, &teams_,
&u_type->second, side_num, true);
map_location loc = last_hex;
const std::string &msg = recruit_unit(map_, side_num,
units_,
new_unit, loc, false, gui_);
@@ -1441,7 +1441,7 @@
const unit_race::GENDER gender =
(!genders.empty() ?
genders[gamestate_.rng().get_random() % genders.size()] : unit_race::MALE);
- unit
chosen(&units_,&map_,&status_,&tod_manager_,&teams_,unit_choices[choice],1,false,false,gender,"",random_gender);
+ unit
chosen(&units_,&map_,&tod_manager_,&teams_,unit_choices[choice],1,false,false,gender,"",random_gender);
chosen.new_turn();
const map_location& loc = mousehandler.get_last_hex();
@@ -2959,7 +2959,7 @@
config cfg;
i->second.write(cfg);
cfg[name] = value;
- i->second =
unit(&menu_handler_.units_,&menu_handler_.map_,&menu_handler_.status_,&menu_handler_.tod_manager_,&menu_handler_.teams_,cfg);
+ i->second =
unit(&menu_handler_.units_,&menu_handler_.map_,&menu_handler_.tod_manager_,&menu_handler_.teams_,cfg);
}
menu_handler_.gui_->invalidate(i->first);
menu_handler_.gui_->invalidate_unit();
@@ -3006,7 +3006,7 @@
menu_handler_.units_.erase(loc);
menu_handler_.units_.add(loc,
- unit(&menu_handler_.units_,
&menu_handler_.map_, &menu_handler_.status_, &menu_handler_.tod_manager_,
+ unit(&menu_handler_.units_,
&menu_handler_.map_, &menu_handler_.tod_manager_,
&menu_handler_.teams_, &i->second, 1,
false));
menu_handler_.gui_->invalidate(loc);
menu_handler_.gui_->invalidate_unit();
Modified: trunk/src/replay.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/replay.cpp?rev=36348&r1=36347&r2=36348&view=diff
==============================================================================
--- trunk/src/replay.cpp (original)
+++ trunk/src/replay.cpp Mon Jun 22 13:32:52 2009
@@ -929,7 +929,7 @@
replay::throw_error(errbuf.str());
}
- unit
new_unit(&units,&map,&state,&tod_mng,&teams,&(u_type->second),team_num,true,
false);
+ unit
new_unit(&units,&map,&tod_mng,&teams,&(u_type->second),team_num,true, false);
const std::string& res =
recruit_unit(map,team_num,units,new_unit,loc,false,!get_replay_source().is_skipping());
if(!res.empty()) {
std::stringstream errbuf;
Modified: trunk/src/unit.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.cpp?rev=36348&r1=36347&r2=36348&view=diff
==============================================================================
--- trunk/src/unit.cpp (original)
+++ trunk/src/unit.cpp Mon Jun 22 13:32:52 2009
@@ -168,7 +168,7 @@
{
}
-unit::unit(unit_map* unitmap, const gamemap* map, const gamestatus*
game_status, const tod_manager* tod_mng,
+unit::unit(unit_map* unitmap, const gamemap* map, const tod_manager* tod_mng,
const std::vector<team>* teams,const config& cfg,
bool use_traits, game_state* state) :
cfg_(),
@@ -358,7 +358,7 @@
}
}
-unit::unit(unit_map* unitmap, const gamemap* map, const gamestatus*
game_status, const tod_manager* tod_mng,
+unit::unit(unit_map* unitmap, const gamemap* map, const tod_manager* tod_mng,
const std::vector<team>* teams, const unit_type* t, int side,
bool use_traits, bool dummy_unit, unit_race::GENDER gender,
std::string variation, bool force_gender) :
cfg_(),
Modified: trunk/src/unit.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.hpp?rev=36348&r1=36347&r2=36348&view=diff
==============================================================================
--- trunk/src/unit.hpp (original)
+++ trunk/src/unit.hpp Mon Jun 22 13:32:52 2009
@@ -69,11 +69,11 @@
/** Initilizes a unit from a config */
unit(const config& cfg, bool use_traits=false);
unit(unit_map* unitmap, const gamemap* map,
- const gamestatus* game_status, const tod_manager* tod_mng,
const std::vector<team>* teams,
+ const tod_manager* tod_mng, const std::vector<team>* teams,
const config& cfg, bool use_traits=false, game_state* state =
0);
/** Initializes a unit from a unit type */
unit(const unit_type* t, int side, bool use_traits=false, bool
dummy_unit=false, unit_race::GENDER gender=unit_race::MALE, std::string
variation="");
- unit(unit_map* unitmap, const gamemap* map, const gamestatus*
game_status, const tod_manager* tod_mng, const std::vector<team>* teams, const
unit_type* t, int side, bool use_traits=false, bool dummy_unit=false,
unit_race::GENDER gender=unit_race::MALE, std::string variation="", bool
force_gender=false);
+ unit(unit_map* unitmap, const gamemap* map, const tod_manager* tod_mng,
const std::vector<team>* teams, const unit_type* t, int side, bool
use_traits=false, bool dummy_unit=false, unit_race::GENDER
gender=unit_race::MALE, std::string variation="", bool force_gender=false);
virtual ~unit();
unit& operator=(const unit&);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
