Skip to content

Commit

Permalink
(cosmetic) fix code tabs
Browse files Browse the repository at this point in the history
Codeblocks made some of my tabs into spaces and I had to fix it.
Also, forgot to mention this before, but I cleaned up some of the code
for astarsearch.cpp as well.
  • Loading branch information
Rift-Walker committed Mar 20, 2014
1 parent 5eee20b commit efec473
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/config_cache.cpp
Expand Up @@ -371,7 +371,7 @@ namespace game_config {
{
if(active_map_.empty())
{
active_map_.insert(defines_map.begin(), defines_map.end());
active_map_.insert(defines_map.begin(), defines_map.end());
if ( get_state() == NEW)
state_ = ACTIVE;
}
Expand Down
6 changes: 3 additions & 3 deletions src/game_preferences.cpp
Expand Up @@ -105,10 +105,10 @@ manager::manager() :
}

const std::vector<std::string> v (utils::split(preferences::get("encountered_units")));
encountered_units_set.insert(v.begin(), v.end());
encountered_units_set.insert(v.begin(), v.end());

const t_translation::t_list terrain (t_translation::read_list(preferences::get("encountered_terrain_list")));
encountered_terrains_set.insert(terrain.begin(), terrain.end());
encountered_terrains_set.insert(terrain.begin(), terrain.end());

if (const config &history = preferences::get_child("history"))
{
Expand Down Expand Up @@ -1047,7 +1047,7 @@ void encounter_recruitable_units(std::vector<team>& teams){
for (std::vector<team>::iterator help_team_it = teams.begin();
help_team_it != teams.end(); ++help_team_it) {
help_team_it->log_recruitable();
encountered_units_set.insert(help_team_it->recruits().begin(), help_team_it->recruits().end());
encountered_units_set.insert(help_team_it->recruits().begin(), help_team_it->recruits().end());
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/help.cpp
Expand Up @@ -999,10 +999,10 @@ void parse_config_internal(const config *help_cfg, const config *section_cfg,
,std::back_inserter(sec.topics),title_less());
}
else {
sec.topics.insert(sec.topics.end(),
topics.begin(), topics.end());
sec.topics.insert(sec.topics.end(),
generated_topics.begin(), generated_topics.end());
sec.topics.insert(sec.topics.end(),
topics.begin(), topics.end());
sec.topics.insert(sec.topics.end(),
generated_topics.begin(), generated_topics.end());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/multiplayer_create.cpp
Expand Up @@ -516,7 +516,7 @@ std::string create::select_campaign_difficulty()
if(!difficulties.empty()) {
int difficulty = 0;
if(difficulty_options.size() != difficulties.size()) {
difficulty_options = difficulties;
difficulty_options = difficulties;
}

gui2::tcampaign_difficulty dlg(difficulty_options);
Expand Down
2 changes: 1 addition & 1 deletion src/sdl_utils.cpp
Expand Up @@ -257,7 +257,7 @@ surface stretch_surface_horizontal(
surface dst(create_neutral_surface(w, surf->h));

surface src(make_neutral_surface(surf));
// Now both surfacedvances fires when the advancement path is already chosen, which in partics are always in the "neutral" pixel format
// Now both surfaces are always in the "neutral" pixel format

if(src == NULL || dst == NULL) {
std::cerr << "Could not create surface to scale onto\n";
Expand Down
2 changes: 1 addition & 1 deletion src/terrain_filter.cpp
Expand Up @@ -634,7 +634,7 @@ void terrain_filter::get_locations(std::set<map_location>& locs, bool with_borde
get_tiles_radius(*resources::game_map, xy_vector, radius, locs, with_border);
}
} else {
locs.insert(match_set.begin(), match_set.end());
locs.insert(match_set.begin(), match_set.end());
}
}

Expand Down

0 comments on commit efec473

Please sign in to comment.