From 058073bc6b6c5db21f99ec5d476d0078c8a49c14 Mon Sep 17 00:00:00 2001 From: Ryan Sullivant Date: Sun, 3 May 2020 23:12:46 -0700 Subject: [PATCH] Change player_activity::start to player_activity::start_or_resume and remove unnecessary include --- src/character.cpp | 2 +- src/player_activity.cpp | 3 +-- src/player_activity.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/character.cpp b/src/character.cpp index 407724b4572f9..6e01306e62136 100644 --- 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 index 8c4e5f1c50620..28b56c6761124 100644 --- 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 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 index 60f27ac0316a8..4000c4af66c4e 100644 --- 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