Clean up some activity actor definitions

CleverRaven · Apr 17, 2020 · 2621c92 · 2621c92
1 parent a4624d0
commit 2621c92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/activity_actor.cpp b/src/activity_actor.cpp
@@ -75,11 +75,6 @@ void move_items_activity_actor::do_turn( player_activity &act, Character &who )
     }
 }
 
-void move_items_activity_actor::finish( player_activity &, Character & )
-{
-    // Do nothing
-}
-
 void move_items_activity_actor::serialize( JsonOut &jsout ) const
 {
     jsout.start_object();
@@ -122,11 +117,6 @@ void migration_cancel_activity_actor::do_turn( player_activity &act, Character &
     }
 }
 
-void migration_cancel_activity_actor::finish( player_activity &, Character & )
-{
-    // Do nothing
-}
-
 void migration_cancel_activity_actor::serialize( JsonOut &jsout ) const
 {
     // This will probably never be called, but write null to avoid invalid json in

diff --git a/src/activity_actor.h b/src/activity_actor.h
@@ -87,7 +87,7 @@ class move_items_activity_actor : public activity_actor
 
         void start( player_activity &, Character & ) override {};
         void do_turn( player_activity &act, Character &who ) override;
-        void finish( player_activity &act, Character &who ) override;
+        void finish( player_activity &, Character & ) override {};
 
         std::unique_ptr<activity_actor> clone() const override {
             return std::make_unique<move_items_activity_actor>( *this );
@@ -108,7 +108,7 @@ class migration_cancel_activity_actor : public activity_actor
 
         void start( player_activity &, Character & ) override {};
         void do_turn( player_activity &act, Character &who ) override;
-        void finish( player_activity &act, Character &who ) override;
+        void finish( player_activity &, Character & ) override {};
 
         std::unique_ptr<activity_actor> clone() const override {
             return std::make_unique<migration_cancel_activity_actor>( *this );