Change player_activity::start to player_activity::start_or_resume and

remove unnecessary include
CleverRaven · May 4, 2020 · 058073b · 058073b
1 parent 9ba57ea
commit 058073b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/character.cpp b/src/character.cpp
@@ -9349,7 +9349,7 @@ void Character::assign_activity( const player_activity &act, bool allow_resume )
         activity = act;
     }
 
-    activity.start( *this, resuming );
+    activity.start_or_resume( *this, resuming );
 
     if( is_npc() ) {
         cancel_stashed_activity();

diff --git a/src/player_activity.cpp b/src/player_activity.cpp
@@ -8,7 +8,6 @@
 #include "avatar.h"
 #include "calendar.h"
 #include "construction.h"
-#include "debug.h"
 #include "game.h"
 #include "item.h"
 #include "itype.h"
@@ -172,7 +171,7 @@ cata::optional<std::string> player_activity::get_progress_message( const avatar
                     get_verb().translated(), extra_info );
 }
 
-void player_activity::start( Character &who, bool resuming )
+void player_activity::start_or_resume( Character &who, bool resuming )
 {
     if( actor && !resuming ) {
         actor->start( *this, who );

diff --git a/src/player_activity.h b/src/player_activity.h
@@ -129,7 +129,7 @@ class player_activity
          * called whenever a Character starts a new activity.
          * When resuming an activity, do not call activity_actor::start
          */
-        void start( Character &who, bool resuming );
+        void start_or_resume( Character &who, bool resuming );
 
         /**
          * Performs the activity for a single turn. If the activity is complete