Remove a dead override that is causing an inheritance conflict

CleverRaven · Dec 7, 2024 · 1467dc6 · 1467dc6
1 parent c4c4fea
commit 1467dc6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/talker.h b/src/talker.h
@@ -670,7 +670,6 @@ class talker: virtual public const_talker
         virtual computer *get_computer() {
             return nullptr;
         }
-        virtual void set_pos( tripoint ) {}
         virtual void set_pos( tripoint_bub_ms ) {}
         virtual void update_missions( const std::vector<mission *> & ) {}
         virtual void set_str_max( int ) {}

diff --git a/src/talker_character.cpp b/src/talker_character.cpp
@@ -82,11 +82,6 @@ tripoint_abs_omt talker_character_const::global_omt_location() const
     return me_chr_const->global_omt_location();
 }
 
-void talker_character::set_pos( tripoint new_pos )
-{
-    me_chr->setpos( new_pos );
-}
-
 int talker_character_const::get_cur_hp( const bodypart_id &bp ) const
 {
     return me_chr_const->get_hp( bp );
@@ -135,6 +130,11 @@ dealt_damage_instance talker_character_const::deal_damage( Creature *source, bod
     return source->deal_damage( source, bp, dam );
 }
 
+void talker_character::set_pos( tripoint_bub_ms new_pos )
+{
+    me_chr->setpos( new_pos );
+}
+
 void talker_character::set_str_max( int value )
 {
     me_chr->str_max = value;

diff --git a/src/talker_character.h b/src/talker_character.h
@@ -245,7 +245,7 @@ class talker_character: virtual public talker
             return me_chr;
         }
 
-        void set_pos( tripoint new_pos ) override;
+        void set_pos( tripoint_bub_ms new_pos ) override;
 
         // stats, skills, traits, bionics, and magic
         void set_str_max( int value ) override;