Change mapgen_function_json_base::setup_setmap to take a const reference

And iterate over it via a range-based loop.
CleverRaven · Dec 18, 2019 · f4fa18c · f4fa18c
1 parent 84a53d7
commit f4fa18c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
@@ -577,7 +577,7 @@ int jmapgen_int::get() const
  * Turn json gobbldigook into machine friendly gobbldigook, for applying
  * basic map 'set' functions, optionally based on one_in(chance) or repeat value
  */
-void mapgen_function_json_base::setup_setmap( JsonArray &parray )
+void mapgen_function_json_base::setup_setmap( const JsonArray &parray )
 {
     std::string tmpval;
     std::map<std::string, jmapgen_setmap_op> setmap_opmap;
@@ -590,8 +590,7 @@ void mapgen_function_json_base::setup_setmap( JsonArray &parray )
     jmapgen_setmap_op tmpop;
     int setmap_optype = 0;
 
-    while( parray.has_more() ) {
-        JsonObject pjo = parray.next_object();
+    for( const JsonObject &pjo : parray ) {
         if( pjo.read( "point", tmpval ) ) {
             setmap_optype = JMAPGEN_SETMAP_OPTYPE_POINT;
         } else if( pjo.read( "set", tmpval ) ) {
@@ -2304,8 +2303,7 @@ bool mapgen_function_json_base::setup_common( const JsonObject &jo )
     }
 
     if( jo.has_array( "set" ) ) {
-        parray = jo.get_array( "set" );
-        setup_setmap( parray );
+        setup_setmap( jo.get_array( "set" ) );
     }
 
     // "add" is deprecated in favor of "place_item", but kept to support mods

diff --git a/src/mapgen.h b/src/mapgen.h
@@ -290,7 +290,7 @@ class mapgen_function_json_base
 
         void setup_common();
         bool setup_common( const JsonObject &jo );
-        void setup_setmap( JsonArray &parray );
+        void setup_setmap( const JsonArray &parray );
         // Returns true if the mapgen qualifies at this point already
         virtual bool setup_internal( const JsonObject &jo ) = 0;
         virtual void setup_setmap_internal() { }