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

Editor: handle transition update values with an enum

Browse source 
Instead of this weird fake enum.
This commit is contained in:
Charles Dang 2018-02-06 03:21:19 +11:00
parent 574fd0ec4b
commit 6eb7e700ee
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/editor/map/context_manager.cpp
View file

@ -134,11 +134,11 @@ void context_manager::reload_map()
bool context_manager::is_active_transitions_hotkey(const std::string& item)
{
switch (auto_update_transitions_) {
case preferences::editor::TransitionUpdateMode::on:
case preferences::editor::TRANSITION_UPDATE_ON:
return (item == "editor-auto-update-transitions");
case preferences::editor::TransitionUpdateMode::partial:
case preferences::editor::TRANSITION_UPDATE_PARTIAL:
return (item == "editor-partial-update-transitions");
case preferences::editor::TransitionUpdateMode::off:
case preferences::editor::TRANSITION_UPDATE_OFF:
return (item == "editor-no-update-transitions");
}
@ -147,10 +147,10 @@ bool context_manager::is_active_transitions_hotkey(const std::string& item)
bool context_manager::toggle_update_transitions()
{
auto_update_transitions_ = (auto_update_transitions_ + 1) % preferences::editor::TransitionUpdateMode::count;
auto_update_transitions_ = (auto_update_transitions_ + 1) % preferences::editor::TRANSITION_UPDATE_COUNT;
preferences::editor::set_auto_update_transitions(auto_update_transitions_);
if(auto_update_transitions_ != preferences::editor::TransitionUpdateMode::on) {
if(auto_update_transitions_ != preferences::editor::TRANSITION_UPDATE_ON) {
return true;
}
@ -521,8 +521,8 @@ void context_manager::refresh_after_action(bool drag_part)
const std::set<map_location>& changed_locs = get_map_context().changed_locations();
if(get_map_context().needs_terrain_rebuild()) {
if((auto_update_transitions_ == preferences::editor::TransitionUpdateMode::on)
|| ((auto_update_transitions_ == preferences::editor::TransitionUpdateMode::partial)
if((auto_update_transitions_ == preferences::editor::TRANSITION_UPDATE_ON)
|| ((auto_update_transitions_ == preferences::editor::TRANSITION_UPDATE_PARTIAL)
&& (!drag_part || get_map_context().everything_changed())))
{
gui_.rebuild_all();

2
src/preferences/editor.cpp
View file

@ -22,7 +22,7 @@ namespace preferences {
namespace editor {
int auto_update_transitions() {
return lexical_cast_default<int>(preferences::get("editor_auto_update_transitions"), TransitionUpdateMode::partial);
return lexical_cast_default<int>(preferences::get("editor_auto_update_transitions"), TRANSITION_UPDATE_PARTIAL);
}
void set_auto_update_transitions(int value) {

12
src/preferences/editor.hpp
View file

@ -21,12 +21,12 @@ namespace preferences {
namespace editor {
namespace TransitionUpdateMode {
const int off = 0;
const int on = 1;
const int partial = 2;
const int count = 3;
}
enum TRANSITION_UPDATE_MODE : int {
TRANSITION_UPDATE_OFF = 0,
TRANSITION_UPDATE_ON = 1,
TRANSITION_UPDATE_PARTIAL = 2,
TRANSITION_UPDATE_COUNT = 3
};
int auto_update_transitions();
void set_auto_update_transitions(int value);