Fix various code issues found by cppcheck (#7741)

Mapgen Singlenode: Remove 'flags' that duplicates a 'class Mapgen' member. Dungeongen: Initialise 'MMVManip *vm' to 'nullptr'. Inventorymanager: Remove assignment error 'found = '.
minetest · Sep 23, 2018 · 8543df7752bfdd43922f8f9377cd94aae71d83b9 · 8543df7
1 parent 65af7d2
commit 8543df7752bfdd43922f8f9377cd94aae71d83b9
Unified Split

Showing with 2 additions and 5 deletions.

+1 −1 src/inventorymanager.cpp

+1 −1 src/mapgen/dungeongen.h

+0 −2 src/mapgen/mapgen_singlenode.cpp

+0 −1 src/mapgen/mapgen_singlenode.h
diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
@@ -846,7 +846,7 @@ void ICraftAction::apply(InventoryManager *mgr,
 			count_remaining--;
 
 		// Get next crafting result
-		found = getCraftingResult(inv_craft, crafted, temp, false, gamedef);
+		getCraftingResult(inv_craft, crafted, temp, false, gamedef);
 		PLAYER_TO_SA(player)->item_CraftPredict(crafted, player, list_craft, craft_inv);
 		found = !crafted.empty();
 	}

diff --git a/src/mapgen/dungeongen.h b/src/mapgen/dungeongen.h
@@ -64,7 +64,7 @@ struct DungeonParams {
 
 class DungeonGen {
 public:
-	MMVManip *vm;
+	MMVManip *vm = nullptr;
 	const NodeDefManager *ndef;
 	GenerateNotifier *gennotify;
 

diff --git a/src/mapgen/mapgen_singlenode.cpp b/src/mapgen/mapgen_singlenode.cpp
@@ -33,8 +33,6 @@ MapgenSinglenode::MapgenSinglenode(int mapgenid,
 	MapgenParams *params, EmergeManager *emerge)
 	: Mapgen(mapgenid, params, emerge)
 {
-	flags = params->flags;
-
 	const NodeDefManager *ndef = emerge->ndef;
 
 	c_node = ndef->getId("mapgen_singlenode");

diff --git a/src/mapgen/mapgen_singlenode.h b/src/mapgen/mapgen_singlenode.h
@@ -35,7 +35,6 @@ struct MapgenSinglenodeParams : public MapgenParams
 class MapgenSinglenode : public Mapgen
 {
 public:
-	u32 flags;
 	content_t c_node;
 	u8 set_light;