0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

the result of the parameter str_to_terrain was unused so removed it

Browse source 
part 1 of the terrain.id removal
This commit is contained in:
Mark de Wever 2007-02-08 19:59:45 +00:00
parent a5041e75ce
commit 0bf6de05b1
4 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/map.cpp
View file

@ -261,8 +261,8 @@ gamemap::location::DIRECTION gamemap::location::get_opposite_dir(gamemap::locati
gamemap::gamemap(const config& cfg, const std::string& data) : tiles_(1)
{
LOG_G << "loading map: '" << data << "'\n";
const config::child_list& terrains = cfg.get_children("terrain");
create_terrain_maps(terrains,terrainList_,letterToTerrain_,terrain_);
const config::child_list& terrains = cfg.get_children("terrain");
create_terrain_maps(terrains,terrainList_,letterToTerrain_);
read(data);
}

2
src/map.hpp
View file

@ -211,8 +211,6 @@ private:
t_translation::t_list terrainList_;
std::map<t_translation::t_letter, terrain_type> letterToTerrain_;
std::map<std::string,terrain_type> terrain_;
std::vector<location> villages_;
mutable std::map<location, t_translation::t_letter> borderCache_;

6
src/terrain.cpp
View file

@ -208,8 +208,7 @@ bool terrain_type::is_keep() const
void create_terrain_maps(const std::vector<config*>& cfgs,
t_translation::t_list& terrain_list,
std::map<t_translation::t_letter, terrain_type>& letter_to_terrain,
std::map<std::string, terrain_type>& str_to_terrain)
std::map<t_translation::t_letter, terrain_type>& letter_to_terrain)
{
for(std::vector<config*>::const_iterator i = cfgs.begin();
i != cfgs.end(); ++i) {
@ -217,8 +216,5 @@ void create_terrain_maps(const std::vector<config*>& cfgs,
terrain_list.push_back(terrain.number());
letter_to_terrain.insert(std::pair<t_translation::t_letter, terrain_type>(
terrain.number(),terrain));
str_to_terrain.insert(std::pair<std::string,terrain_type>(
terrain.id(),terrain));
}
}

3
src/terrain.hpp
View file

@ -88,6 +88,5 @@ private:
void create_terrain_maps(const std::vector<config*>& cfgs,
t_translation::t_list& terrain_list,
std::map<t_translation::t_letter, terrain_type>& letter_to_terrain,
std::map<std::string, terrain_type>& str_to_terrain);
std::map<t_translation::t_letter, terrain_type>& letter_to_terrain);
#endif