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 = '.

diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index 6c87255f3a2289ed6d4c0d75117ebf7c3541f970..51a472a569b49736252ac46b6a59168f68d1d771 100644 (file)
--- 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
index ad32cf192e6f1b469376fffc1c5710bc3e86fb51..2748524c54bdbc24b12c3470919baeae9d4ad331 100644 (file)
--- 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
index a4cde7ecec7fc069bb88cc07e44a0fa2178f269f..76f7e6e8e98b73bbdfcc8813595f43af1b719a90 100644 (file)
--- 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
index 6f13256f1eedddff8fb019210df2485aaf5892c5..ebfb3c72945b298224e166c9c754d00039368c79 100644 (file)
--- 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;