Fix warnings about dungeongen.cpp memcpy() and unused variable in MapBlock::deSeriali...

* Fix warning about dungeongen.cpp memcpy()

* Fix unused variable in MapBlock::deSerializeNetworkSpecific()

* Fix unused variable a simpler way

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 734ea478d919634d3789271ccc7af75130969140..0996dd168874dea543cc2e7c5e0cd5654b8b0e86 100644 (file)
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -557,9 +557,10 @@ void MapBlock::deSerialize(std::istream &is, u8 version, bool disk)
 void MapBlock::deSerializeNetworkSpecific(std::istream &is)
 {
        try {
-               const u8 version = readU8(is);
-               //if(version != 1)
-               //      throw SerializationError("unsupported MapBlock version");
+               readU8(is);
+               //const u8 version = readU8(is);
+               //if (version != 1)
+                       //throw SerializationError("unsupported MapBlock version");
 
        } catch(SerializationError &e) {
                warningstream<<"MapBlock::deSerializeNetworkSpecific(): Ignoring an error"

diff --git a/src/mapgen/dungeongen.cpp b/src/mapgen/dungeongen.cpp
index 32bea4caa4aadf5e35d60c284f158b788ea6889a..77ac05770769d3fd10ffc0a0c3dcc5ce4674260e 100644 (file)
--- a/src/mapgen/dungeongen.cpp
+++ b/src/mapgen/dungeongen.cpp
@@ -51,7 +51,7 @@ DungeonGen::DungeonGen(const NodeDefManager *ndef,
 #endif
 
        if (dparams) {
-               memcpy(&dp, dparams, sizeof(dp));
+               dp = *dparams;
        } else {
                // Default dungeon parameters
                dp.seed = 0;