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

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) bool context_manager::is_active_transitions_hotkey(const std::string& item)
{ {
switch (auto_update_transitions_) { switch (auto_update_transitions_) {
case preferences::editor::TransitionUpdateMode::on: case preferences::editor::TRANSITION_UPDATE_ON:
return (item == "editor-auto-update-transitions"); return (item == "editor-auto-update-transitions");
case preferences::editor::TransitionUpdateMode::partial: case preferences::editor::TRANSITION_UPDATE_PARTIAL:
return (item == "editor-partial-update-transitions"); return (item == "editor-partial-update-transitions");
case preferences::editor::TransitionUpdateMode::off: case preferences::editor::TRANSITION_UPDATE_OFF:
return (item == "editor-no-update-transitions"); 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() 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_); 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; 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(); const std::set<map_location>& changed_locs = get_map_context().changed_locations();
if(get_map_context().needs_terrain_rebuild()) { if(get_map_context().needs_terrain_rebuild()) {
if((auto_update_transitions_ == preferences::editor::TransitionUpdateMode::on) if((auto_update_transitions_ == preferences::editor::TRANSITION_UPDATE_ON)
|| ((auto_update_transitions_ == preferences::editor::TransitionUpdateMode::partial) || ((auto_update_transitions_ == preferences::editor::TRANSITION_UPDATE_PARTIAL)
&& (!drag_part || get_map_context().everything_changed()))) && (!drag_part || get_map_context().everything_changed())))
{ {
gui_.rebuild_all(); gui_.rebuild_all();

2
src/preferences/editor.cpp
View File

@ -22,7 +22,7 @@ namespace preferences {
namespace editor { namespace editor {
int auto_update_transitions() { 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) { void set_auto_update_transitions(int value) {

12
src/preferences/editor.hpp
View File

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