Skip to content
Permalink
Browse files

Fix warnings about dungeongen.cpp memcpy() and unused variable in Map…

…Block::deSerializeNetworkSpecific() (#8122)

* Fix warning about dungeongen.cpp memcpy()

* Fix unused variable in MapBlock::deSerializeNetworkSpecific()

* Fix unused variable a simpler way
  • Loading branch information...
paramat authored and nerzhul committed Jan 22, 2019
1 parent 33afe1f commit bc1e54764b736310ca3797dc3e06fe8326949367
Showing with 5 additions and 4 deletions.
  1. +4 −3 src/mapblock.cpp
  2. +1 −1 src/mapgen/dungeongen.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"
@@ -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;

0 comments on commit bc1e547

Please sign in to comment.
You can’t perform that action at this time.