From c4cd85bb98c8c36020d915efe967ab7372ddff82 Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Tue, 22 Mar 2011 18:46:39 +0000 Subject: [PATCH] Build fixes This was SVN commit r9100. --- binaries/data/mods/public/maps/random/rmgen/map.js | 1 - source/graphics/MapReader.cpp | 9 ++++----- source/lib/sysdep/os/osx/dir_watch.cpp | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/binaries/data/mods/public/maps/random/rmgen/map.js b/binaries/data/mods/public/maps/random/rmgen/map.js index 60d1bd977e..1f89c9ade8 100644 --- a/binaries/data/mods/public/maps/random/rmgen/map.js +++ b/binaries/data/mods/public/maps/random/rmgen/map.js @@ -299,7 +299,6 @@ Map.prototype.getMapData = function() textureNames.push(name); data["textureNames"] = textureNames; - data["numTextures"] = textureNames.length; // Convert 2D tile data to flat array, reodering into patches as expected by MapReader var tiles = new Array(size*size); diff --git a/source/graphics/MapReader.cpp b/source/graphics/MapReader.cpp index 24776a93a6..47b6478e04 100644 --- a/source/graphics/MapReader.cpp +++ b/source/graphics/MapReader.cpp @@ -1099,21 +1099,20 @@ int CMapReader::ParseTerrain() #define GET_TERRAIN_PROPERTY(prop, out)\ if (!pSimulation2->GetScriptInterface().GetProperty(m_MapData.get(), #prop, out))\ - LOGERROR(L"CMapReader::ParseTerrain() failed to get '%hs' property", #prop);\ + LOGERROR(L"CMapReader::ParseTerrain() failed to get '%hs' property", #prop); - size_t size; + int size; GET_TERRAIN_PROPERTY(size, size) m_PatchesPerSide = size / PATCH_SIZE; - + // flat heightmap of u16 data GET_TERRAIN_PROPERTY(height, m_Heightmap) // load textures - GET_TERRAIN_PROPERTY(numTextures, num_terrain_tex) - std::vector textureNames; GET_TERRAIN_PROPERTY(textureNames, textureNames) + num_terrain_tex = textureNames.size(); while (cur_terrain_tex < num_terrain_tex) { diff --git a/source/lib/sysdep/os/osx/dir_watch.cpp b/source/lib/sysdep/os/osx/dir_watch.cpp index b001d447fd..4e487c94c7 100644 --- a/source/lib/sysdep/os/osx/dir_watch.cpp +++ b/source/lib/sysdep/os/osx/dir_watch.cpp @@ -25,7 +25,7 @@ // stub implementations -LibError dir_watch_Add(const fs::wpath& UNUSED(path), PDirWatch& UNUSED(dirWatch)) +LibError dir_watch_Add(const NativePath& UNUSED(path), PDirWatch& UNUSED(dirWatch)) { return INFO::OK; }