Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nopch/warning fixes

Browse Source
This commit is contained in:
Shauren
2018-04-27 20:29:01 +02:00
parent 24d30dab84
commit 45b2492aa0
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/Collision/Management/VMapManager2.cpp
View File

@@ -132,7 +132,7 @@ namespace VMAP
{
std::string mapFileName = getMapFileName(mapId);
StaticMapTree* newTree = new StaticMapTree(mapId, basePath);
if (!newTree->InitMap(mapFileName, this))
if (!newTree->InitMap(mapFileName))
{
delete newTree;
return false;

5
src/common/Collision/Maps/MapTree.cpp
View File

@@ -266,8 +266,7 @@ namespace VMAP
FILE* rf = fopen(fullname.c_str(), "rb");
if (!rf)
return false;
/// @todo check magic number when implemented...
char tiled;
char chunk[8];
if (!readChunk(rf, chunk, VMAP_MAGIC, 8))
{
@@ -289,7 +288,7 @@ namespace VMAP
//=========================================================
bool StaticMapTree::InitMap(const std::string &fname, VMapManager2* vm)
bool StaticMapTree::InitMap(std::string const& fname)
{
TC_LOG_DEBUG("maps", "StaticMapTree::InitMap() : initializing StaticMapTree '%s'", fname.c_str());
bool success = false;

2
src/common/Collision/Maps/MapTree.h
View File

@@ -82,7 +82,7 @@ namespace VMAP
bool getAreaInfo(G3D::Vector3 &pos, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const;
bool GetLocationInfo(const G3D::Vector3 &pos, LocationInfo &info) const;
bool InitMap(const std::string &fname, VMapManager2* vm);
bool InitMap(std::string const& fname);
void UnloadMap(VMapManager2* vm);
bool LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm);
void UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm);

10
src/common/Collision/Maps/TileAssembler.cpp
View File

@@ -17,14 +17,14 @@
*/
#include "TileAssembler.h"
#include "MapTree.h"
#include "BoundingIntervalHierarchy.h"
#include "MapTree.h"
#include "StringFormat.h"
#include "VMapDefinitions.h"
#include <set>
#include <iomanip>
#include <sstream>
#include <boost/filesystem.hpp>
#include <iomanip>
#include <set>
#include <sstream>
using G3D::Vector3;
using G3D::AABox;