Pass ContentFeatures as reference to read_content_features (#10464)

JosiahWI · web-flow · commit 11f3deb9c451 · 2020-10-13T16:36:01.000+01:00
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
@@ -491,13 +491,11 @@ TileDef read_tiledef(lua_State *L, int index, u8 drawtype)
 }
 
 /******************************************************************************/
-ContentFeatures read_content_features(lua_State *L, int index)
+void read_content_features(lua_State *L, ContentFeatures &f, int index)
 {
 	if(index < 0)
 		index = lua_gettop(L) + 1 + index;
 
-	ContentFeatures f;
-
 	/* Cache existence of some callbacks */
 	lua_getfield(L, index, "on_construct");
 	if(!lua_isnil(L, -1)) f.has_on_construct = true;
@@ -800,7 +798,6 @@ ContentFeatures read_content_features(lua_State *L, int index)
 	getstringfield(L, index, "node_dig_prediction",
 		f.node_dig_prediction);
 
-	return f;
 }
 
 void push_content_features(lua_State *L, const ContentFeatures &c)
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
@@ -67,7 +67,8 @@ struct collisionMoveResult;
 
 extern struct EnumString es_TileAnimationType[];
 
-ContentFeatures    read_content_features     (lua_State *L, int index);
+void               read_content_features     (lua_State *L, ContentFeatures &f,
+                                              int index);
 void               push_content_features     (lua_State *L,
                                               const ContentFeatures &c);
 
diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
@@ -570,7 +570,8 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 
 	// Read the node definition (content features) and register it
 	if (def.type == ITEM_NODE) {
-		ContentFeatures f = read_content_features(L, table);
+		ContentFeatures f;
+		read_content_features(L, f, table);
 		// when a mod reregisters ignore, only texture changes and such should
 		// be done
 		if (f.name == "ignore")

Original file line number	Diff line number	Diff line change
`@@ -491,13 +491,11 @@ TileDef read_tiledef(lua_State *L, int index, u8 drawtype)`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`/******************************************************************************/`
`494`		`-ContentFeatures read_content_features(lua_State *L, int index)`
	`494`	`+void read_content_features(lua_State *L, ContentFeatures &f, int index)`
`495`	`495`	`{`
`496`	`496`	`if(index < 0)`
`497`	`497`	`index = lua_gettop(L) + 1 + index;`
`498`	`498`
`499`		`- ContentFeatures f;`
`500`		`-`
`501`	`499`	`/* Cache existence of some callbacks */`
`502`	`500`	`lua_getfield(L, index, "on_construct");`
`503`	`501`	`if(!lua_isnil(L, -1)) f.has_on_construct = true;`
`@@ -800,7 +798,6 @@ ContentFeatures read_content_features(lua_State *L, int index)`
`800`	`798`	`getstringfield(L, index, "node_dig_prediction",`
`801`	`799`	`f.node_dig_prediction);`
`802`	`800`
`803`		`- return f;`
`804`	`801`	`}`
`805`	`802`
`806`	`803`	`void push_content_features(lua_State *L, const ContentFeatures &c)`