upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 01:52:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unused variable.

Browse Source
This commit is contained in:
gfgtdf 2014-07-09 17:32:42 +02:00
parent 9cfb37664f
commit 459630a67b
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/game_data.cpp
View File

@ -202,10 +202,9 @@ void game_data::write_config(config_writer& out){
team_builder_ptr game_data::create_team_builder(const config& side_cfg,
std::string save_id, std::vector<team>& teams,
const config& level, gamemap& map, unit_map& units,
const config& starting_pos)
const config& level, gamemap& map, unit_map& units)
{
return team_builder_ptr(new team_builder(side_cfg, save_id, teams, level, map, units, *this, starting_pos));
return team_builder_ptr(new team_builder(side_cfg, save_id, teams, level, map, units, *this));
}
void game_data::build_team_stage_one(team_builder_ptr tb_ptr)

2
src/game_data.hpp
View File

@ -99,7 +99,7 @@ public:
//create an object responsible for creating and populating a team from a config
team_builder_ptr create_team_builder(const config& side_cfg, std::string save_id
, std::vector<team>& teams, const config& level, gamemap& map
, unit_map& units, const config& starting_pos);
, unit_map& units);
//do first stage of team initialization (everything except unit placement)
void build_team_stage_one(team_builder_ptr tb_ptr);

4
src/game_state.cpp
View File

@ -134,7 +134,7 @@ static std::string get_unique_saveid(const config& cfg, std::set<std::string>& s
return save_id;
}
void game_state::init(const int ticks, const config & replay_start)
void game_state::init(const int ticks)
{
if (level_["modify_placing"].to_bool()) {
LOG_NG << "modifying placing..." << std::endl;
@ -170,7 +170,7 @@ void game_state::init(const int ticks, const config & replay_start)
}
}
team_builder_ptr tb_ptr = gamedata_.create_team_builder(side,
save_id, board_.teams_, level_, *board_.map_, board_.units_, replay_start);
save_id, board_.teams_, level_, *board_.map_, board_.units_);
++team_num;
gamedata_.build_team_stage_one(tb_ptr);
team_builders.push_back(tb_ptr);

2
src/game_state.hpp
View File

@ -43,7 +43,7 @@ public:
void place_sides_in_preferred_locations();
void init(int ticks, const config & replay_start);
void init(int ticks);
config to_config() const;

2
src/play_controller.cpp
View File

@ -192,7 +192,7 @@ void play_controller::init(CVideo& video){
events_manager_.reset(new game_events::manager(level_));
LOG_NG << "initializing game_state..." << (SDL_GetTicks() - ticks_) << std::endl;
gamestate_.init(ticks_, saved_game_.replay_start());
gamestate_.init(ticks_);
resources::tunnels = gamestate_.pathfind_manager_.get();
// mouse_handler expects at least one team for linger mode to work.