Encapsulate frn

CleverRaven · Feb 10, 2020 · 98ac91f · 98ac91f
1 parent 082e978
commit 98ac91f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/lightmap.cpp b/src/lightmap.cpp
@@ -107,7 +107,7 @@ bool map::build_transparency_cache( const int zlev )
                     }
 
                     if( !( cur_submap->get_ter( { sx, sy } ).obj().transparent &&
-                           cur_submap->frn[sx][sy].obj().transparent ) ) {
+                           cur_submap->get_furn( {sx, sy } ).obj().transparent ) ) {
                         value = LIGHT_TRANSPARENCY_SOLID;
                         zero_value = LIGHT_TRANSPARENCY_SOLID;
                         continue;
@@ -326,7 +326,7 @@ void map::generate_lightmap( const int zlev )
                     if( terrain->light_emitted > 0 ) {
                         add_light_source( p, terrain->light_emitted );
                     }
-                    const furn_id furniture = cur_submap->frn[sx][sy];
+                    const furn_id furniture = cur_submap->get_furn( {sx, sy } );
                     if( furniture->light_emitted > 0 ) {
                         add_light_source( p, furniture->light_emitted );
                     }

diff --git a/src/map.cpp b/src/map.cpp
@@ -7395,7 +7395,7 @@ fake_map::fake_map( const furn_id &fur_type, const ter_id &ter_type, const trap_
             std::unique_ptr<submap> sm = std::make_unique<submap>();
 
             sm->set_all_ter( ter_type );
-            std::uninitialized_fill_n( &sm->frn[0][0], SEEX * SEEY, fur_type );
+            sm->set_all_furn( fur_type );
             std::uninitialized_fill_n( &sm->trp[0][0], SEEX * SEEY, trap_type );
 
             setsubmap( get_nonant( { gridx, gridy, fake_map_z } ), sm.get() );

diff --git a/src/submap.h b/src/submap.h
@@ -82,6 +82,11 @@ class submap : public maptile_soa<SEEX, SEEY>    // TODO: Use private inheritanc
             frn[p.x][p.y] = furn;
         }
 
+        void set_all_furn( const furn_id &furn ) {
+            constexpr size_t block_size = SEEX * SEEY;
+            std::uninitialized_fill_n( &frn[0][0], block_size, furn );
+        }
+
         ter_id get_ter( const point &p ) const {
             return ter[p.x][p.y];
         }