Don't allow changing select mode in object input type (#1845)

SuperTux · Nov 13, 2021 · cd2401d · cd2401d
1 parent 8a0f243
commit cd2401d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/editor/tool_icon.cpp b/src/editor/tool_icon.cpp
@@ -18,6 +18,7 @@
 
 #include "video/drawing_context.hpp"
 #include "video/surface.hpp"
+#include "editor/editor.hpp"
 
 ToolIcon::ToolIcon(const std::string& icon) :
   m_pos(0, 0),
@@ -45,6 +46,11 @@ ToolIcon::draw(DrawingContext& context)
 void
 ToolIcon::next_mode()
 {
+  if (Editor::current()->get_tileselect_input_type() == EditorToolboxWidget::InputType::OBJECT)
+  {
+    m_mode = 0;
+    return;
+  }
   m_mode++;
   if (m_mode >= m_surf_count) {
     m_mode = 0;

diff --git a/src/editor/tool_icon.hpp b/src/editor/tool_icon.hpp
@@ -34,6 +34,8 @@ class ToolIcon final
 
   int get_mode() const { return m_mode; }
 
+  void set_mode(int mode) { m_mode = mode; }
+
   void next_mode();
 
   void push_mode(const std::string& icon);

diff --git a/src/editor/toolbox_widget.cpp b/src/editor/toolbox_widget.cpp
@@ -568,6 +568,7 @@ EditorToolboxWidget::select_objectgroup(int id)
 {
   m_active_objectgroup = id;
   m_input_type = EditorToolboxWidget::InputType::OBJECT;
+  m_select_mode->set_mode(0);
   m_starting_tile = 0;
   update_mouse_icon();
 }