diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-10-12 21:46:40 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-10-12 21:46:40 +0200 |
| commit | 42f5017261b577691e1d728cd209f8e51cde2f0b (patch) | |
| tree | 6d1f4d7bf9c06d88807f89b5a3809b7cfa598580 /src/server/game/Maps/Map.cpp | |
| parent | cf521de9cb4da0c3a490684875196f7187d9b4cd (diff) | |
| parent | a96ff6043d62ba7afd4689c922e6fee734afc415 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/MiscHandler.cpp
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 54a74367a62..f5f9546b7b2 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1586,7 +1586,7 @@ GridMap::~GridMap() unloadData(); } -bool GridMap::loadData(char* filename) +bool GridMap::loadData(const char* filename) { // Unload old data if exist unloadData(); |