natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor ambigous variable name

Browse Source
This commit is contained in:
Skarn
2020-10-21 09:59:51 +03:00
parent 7bd3f4d698
commit 35a60cbff5
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/noggit/MapView.cpp
View File

@@ -1011,7 +1011,7 @@ void MapView::createGUI()
ADD_ACTION (view_menu, "Decrease camera speed", Qt::Key_O, [this] { _camera.move_speed *= 0.5f; }); ADD_ACTION (view_menu, "Decrease camera speed", Qt::Key_O, [this] { _camera.move_speed *= 0.5f; });
ADD_ACTION (view_menu, "Increase camera speed", Qt::Key_P, [this] { _camera.move_speed *= 2.0f; }); ADD_ACTION (view_menu, "Increase camera speed", Qt::Key_P, [this] { _camera.move_speed *= 2.0f; });
ADD_ACTION (file_menu, "Save minimaps", "Ctrl+Shift+P", [this] { Saving = true; }); ADD_ACTION (file_menu, "Save minimaps", "Ctrl+Shift+P", [this] { saving_minimap = true; });
ADD_ACTION ( view_menu ADD_ACTION ( view_menu
, "Turn camera around 180°" , "Turn camera around 180°"
@@ -1550,12 +1550,12 @@ void MapView::saveMinimap(noggit::MinimapRenderSettings* settings)
} }
else else
{ {
Saving = false; saving_minimap = false;
} }
if (mmap_render_success) if (mmap_render_success)
{ {
Saving = false; saving_minimap = false;
} }
break; break;
@@ -1593,7 +1593,7 @@ void MapView::saveMinimap(noggit::MinimapRenderSettings* settings)
if (mmap_render_success && mmap_render_index >= 4095) if (mmap_render_success && mmap_render_index >= 4095)
{ {
Saving = false; saving_minimap = false;
mmap_render_index = 0; mmap_render_index = 0;
mmap_render_success = false; mmap_render_success = false;
} }
@@ -1613,7 +1613,7 @@ void MapView::paintGL()
{ {
opengl::context::scoped_setter const _ (::gl, context()); opengl::context::scoped_setter const _ (::gl, context());
if (Saving) if (saving_minimap)
{ {
saveMinimap(minimapTool->getMinimapRenderSettings()); saveMinimap(minimapTool->getMinimapRenderSettings());
} }
@@ -1622,7 +1622,7 @@ void MapView::paintGL()
_last_frame_durations.emplace_back (now - _last_update); _last_frame_durations.emplace_back (now - _last_update);
if (!Saving) if (!saving_minimap)
{ {
tick (now - _last_update); tick (now - _last_update);
} }

4
src/noggit/MapView.h
View File

@@ -168,7 +168,7 @@ private:
uid_fix_mode _uid_fix; uid_fix_mode _uid_fix;
bool _from_bookmark; bool _from_bookmark;
bool Saving = false; bool saving_minimap = false;
noggit::ui::toolbar* _toolbar; noggit::ui::toolbar* _toolbar;
@@ -200,7 +200,7 @@ public:
void selectModel(std::string const& model); void selectModel(std::string const& model);
void change_selected_wmo_doodadset(int set); void change_selected_wmo_doodadset(int set);
void saveMinimap(noggit::MinimapRenderSettings* settings); void saveMinimap(noggit::MinimapRenderSettings* settings);
void initMinimapSave() { Saving = true; }; void initMinimapSave() { saving_minimap = true; };
void set_editing_mode (editing_mode); void set_editing_mode (editing_mode);