Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions library/include/df/custom/coord.methods.inc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coord(const coord2d &c, uint16_t _z) : x(c.x), y(c.y), z(_z) {}
coord(uint16_t _x, uint16_t _y, uint16_t _z) : x(_x), y(_y), z(_z) {}
coord(const coord2d &c, int16_t _z) : x(c.x), y(c.y), z(_z) {}
coord(int16_t _x, int16_t _y, int16_t _z) : x(_x), y(_y), z(_z) {}

operator coord2d() const { return coord2d(x,y); }

Expand Down
2 changes: 1 addition & 1 deletion library/modules/Maps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,7 @@ void Maps::addBlockColumns(int32_t new_height)
df::tiletype::OpenSpace);

// Set block positions properly (based on prior air layer)
air_block->map_pos = last_air_block->map_pos + df::coord{0, 0, uint16_t(count + 1)};
air_block->map_pos = last_air_block->map_pos + df::coord{0, 0, int16_t(count + 1)};
air_block->region_pos = last_air_block->region_pos;

// Copy other potentially important metadata from prior air
Expand Down
3 changes: 2 additions & 1 deletion plugins/filltraffic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ command_result restrictLiquid(color_ostream &out, std::vector<std::string> & par
command_result restrictIce(color_ostream &out, std::vector<std::string> & params);

//Forward Declarations for Utility Functions
constexpr auto coord_max = std::numeric_limits<decltype(DFCoord::x)>::max();
command_result setAllMatching(color_ostream &out, checkTile checkProc,
DFCoord minCoord = DFCoord(0, 0, 0),
DFCoord maxCoord = DFCoord(0xFFFF, 0xFFFF, 0xFFFF));
DFCoord maxCoord = DFCoord(coord_max, coord_max, coord_max));

void allHigh(DFCoord coord, MapExtras::MapCache & map);
void allNormal(DFCoord coord, MapExtras::MapCache & map);
Expand Down
2 changes: 1 addition & 1 deletion plugins/stonesense
Submodule stonesense updated 1 files
+6 −1 commonTypes.h
Loading