← Back to branch summary

~widelands-dev/widelands/unify-program-parsers

« back to all changes in this revision

Viewing changes to src/logic/map_objects/tribes/production_program.cc

  • Committer: GunChleoc
  • Date: 2019-05-26 10:03:40 UTC
  • Revision ID: fios@foramnagaidhlig.net-20190526100340-ca6h05fep5m1g33y
Some more code style tweaks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/logic/map_objects/tribes/production_program.cc
936
936
        chance_ = read_positive(arguments.at(3));
937
937
        training_ = read_positive(arguments.at(4));
938
938
 
939
 
        const std::string description = (boost::format("%s %s mine %s") % descr->name() %
940
 
                                                           production_program_name % world.get_resource(resource_)->name())
941
 
                                                                 .str();
 
939
        const std::string description = descr->name() + " " +
 
940
                                                           production_program_name + " mine " +  world.get_resource(resource_)->name();
942
941
        descr->workarea_info_[distance_].insert(description);
943
942
}
944
943
 
1129
1128
        const SoldierControl* ctrl = ps.soldier_control();
1130
1129
        const std::vector<Soldier*> soldiers = ctrl->present_soldiers();
1131
1130
        const std::vector<Soldier*>::const_iterator soldiers_end = soldiers.end();
1132
 
        std::vector<Soldier*>::const_iterator it = soldiers.begin();
1133
1131
 
1134
1132
        ps.molog("  Training soldier's %u (%d to %d)", static_cast<unsigned int>(attribute_),
1135
1133
                 static_cast<unsigned int>(level_), static_cast<unsigned int>(target_level_));
1136
1134
 
1137
1135
        bool training_done = false;
1138
 
        for (; !training_done; ++it) {
 
1136
        for (auto it = soldiers.begin(); !training_done; ++it) {
1139
1137
                if (it == soldiers_end) {
1140
1138
                        ps.set_production_result(_("No soldier found for this training level!"));
1141
1139
                        return ps.program_end(game, ProgramResult::kSkipped);