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

Removed redundant parameters from dialogs::advance_unit.

Browse Source
This commit is contained in:
Guillaume Melquiond 2009-07-18 12:06:20 +00:00
parent 392ca2adaf
commit 941e519c06
9 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ai/actions.cpp
View File

@ -261,27 +261,25 @@ void attack_result::do_execute()
}
catch (end_level_exception&)
{
dialogs::advance_unit(get_info().map,get_info().units,attacker_loc_,get_info().disp,true);
dialogs::advance_unit(attacker_loc_, true);
const unit_map::const_iterator defender = get_info().units.find(defender_loc_);
if(defender != get_info().units.end()) {
const size_t defender_team = size_t(defender->second.side()) - 1;
if(defender_team < get_info().teams.size()) {
dialogs::advance_unit(get_info().map, get_info().units,
defender_loc_, get_info().disp, !get_info().teams[defender_team].is_human());
dialogs::advance_unit(defender_loc_, !get_info().teams[defender_team].is_human());
}
}
throw;
}
dialogs::advance_unit(get_info().map,get_info().units,attacker_loc_,get_info().disp,true);
dialogs::advance_unit(attacker_loc_, true);
const unit_map::const_iterator defender = get_info().units.find(defender_loc_);
if(defender != get_info().units.end()) {
const size_t defender_team = size_t(defender->second.side()) - 1;
if(defender_team < get_info().teams.size()) {
dialogs::advance_unit(get_info().map, get_info().units,
defender_loc_ , get_info().disp, !get_info().teams[defender_team].is_human());
dialogs::advance_unit(defender_loc_ , !get_info().teams[defender_team].is_human());
}
}

10
src/ai/contexts.cpp
View File

@ -550,27 +550,25 @@ void readwrite_context_impl::attack_enemy(const map_location u,
}
catch (end_level_exception&)
{
dialogs::advance_unit(get_info().map,get_info().units,u,get_info().disp,true);
dialogs::advance_unit(u, true);
const unit_map::const_iterator defender = get_info().units.find(target);
if(defender != get_info().units.end()) {
const size_t defender_team = size_t(defender->second.side()) - 1;
if(defender_team < get_info().teams.size()) {
dialogs::advance_unit(get_info().map, get_info().units,
target, get_info().disp, !get_info().teams[defender_team].is_human());
dialogs::advance_unit(target, !get_info().teams[defender_team].is_human());
}
}
throw;
}
dialogs::advance_unit(get_info().map,get_info().units,u,get_info().disp,true);
dialogs::advance_unit(u, true);
const unit_map::const_iterator defender = get_info().units.find(target);
if(defender != get_info().units.end()) {
const size_t defender_team = size_t(defender->second.side()) - 1;
if(defender_team < get_info().teams.size()) {
dialogs::advance_unit(get_info().map, get_info().units,
target, get_info().disp, !get_info().teams[defender_team].is_human());
dialogs::advance_unit(target, !get_info().teams[defender_team].is_human());
}
}

58
src/dialogs.cpp
View File

