diff options
| author | Alexander Gavrilov | 2012-08-27 23:03:02 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-08-27 23:03:02 +0400 |
| commit | f1915915b48395e9180c03dc8bf26f303eff877f (patch) | |
| tree | 14ca81ba53c7f444ebcd42c643f8be6da6e5720d /library | |
| parent | 5ad9b82ace4b0a1ef951e0e35d06f35aa88e8e41 (diff) | |
| download | dfhack-f1915915b48395e9180c03dc8bf26f303eff877f.tar.gz dfhack-f1915915b48395e9180c03dc8bf26f303eff877f.tar.bz2 dfhack-f1915915b48395e9180c03dc8bf26f303eff877f.tar.xz | |
Follow change in xml again.
Diffstat (limited to 'library')
| -rw-r--r-- | library/LuaApi.cpp | 4 | ||||
| -rw-r--r-- | library/include/modules/Maps.h | 2 | ||||
| -rw-r--r-- | library/modules/Maps.cpp | 3 | ||||
| m--------- | library/xml | 0 |
4 files changed, 5 insertions, 4 deletions
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp index 00d4c517..6dfb2f35 100644 --- a/library/LuaApi.cpp +++ b/library/LuaApi.cpp @@ -77,6 +77,7 @@ distribution. #include "df/job_material_category.h" #include "df/burrow.h" #include "df/building_civzonest.h" +#include "df/region_map_entry.h" #include <lua.h> #include <lauxlib.h> @@ -931,8 +932,7 @@ static int maps_getRegionBiome(lua_State *L) static int maps_getTileBiomeRgn(lua_State *L) { auto pos = CheckCoordXYZ(L, 1, true); - Lua::PushPosXY(L, Maps::getTileBiomeRgn(pos)); - return 1; + return Lua::PushPosXY(L, Maps::getTileBiomeRgn(pos)); } static const luaL_Reg dfhack_maps_funcs[] = { diff --git a/library/include/modules/Maps.h b/library/include/modules/Maps.h index e63eef73..e6e9682e 100644 --- a/library/include/modules/Maps.h +++ b/library/include/modules/Maps.h @@ -258,7 +258,7 @@ inline df::tile_occupancy *getTileOccupancy(df::coord pos) { /** * Returns biome info about the specified world region. */ -DFHACK_EXPORT df::world_data::T_region_map *getRegionBiome(df::coord2d rgn_pos); +DFHACK_EXPORT df::region_map_entry *getRegionBiome(df::coord2d rgn_pos); /** * Returns biome world region coordinates for the given tile within given block. diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp index 3ab156d7..4107680b 100644 --- a/library/modules/Maps.cpp +++ b/library/modules/Maps.cpp @@ -57,6 +57,7 @@ using namespace std; #include "df/builtin_mats.h" #include "df/block_square_event_grassst.h" #include "df/z_level_flags.h" +#include "df/region_map_entry.h" using namespace DFHack; using namespace df::enums; @@ -166,7 +167,7 @@ df::tile_occupancy *Maps::getTileOccupancy(int32_t x, int32_t y, int32_t z) return block ? &block->occupancy[x&15][y&15] : NULL; } -df::world_data::T_region_map *Maps::getRegionBiome(df::coord2d rgn_pos) +df::region_map_entry *Maps::getRegionBiome(df::coord2d rgn_pos) { auto data = world->world_data; if (!data) diff --git a/library/xml b/library/xml -Subproject 3fc2e1569ff19953d11b6ea651bc9b8ca832b8a +Subproject 328a8dbdc7d9e1e838798abf79861cc18a387e3 |
