diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-01-28 02:54:27 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-01-28 02:54:27 +0000 |
| commit | 98f01c2b12e6a2aeef8b2f9810e5a3cce9d5e475 (patch) | |
| tree | 69501baa99b79edf4e1767b9598e8d2109232eeb /src/tools | |
| parent | b404e0bec1d39a90a516ed935d882faa47e54a04 (diff) | |
Core/Misc: Fix compile errors introduced in previous merge
There are probably other merge issues that got through, please report them
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 49c17913c64..671de25dfd3 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -12,4 +12,4 @@ add_subdirectory(map_extractor) add_subdirectory(vmap4_assembler) add_subdirectory(vmap4_extractor) add_subdirectory(mmaps_generator) -add_subdirectory(mesh_extractor) +# add_subdirectory(mesh_extractor) diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 800328810a7..7b591ddfc85 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -901,7 +901,7 @@ bool ConvertADT(char *filename, char *filename2, int /*cell_y*/, int /*cell_x*/, { for (int j = 0; j < ADT_CELLS_PER_GRID; ++j) { - adt_MCNK * cell = cells->getMCNK(i,j); + adt_MCNK * cell = adt.cells[i][j]; if (!cell) continue; holes[i][j] = cell->holes; |
