Skip to content

Commit

Permalink
Editor/Map Context: removed get_units() functions in favor of display…
Browse files Browse the repository at this point in the history 
…_context overrides
  • Loading branch information
@Vultraz
Vultraz committed Jan 26, 2018
1 parent 0f8e25f commit 489dceb
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 35 deletions.
12 changes: 6 additions & 6 deletions src/editor/action/action_unit.cpp
View file
Expand Up @@ -40,16 +40,16 @@ editor_action* editor_action_unit::perform(map_context& mc) const

void editor_action_unit::perform_without_undo(map_context& mc) const
{
mc.get_units().add(loc_, u_);
mc.get_units().find(loc_)->set_location(loc_);
mc.units().add(loc_, u_);
mc.units().find(loc_)->set_location(loc_);
mc.add_changed_location(loc_);
}

IMPLEMENT_ACTION(unit_delete)

editor_action* editor_action_unit_delete::perform(map_context& mc) const
{
unit_map& units = mc.get_units();
unit_map& units = mc.units();
unit_map::const_unit_iterator unit_it = units.find(loc_);

editor_action_ptr undo;
Expand All @@ -64,7 +64,7 @@ editor_action* editor_action_unit_delete::perform(map_context& mc) const

void editor_action_unit_delete::perform_without_undo(map_context& mc) const
{
unit_map& units = mc.get_units();
unit_map& units = mc.units();
if(!units.erase(loc_)) {
ERR_ED << "Could not delete unit on " << loc_ << std::endl;
} else {
Expand All @@ -84,7 +84,7 @@ editor_action* editor_action_unit_replace::perform(map_context& mc) const

void editor_action_unit_replace::perform_without_undo(map_context& mc) const
{
unit_map& units = mc.get_units();
unit_map& units = mc.units();
units.move(loc_, new_loc_);
unit::clear_status_caches();

Expand Down Expand Up @@ -118,7 +118,7 @@ editor_action* editor_action_unit_facing::perform(map_context& mc) const

void editor_action_unit_facing::perform_without_undo(map_context& mc) const
{
unit_map& units = mc.get_units();
unit_map& units = mc.units();
unit_map::unit_iterator unit_it = units.find(loc_);

if(unit_it != units.end()) {
Expand Down
8 changes: 4 additions & 4 deletions src/editor/action/mouse/mouse_action_unit.cpp
View file
Expand Up @@ -152,7 +152,7 @@ editor_action* mouse_action_unit::click_right(editor_display& disp, int x, int y
start_hex_ = hex;
previous_move_hex_ = hex;
const unit_map& units = disp.get_units();
const unit_map& units = disp.units();
const unit_map::const_unit_iterator unit_it = units.find(start_hex_);
if (unit_it != units.end()) {
Expand All @@ -173,7 +173,7 @@ editor_action* mouse_action_unit::click_right(editor_display& disp, int x, int y
// click_ = (start_hex_ == hex);
// previous_move_hex_ = hex;
//
// const unit_map& units = disp.get_units();
// const unit_map& units = disp.units();
//
// const unit_map::const_unit_iterator unit_it = units.find(start_hex_);
// if (unit_it != units.end()) {
Expand All @@ -194,7 +194,7 @@ editor_action* mouse_action_unit::click_right(editor_display& disp, int x, int y
// if (!click_) return nullptr;
// click_ = false;
//
// const unit_map& units = disp.get_units();
// const unit_map& units = disp.units();
// const unit_map::const_unit_iterator unit_it = units.find(start_hex_);
// if (unit_it != units.end()) {
// return new editor_action_unit_delete(start_hex_);
Expand All @@ -213,7 +213,7 @@ editor_action* mouse_action_unit::click_right(editor_display& disp, int x, int y
//
// if(new_direction_ != old_direction_) {
//
// const unit_map& units = disp.get_units();
// const unit_map& units = disp.units();
// const unit_map::const_unit_iterator unit_it = units.find(start_hex_);
// if (unit_it != units.end()) {
// return new editor_action_unit_facing(start_hex_, new_direction_, old_direction_);
Expand Down
30 changes: 15 additions & 15 deletions src/editor/controller/editor_controller.cpp
View file
Expand Up @@ -286,7 +286,7 @@ bool editor_controller::can_execute_command(const hotkey::hotkey_command& cmd, i
return true; //general hotkeys we can always do

case hotkey::HOTKEY_UNIT_LIST:
return !get_current_map_context().get_units().empty();
return !get_current_map_context().units().empty();

case HOTKEY_STATUS_TABLE:
return !get_current_map_context().get_teams().empty();
Expand All @@ -306,7 +306,7 @@ bool editor_controller::can_execute_command(const hotkey::hotkey_command& cmd, i
case HOTKEY_UNIT_DESCRIPTION:
{
map_location loc = gui_->mouseover_hex();
const unit_map& units = get_current_map_context().get_units();
const unit_map& units = get_current_map_context().units();
return (toolkit_->is_mouse_action_set(HOTKEY_EDITOR_TOOL_UNIT) &&
units.find(loc) != units.end());
}
Expand Down Expand Up @@ -454,20 +454,20 @@ hotkey::ACTION_STATE editor_controller::get_action_state(hotkey::HOTKEY_COMMAND
case HOTKEY_EDITOR_UNIT_TOGGLE_LOYAL:
{
unit_map::const_unit_iterator un =
get_current_map_context().get_units().find(gui_->mouseover_hex());
get_current_map_context().units().find(gui_->mouseover_hex());
return un->loyal() ? ACTION_ON : ACTION_OFF;

}
case HOTKEY_EDITOR_UNIT_TOGGLE_CANRECRUIT:
{
unit_map::const_unit_iterator un =
get_current_map_context().get_units().find(gui_->mouseover_hex());
get_current_map_context().units().find(gui_->mouseover_hex());
return un->can_recruit() ? ACTION_ON : ACTION_OFF;
}
case HOTKEY_EDITOR_UNIT_TOGGLE_RENAMEABLE:
{
unit_map::const_unit_iterator un =
get_current_map_context().get_units().find(gui_->mouseover_hex());
get_current_map_context().units().find(gui_->mouseover_hex());
return (!un->unrenamable()) ? ACTION_ON : ACTION_OFF;
}
//TODO remove hardcoded hotkey names
Expand Down Expand Up @@ -573,8 +573,8 @@ hotkey::ACTION_STATE editor_controller::get_action_state(hotkey::HOTKEY_COMMAND
}
case editor::UNIT_FACING:
{
unit_map::const_unit_iterator un = get_current_map_context().get_units().find(gui_->mouseover_hex());
assert(un != get_current_map_context().get_units().end());
unit_map::const_unit_iterator un = get_current_map_context().units().find(gui_->mouseover_hex());
assert(un != get_current_map_context().units().end());
return un->facing() == index ? ACTION_SELECTED : ACTION_DESELECTED;
}
}
Expand Down Expand Up @@ -671,8 +671,8 @@ bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int i
}
case UNIT_FACING:
{
unit_map::unit_iterator un = get_current_map_context().get_units().find(gui_->mouseover_hex());
assert(un != get_current_map_context().get_units().end());
unit_map::unit_iterator un = get_current_map_context().units().find(gui_->mouseover_hex());
assert(un != get_current_map_context().units().end());
un->set_facing(map_location::DIRECTION(index));
un->anim_comp().set_standing();
return true;
Expand Down Expand Up @@ -766,7 +766,7 @@ bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int i
case HOTKEY_EDITOR_UNIT_RECRUIT_ASSIGN:
{
map_location loc = gui_->mouseover_hex();
const unit_map::unit_iterator un = get_current_map_context().get_units().find(loc);
const unit_map::unit_iterator un = get_current_map_context().units().find(loc);
const std::set<std::string>& recruit_set = toolkit_->get_palette_manager()->unit_palette_->get_selected_bg_items();
std::vector<std::string> recruits(recruit_set.begin(), recruit_set.end());
un->set_recruits(recruits);
Expand All @@ -775,15 +775,15 @@ bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int i
case HOTKEY_EDITOR_UNIT_TOGGLE_RENAMEABLE:
{
map_location loc = gui_->mouseover_hex();
const unit_map::unit_iterator un = get_current_map_context().get_units().find(loc);
const unit_map::unit_iterator un = get_current_map_context().units().find(loc);
bool unrenamable = un->unrenamable();
un->set_unrenamable(!unrenamable);
}
return true;
case HOTKEY_EDITOR_UNIT_TOGGLE_CANRECRUIT:
{
map_location loc = gui_->mouseover_hex();
const unit_map::unit_iterator un = get_current_map_context().get_units().find(loc);
const unit_map::unit_iterator un = get_current_map_context().units().find(loc);
bool canrecruit = un->can_recruit();
un->set_can_recruit(!canrecruit);
un->anim_comp().set_standing();
Expand Down Expand Up @@ -1113,7 +1113,7 @@ void editor_controller::toggle_grid()
void editor_controller::unit_description()
{
map_location loc = gui_->mouseover_hex();
const unit_map & units = get_current_map_context().get_units();
const unit_map & units = get_current_map_context().units();
const unit_map::const_unit_iterator un = units.find(loc);
if(un != units.end()) {
help::show_unit_help(un->type_id(), un->type().show_variations_in_help(), false);
Expand All @@ -1134,7 +1134,7 @@ void editor_controller::copy_selection()
void editor_controller::change_unit_id()
{
map_location loc = gui_->mouseover_hex();
unit_map& units = get_current_map_context().get_units();
unit_map& units = get_current_map_context().units();
const unit_map::unit_iterator& un = units.find(loc);

const std::string title(N_("Change Unit ID"));
Expand All @@ -1151,7 +1151,7 @@ void editor_controller::change_unit_id()
void editor_controller::rename_unit()
{
map_location loc = gui_->mouseover_hex();
unit_map& units = get_current_map_context().get_units();
unit_map& units = get_current_map_context().units();
const unit_map::unit_iterator& un = units.find(loc);

const std::string title(N_("Rename Unit"));
Expand Down
2 changes: 1 addition & 1 deletion src/editor/map/context_manager.cpp
View file
Expand Up @@ -87,7 +87,7 @@ class map_context_refresher

// TODO register the tod_manager with the gui?
resources::tod_manager = context_manager_.get_map_context().get_time_manager();
resources::units = &context_manager_.get_map_context().get_units();
resources::units = &context_manager_.get_map_context().units();
resources::filter_con = &context_manager_.gui();

context_manager_.gui().replace_overlay_map(&context_manager_.get_map_context().get_overlays());
Expand Down
9 changes: 0 additions & 9 deletions src/editor/map/map_context.hpp
View file
Expand Up @@ -126,15 +126,6 @@ class map_context : public display_context
return labels_;
}

/** Get the unit map from the current map context object */
unit_map& get_units() {
return units_;
}

const unit_map& get_units() const {
return units_;
}

void replace_schedule(const std::vector<time_of_day>& schedule);

/**
Expand Down

0 comments on commit 489dceb

Please sign in to comment.