@ -34,6 +34,7 @@
#include "mouse_handler_base.hpp"
#include "minimap.hpp"
#include "replay.hpp"
#include "resources.hpp"
#include "savegame.hpp"
#include "thread.hpp"
#include "wml_separators.hpp"
@ -65,15 +66,10 @@ static lg::log_domain log_config("config");
namespace dialogs
{
void advance_unit(const gamemap& map,
unit_map& units,
map_location loc,
game_display& gui,
bool random_choice,
const bool add_replay_event)
void advance_unit(const map_location &loc, bool random_choice, bool add_replay_event)
{
unit_map::iterator u = units.find(loc);
if(u == units.end() || u->second.advances() == false)
unit_map::iterator u = resources::units->find(loc);
if (u == resources::units->end() || u->second.advances() == false)
return;
LOG_DP << "advance_unit: " << u->second.type_id() << "\n";
@ -84,7 +80,7 @@ void advance_unit(const gamemap& map,
std::vector<unit> sample_units;
for(std::vector<std::string>::const_iterator op = options.begin(); op != options.end(); ++op) {
sample_units.push_back(::get_advanced_unit(units,loc,*op));
sample_units.push_back(::get_advanced_unit(*resources::units, loc, *op));
const unit& type = sample_units.back();
#ifdef LOW_MEM
@ -99,7 +95,7 @@ void advance_unit(const gamemap& map,
foreach (const config &mod, u->second.get_modification_advances())
{
if (utils::string_bool(mod["always_display"])) always_display = true;
sample_units.push_back(::get_advanced_unit(units,loc,u->second.type_id()));
sample_units.push_back(::get_advanced_unit(*resources::units, loc, u->second.type_id()));
sample_units.back().add_modification("advance", mod);
const unit& type = sample_units.back();
if (!mod["image"].empty()) {
@ -123,11 +119,11 @@ void advance_unit(const gamemap& map,
res = rand()%lang_options.size();
} else if(lang_options.size() > 1 || always_display) {
units_list_preview_pane unit_preview(gui,&map,sample_units);
units_list_preview_pane unit_preview(*resources::screen, resources::game_map, sample_units);
std::vector<gui::preview_pane*> preview_panes;
preview_panes.push_back(&unit_preview);
gui::dialog advances = gui::dialog(gui,
gui::dialog advances = gui::dialog(*resources::screen,
_("Advance Unit"),
_("What should our victorious unit become?"),
gui::OK_ONLY);
@ -143,18 +139,18 @@ void advance_unit(const gamemap& map,
recorder.choose_option(res);
LOG_DP << "animating advancement...\n";
animate_unit_advancement(units,loc,gui,size_t(res));
animate_unit_advancement(loc, size_t(res));
// In some rare cases the unit can have enough XP to advance again,
// so try to do that.
// Make sure that we don't enter an infinite level loop.
u = units.find(loc);
if(u != units.end()) {
u = resources::units->find(loc);
if (u != resources::units->end()) {
// Level 10 unit gives 80 XP and the highest mainline is level 5
if(u->second.experience() < 81) {
// For all leveling up we have to add advancement to replay here because replay
// doesn't handle multi advancemnet
advance_unit(map, units, loc, gui, random_choice, true);
advance_unit(loc, random_choice, true);
} else {
ERR_CF << "Unit has an too high amount of " << u->second.experience()
<< " XP left, cascade leveling disabled\n";
@ -164,12 +160,12 @@ void advance_unit(const gamemap& map,
}
}
bool animate_unit_advancement(unit_map& units, map_location loc, game_display& gui, size_t choice)
bool animate_unit_advancement(const map_location &loc, size_t choice)
{
const events::command_disabler cmd_disabler;
unit_map::iterator u = units.find(loc);
if(u == units.end() || u->second.advances() == false) {
unit_map::iterator u = resources::units->find(loc);
if (u == resources::units->end() || u->second.advances() == false) {
return false;
}
@ -183,7 +179,7 @@ bool animate_unit_advancement(unit_map& units, map_location loc, game_display& g
// When the unit advances, it fades to white, and then switches
// to the new unit, then fades back to the normal colour
if(!gui.video().update_locked()) {
if (!resources::screen->video().update_locked()) {
unit_animator animator;
animator.add_animation(&u->second,"levelout",u->first);
animator.start_animations();
@ -192,7 +188,7 @@ bool animate_unit_advancement(unit_map& units, map_location loc, game_display& g
if(choice < options.size()) {
const std::string& chosen_unit = options[choice];
::advance_unit(units,loc,chosen_unit);
::advance_unit(*resources::units, loc, chosen_unit);
} else {
unit amla_unit(u->second);
const config &mod_option = mod_options[choice - options.size()];
@ -202,40 +198,40 @@ bool animate_unit_advancement(unit_map& units, map_location loc, game_display& g
amla_unit.get_experience(-amla_unit.max_experience()); // subtract xp required
amla_unit.add_modification("advance",mod_option);
units.replace(loc, amla_unit);
resources::units->replace(loc, amla_unit);
LOG_NG << "firing post_advance event (AMLA)\n";
game_events::fire("post_advance",loc);
}
u = units.find(loc);
gui.invalidate_unit();
u = resources::units->find(loc);
resources::screen->invalidate_unit();
if(u != units.end() && !gui.video().update_locked()) {
if (u != resources::units->end() && !resources::screen->video().update_locked()) {
unit_animator animator;
animator.add_animation(&u->second,"levelin",u->first);
animator.start_animations();
animator.wait_for_end();
animator.set_all_standing();
gui.invalidate(loc);
gui.draw();
resources::screen->invalidate(loc);
resources::screen->draw();
events::pump();
}
gui.invalidate_all();
gui.draw();
resources::screen->invalidate_all();
resources::screen->draw();
return true;
}
void show_objectives(game_display& disp, const config& level, const std::string& objectives)
void show_objectives(const config &level, const std::string &objectives)
{
static const std::string no_objectives(_("No objectives available"));
const std::string& name = level["name"];
std::string campaign_name = std::string(level["campaign"]);
replace_underbar2space(campaign_name);
gui2::show_transient_message(disp.video(),
gui2::show_transient_message(resources::screen->video(),
name + (campaign_name.empty() ? "" : "<small> - " + campaign_name + "</small>"),
(objectives.empty() ? no_objectives : objectives),
gui2::tcontrol::PANGO_MARKUP, gui2::tcontrol::PANGO_MARKUP);

7
src/dialogs.hpp
View File

@ -44,12 +44,11 @@ namespace dialogs {
* cause for advancement is different (eg unstore_unit) the add_replay_event
* should be set.
*/
void advance_unit(const gamemap& map,unit_map& units, map_location loc,
game_display& gui, bool random_choice=false, const bool add_replay_event=false);
void advance_unit(const map_location &loc, bool random_choice = false, bool add_replay_event = false);
bool animate_unit_advancement(unit_map& units, map_location loc, game_display& gui, size_t choice);
bool animate_unit_advancement(const map_location &loc, size_t choice);
void show_objectives(game_display& disp, const config& level, const std::string& objectives);
void show_objectives(const config &level, const std::string &objectives);
/**
* Allow user to select the game they want to load. Returns the name of the

2
src/game_events.cpp
View File

@ -2485,7 +2485,7 @@ WML_HANDLER_FUNCTION(unstore_unit, /*event_info*/, cfg)
&& (*resources::teams)[side-1].is_human());
// The code in dialogs::advance_unit tests whether the unit can advance
dialogs::advance_unit(*resources::game_map, *resources::units, loc, *resources::screen, !sel, true);
dialogs::advance_unit(loc, !sel, true);
}
} else {

4
src/menu_events.cpp
View File

@ -169,7 +169,7 @@ namespace events{
game_events::queued_event("_from_interface", map_location(),
map_location(), config()), vconfig(cfg));
team &current_team = teams_[side_num - 1];
dialogs::show_objectives(*gui_, level_, current_team.objectives());
dialogs::show_objectives(level_, current_team.objectives());
current_team.reset_objectives_changed();
}
@ -3006,7 +3006,7 @@ private:
int int_value = lexical_cast<int>(value);
for (int levels=0; levels<int_value; levels++) {
i->second.get_experience( i->second.max_experience() - i->second.experience() );
dialogs::advance_unit(menu_handler_.map_, menu_handler_.units_,i->first,*menu_handler_.gui_);
dialogs::advance_unit(i->first);
}
} else {
config cfg;

8
src/mouse_events.cpp
View File

@ -679,20 +679,20 @@ bool mouse_handler::attack_enemy_(unit_map::iterator attacker, unit_map::iterato
} catch(end_level_exception&) {
//if the level ends due to a unit being killed, still see if
//either the attacker or defender should advance
dialogs::advance_unit(map_,units_,attacker_loc,gui());
dialogs::advance_unit(attacker_loc);
unit_map::const_iterator defu = units_.find(defender_loc);
if (defu != units_.end()) {
bool defender_human = teams_[defu->second.side()-1].is_human();
dialogs::advance_unit(map_,units_,defender_loc,gui(),!defender_human);
dialogs::advance_unit(defender_loc, !defender_human);
}
throw;
}
dialogs::advance_unit(map_,units_,attacker_loc,gui());
dialogs::advance_unit(attacker_loc);
unit_map::const_iterator defu = units_.find(defender_loc);
if (defu != units_.end()) {
bool defender_human = teams_[defu->second.side()-1].is_human();
dialogs::advance_unit(map_,units_,defender_loc,gui(),!defender_human);
dialogs::advance_unit(defender_loc, !defender_human);
}
check_victory(units_, teams_, gui());

2
src/play_controller.cpp
View File

@ -800,7 +800,7 @@ void play_controller::slice_before_scroll() {
void play_controller::slice_end() {
if(!browse_ && teams_[gui_->viewing_team()].objectives_changed()) {
dialogs::show_objectives(*gui_, level_, teams_[gui_->viewing_team()].objectives());
dialogs::show_objectives(level_, teams_[gui_->viewing_team()].objectives());
teams_[gui_->viewing_team()].reset_objectives_changed();
}
}

2
src/replay.cpp
View File

@ -799,7 +799,7 @@ bool do_replay_handle(game_display& disp, const gamemap& map,
const int val = lexical_cast_default<int>(child["value"]);
dialogs::animate_unit_advancement(units,advancing_units.front(),disp,val);
dialogs::animate_unit_advancement(advancing_units.front(), val);
advancing_units.pop_front();