diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp index 5b037dafe00..d65afbbfd46 100644 --- a/src/common/Collision/Maps/MapTree.cpp +++ b/src/common/Collision/Maps/MapTree.cpp @@ -275,7 +275,10 @@ namespace VMAP } FILE* tf = OpenMapTileFile(basePath, mapID, tileX, tileY, vm).File; if (!tf) - result = LoadResult::FileNotFound; + { + fclose(rf); + return LoadResult::FileNotFound; + } else { if (!readChunk(tf, chunk, VMAP_MAGIC, 8)) diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 98035fa8b51..9a99d6e3fe3 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -178,7 +178,7 @@ struct PositionFullTerrainStatus uint32 const mogpFlags; }; - PositionFullTerrainStatus() : areaId(0), floorZ(0.0f), outdoors(true) { } + PositionFullTerrainStatus() : areaId(0), floorZ(0.0f), outdoors(true), liquidStatus(LIQUID_MAP_NO_WATER) { } uint32 areaId; float floorZ; bool outdoors; diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index be7b0183981..b8b1f09c5ef 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -89,7 +89,7 @@ protected: public: - explicit SplineBase() : index_lo(0), index_hi(0), m_mode(UninitializedMode), cyclic(false) { } + explicit SplineBase() : index_lo(0), index_hi(0), m_mode(UninitializedMode), cyclic(false), initialOrientation(0.f) { } /** Caclulates the position for given segment Idx, and percent of segment length t @param t - percent of segment length, assumes that t in range [0, 1] diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index ba362db98ed..c6dc3d8fe12 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -485,7 +485,7 @@ public: return true; } - handler->PSendSysMessage(LANG_COMMAND_GO_INSTANCE_FAILED, mapid, scriptname, exit->target_mapId); + handler->PSendSysMessage(LANG_COMMAND_GO_INSTANCE_FAILED, mapid, scriptname, exit ? exit->target_mapId : uint32(-1)); handler->SetSentErrorMessage(true); return false; }