More code quality

Author: tobbi

src/editor/overlay_widget.cpp

@@ -68,7 +68,7 @@ EditorOverlayWidget::EditorOverlayWidget(Editor& editor) :
   m_sector_pos(0, 0),
   m_mouse_pos(0, 0),
   m_previous_mouse_pos(0, 0),
-  m_time_prev_put_tile(std::chrono::steady_clock::now()),
+  m_time_prev_put_tile(steady_clock::now()),
   m_dragging(false),
   m_dragging_right(false),
   m_scrolling(false),
@@ -313,9 +313,8 @@ namespace {
 void
 EditorOverlayWidget::put_next_tiles()
 {
-  auto time_now = std::chrono::steady_clock::now();
-  int expired_ms = static_cast<int>(std::chrono::duration_cast<
-    std::chrono::milliseconds>(time_now - m_time_prev_put_tile).count());
+  auto time_now = steady_clock::now();
+  int expired_ms = static_cast<int>(duration_cast<milliseconds>(time_now - m_time_prev_put_tile).count());
   m_time_prev_put_tile = time_now;
   if (expired_ms > 70)
   {
@@ -519,7 +518,7 @@ EditorOverlayWidget::hover_object()
   BezierMarker* marker_hovered_without_ctrl = nullptr;
 
   bool cache_is_marker = false;
-  int cache_layer = -2147483648;
+  int cache_layer = INT_MIN;
 
   for (auto& moving_object : m_editor.get_sector()->get_objects_by_type<MovingObject>())
   {

src/editor/toolbox_widget.cpp

@@ -33,6 +33,8 @@
 #include "video/video_system.hpp"
 #include "video/viewport.hpp"
 
+using InputType = EditorTilebox::InputType;
+
 EditorToolboxWidget::EditorToolboxWidget(Editor& editor) :
   m_editor(editor),
   m_tilebox(new EditorTilebox(editor, Rectf())),
@@ -82,12 +84,12 @@ EditorToolboxWidget::draw(DrawingContext& context)
   m_undo_mode->draw(context);
   switch (m_tilebox->get_input_type())
   {
-    case EditorTilebox::InputType::TILE:
+    case InputType::TILE:
       m_select_mode->draw(context);
       break;
 
-    case EditorTilebox::InputType::NONE:
-    case EditorTilebox::InputType::OBJECT:
+    case InputType::NONE:
+    case InputType::OBJECT:
       m_node_marker_mode->draw(context);
       m_move_mode->draw(context);
       break;
@@ -158,11 +160,11 @@ EditorToolboxWidget::on_mouse_button_down(const SDL_MouseButtonEvent& button)
           case 1:
             switch (m_tilebox->get_input_type())
             {
-              case EditorTilebox::InputType::TILE:
+              case InputType::TILE:
                 m_select_mode->next_mode();
                 break;
-              case EditorTilebox::InputType::NONE:
-              case EditorTilebox::InputType::OBJECT:
+              case InputType::NONE:
+              case InputType::OBJECT:
                 m_tilebox->set_object("#node");
                 break;
               default:
@@ -172,8 +174,8 @@ EditorToolboxWidget::on_mouse_button_down(const SDL_MouseButtonEvent& button)
             break;
 
            case 2:
-             if (m_tilebox->get_input_type() == EditorTilebox::InputType::OBJECT ||
-                 m_tilebox->get_input_type() == EditorTilebox::InputType::NONE)
+             if (m_tilebox->get_input_type() == InputType::OBJECT ||
+                 m_tilebox->get_input_type() == InputType::NONE)
                m_move_mode->next_mode();
              update_mouse_icon();
              break;
@@ -344,29 +346,29 @@ EditorToolboxWidget::get_hovered_item_rect() const
 void
 EditorToolboxWidget::update_mouse_icon()
 {
-  MouseCursor::current()->set_icon(get_mouse_icon());
+  MouseCursor::current()->set_icon(get_mouse_icon()->get_current_surface());
 }
 
-SurfacePtr
+ToolIcon*
 EditorToolboxWidget::get_mouse_icon() const
 {
   switch (m_tilebox->get_input_type())
   {
-    case EditorTilebox::InputType::NONE:
-    case EditorTilebox::InputType::OBJECT:
+    case InputType::NONE:
+    case InputType::OBJECT:
     {
       const std::string object = m_tilebox->get_object();
 
       if (object.empty())
-        return m_rubber->get_current_surface();
+        return m_rubber.get();
       if (object == "#node")
-        return m_node_marker_mode->get_current_surface();
+        return m_node_marker_mode.get();
 
-      return m_move_mode->get_current_surface();
+      return m_move_mode.get();
     }
 
-    case EditorTilebox::InputType::TILE:
-      return m_select_mode->get_current_surface();
+    case InputType::TILE:
+      return m_select_mode.get();
 
     default:
       return nullptr;

src/editor/toolbox_widget.hpp

@@ -71,7 +71,7 @@ class EditorToolboxWidget final : public Widget
 
   Rectf get_hovered_item_rect() const;
 
-  SurfacePtr get_mouse_icon() const;
+  ToolIcon* get_mouse_icon() const;
 
 private:
   Editor& m_editor;

src/object/specialriser.hpp

@@ -39,7 +39,7 @@ class SpecialRiser final : public MovingObject
   virtual void update(float dt_sec) override;
   virtual void draw(DrawingContext& context) override;
 
-  virtual int get_layer() const override { return m_child ? m_child->get_layer() : -2147483648; }
+  virtual int get_layer() const override { return m_child ? m_child->get_layer() : INT_MIN; }
 
 private:
   Vector m_start_pos;