infrastructure changes to enable testing

Author: mqrause

src/do_turn.cpp

@@ -8,7 +8,6 @@
 #include "creature_tracker.h"
 #include "event_bus.h"
 #include "explosion.h"
-#include "field.h"
 #include "game.h"
 #include "gamemode.h"
 #include "help.h"
@@ -35,7 +34,6 @@
 #include "wcwidth.h"
 #include "worldfactory.h"
 
-static const activity_id ACT_AIM( "ACT_AIM" );
 static const activity_id ACT_AUTODRIVE( "ACT_AUTODRIVE" );
 static const activity_id ACT_OPERATION( "ACT_OPERATION" );
 
@@ -729,32 +727,13 @@ bool do_turn()
             // If player is performing a task, a monster is dangerously close,
             // and monster can reach to the player or it has some sort of a ranged attack,
             // warn them regardless of previous safemode warnings
-            if( u.activity && !u.has_activity( ACT_AIM ) &&
-                u.activity.moves_left > 0 &&
-                !u.activity.is_distraction_ignored( distraction_type::hostile_spotted_near ) ) {
-                Creature *hostile_critter = g->is_hostile_very_close( true );
-
-                if( hostile_critter != nullptr ) {
-                    g->cancel_activity_or_ignore_query( distraction_type::hostile_spotted_near,
-                                                        string_format( _( "The %s is dangerously close!" ),
-                                                                hostile_critter->get_name() ) );
-                }
-            }
-
-            if( u.activity && !u.has_activity( ACT_AIM ) && u.activity.moves_left > 0 &&
-                !u.activity.is_distraction_ignored( distraction_type::dangerous_field ) ) {
-                for( const std::pair<const field_type_id, field_entry> &field : m.field_at( u.pos() ) ) {
-                    if( u.is_dangerous_field( field.second ) ) {
-                        if( g->cancel_activity_or_ignore_query( distraction_type::dangerous_field,
-                                                                string_format( _( "You stand in %s!" ),
-                                                                        field.second.name() ) ) ||
-                            u.activity.is_distraction_ignored( distraction_type::dangerous_field ) ) {
-                            break;
-                        }
+            if( u.activity ) {
+                for( std::pair<const distraction_type, std::string> &dist : u.activity.get_distractions() ) {
+                    if( g->cancel_activity_or_ignore_query( dist.first, dist.second ) ) {
+                        break;
                     }
                 }
             }
-
         }
     }
 

src/game.cpp

@@ -3854,6 +3854,18 @@ Creature *game::is_hostile_within( int distance, bool dangerous )
     return nullptr;
 }
 
+field_entry *game::is_in_dangerous_field()
+{
+    map &here = get_map();
+    for( std::pair<const field_type_id, field_entry> &field : here.field_at( u.pos() ) ) {
+        if( u.is_dangerous_field( field.second ) ) {
+            return &field.second;
+        }
+    }
+
+    return nullptr;
+}
+
 std::unordered_set<tripoint> game::get_fishable_locations( int distance, const tripoint &fish_pos )
 {
     // We're going to get the contiguous fishable terrain starting at

src/game.h

@@ -559,6 +559,7 @@ class game
         character_id assign_npc_id();
         Creature *is_hostile_nearby();
         Creature *is_hostile_very_close( bool dangerous = false );
+        field_entry *is_in_dangerous_field();
         // Handles shifting coordinates transparently when moving between submaps.
         // Helper to make calling with a player pointer less verbose.
         point update_map( Character &p, bool z_level_changed = false );

src/player_activity.cpp

@@ -10,6 +10,8 @@
 #include "calendar.h"
 #include "character.h"
 #include "construction.h"
+#include "field.h"
+#include "game.h"
 #include "item.h"
 #include "itype.h"
 #include "map.h"
@@ -464,3 +466,28 @@ void player_activity::inherit_distractions( const player_activity &other )
         ignore_distraction( type );
     }
 }
+
+
+std::map<distraction_type, std::string> player_activity::get_distractions()
+{
+    std::map < distraction_type, std::string > res;
+    if( id() != ACT_AIM && moves_left > 0 ) {
+        if( !is_distraction_ignored( distraction_type::hostile_spotted_near ) ) {
+            Creature *hostile_critter = g->is_hostile_very_close( true );
+            if( hostile_critter != nullptr ) {
+                res.emplace( distraction_type::hostile_spotted_near,
+                             string_format( _( "The %s is dangerously close!" ),
+                                            g->is_hostile_very_close( true )->get_name() ) );
+            }
+        }
+        if( !is_distraction_ignored( distraction_type::dangerous_field ) ) {
+            field_entry *field = g->is_in_dangerous_field();
+            if( field != nullptr ) {
+                res.emplace( distraction_type::dangerous_field, string_format( _( "You stand in %s!" ),
+                             g->is_in_dangerous_field()->name() ) );
+            }
+        }
+    }
+
+    return res;
+}

src/player_activity.h

@@ -178,6 +178,8 @@ class player_activity
         bool do_drop_invalid_inventory() const {
             return !actor || actor->do_drop_invalid_inventory();
         }
+
+        std::map<distraction_type, std::string> get_distractions();
 };
 
 #endif // CATA_SRC_PLAYER_ACTIVITY_H