fix complaints (#50036)

CleverRaven · Jul 19, 2021 · 3c14227 · 3c14227
1 parent a27f801
commit 3c14227
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/activity_actor.cpp b/src/activity_actor.cpp
@@ -1025,7 +1025,7 @@ void read_activity_actor::start( player_activity &act, Character &who )
     act.targets.push_back( book );
 
     add_msg_debug( debugmode::DF_ACT_READ, "reading time = %s",
-                   to_string( time_duration::from_moves( moves_total ) ) );
+                   to_string_writable( time_duration::from_moves( moves_total ) ) );
 
     act.moves_total = moves_total;
     act.moves_left = moves_total;
@@ -1055,7 +1055,7 @@ void read_activity_actor::do_turn( player_activity &act, Character &who )
         // do not spam the message log
         if( calendar::once_every( 5_minutes ) ) {
             add_msg_debug( debugmode::DF_ACT_READ, "reading time = %s",
-                           to_string( time_duration::from_moves( act.moves_left ) ) );
+                           to_string_writable( time_duration::from_moves( act.moves_left ) ) );
         }
     } else {
         who.moves = 0;
@@ -1410,7 +1410,7 @@ void read_activity_actor::finish( player_activity &act, Character &who )
 
             time_taken = who.as_avatar()->time_to_read( *book, *reader );
             add_msg_debug( debugmode::DF_ACT_READ, "reading time = %s",
-                           to_string( time_duration::from_moves( time_taken ) ) );
+                           to_string_writable( time_duration::from_moves( time_taken ) ) );
         }
 
         // restart the activity

diff --git a/src/avatar.cpp b/src/avatar.cpp
@@ -107,7 +107,6 @@ static const trait_id trait_DEBUG_CLOAK( "DEBUG_CLOAK" );
 static const trait_id trait_INSECT_ARMS( "INSECT_ARMS" );
 static const trait_id trait_INSECT_ARMS_OK( "INSECT_ARMS_OK" );
 static const trait_id trait_PROF_DICEMASTER( "PROF_DICEMASTER" );
-static const trait_id trait_SCHIZOPHRENIC( "SCHIZOPHRENIC" );
 static const trait_id trait_STIMBOOST( "STIMBOOST" );
 static const trait_id trait_THICK_SCALES( "THICK_SCALES" );
 static const trait_id trait_WEBBED( "WEBBED" );
@@ -287,7 +286,7 @@ bool avatar::read( item_location &book )
     bool continuous = false;
     const int time_taken = time_to_read( *book, *reader );
     add_msg_debug( debugmode::DF_ACT_READ, "avatar::read time_taken = %s",
-                   to_string( time_duration::from_moves( time_taken ) ) );
+                   to_string_writable( time_duration::from_moves( time_taken ) ) );
 
     // If the player hasn't read this book before, skim it to get an idea of what's in it.
     if( !has_identified( book->typeId() ) ) {

diff --git a/src/npc.cpp b/src/npc.cpp
@@ -80,7 +80,6 @@
 #include "vpart_position.h"
 #include "vpart_range.h"
 
-static const activity_id ACT_READ( "ACT_READ" );
 
 static const efftype_id effect_bouldering( "bouldering" );
 static const efftype_id effect_contacts( "contacts" );
@@ -121,7 +120,6 @@ static const trait_id trait_MUTE( "MUTE" );
 static const trait_id trait_PROF_DICEMASTER( "PROF_DICEMASTER" );
 static const trait_id trait_PSYCHOPATH( "PSYCHOPATH" );
 static const trait_id trait_SAPIOVORE( "SAPIOVORE" );
-static const trait_id trait_SCHIZOPHRENIC( "SCHIZOPHRENIC" );
 static const trait_id trait_TERRIFYING( "TERRIFYING" );
 
 class monfaction;