Improve C++ checking.

Alberth289346 · Oct 1, 2023 · 732e15d · 732e15d
1 parent 22f932e
commit 732e15d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/CorsixTH/Src/th_gfx.cpp b/CorsixTH/Src/th_gfx.cpp
@@ -1451,8 +1451,9 @@ void animation::depersist(lua_persist_reader* pReader) {
         // 3 should be the morph set, but the actual morph target is
         // missing, so settle for a graphical bug rather than a segfault
         // by reverting to the normal function set.
+        [[fallthrough]];
       case 1:
-        break;
+        [[fallthrough]];  // Should be "return;" but not allowed.
       case 2:
         break;
       case 4:

diff --git a/CorsixTH/Src/th_gfx.h b/CorsixTH/Src/th_gfx.h
@@ -581,9 +581,9 @@ class animation : public animation_base {
   void set_morph_target(animation* pMorphTarget, int iDurationFactor = 1);
   void set_frame(size_t iFrame);
 
-  virtual void draw_fn(render_target* pCanvas, int iDestX, int iDestY);
-  virtual bool hit_test_fn(int iDestX, int iDestY, int iTestX, int iTestY);
-  virtual bool is_multiple_frame_animation_fn();
+  void draw_fn(render_target* pCanvas, int iDestX, int iDestY) override;
+  bool hit_test_fn(int iDestX, int iDestY, int iTestX, int iTestY) override;
+  bool is_multiple_frame_animation_fn() override;
   void set_function_set(int value);
 
   void set_speed(int iX, int iY) { speed.dx = iX, speed.dy = iY; }
@@ -636,9 +636,9 @@ class sprite_render_list : public animation_base {
   void persist(lua_persist_writer* pWriter) const;
   void depersist(lua_persist_reader* pReader);
 
-  virtual void draw_fn(render_target* pCanvas, int iDestX, int iDestY);
-  virtual bool hit_test_fn(int iDestX, int iDestY, int iTestX, int iTestY);
-  virtual bool is_multiple_frame_animation_fn();
+  void draw_fn(render_target* pCanvas, int iDestX, int iDestY) override;
+  bool hit_test_fn(int iDestX, int iDestY, int iTestX, int iTestY) override;
+  bool is_multiple_frame_animation_fn() override;
 
  private:
   struct sprite {