fiddlerwoaroof/crawl - Change 7DLDFEEB5IHCPN5VL2BBI7JM6SJB6M6FTYM2DMM6R6QV33COOA6QC

Fix broken sewer messaging (dpeg).

Fixed bad bounds checks for minivaults placed by dgn_place_map.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7716 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on December 1, 2008

7DLDFEEB5IHCPN5VL2BBI7JM6SJB6M6FTYM2DMM6R6QV33COOA6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/maps.h at line 26 [4.2007036]

B:BD[3.423] → [3.423:495]

void fit_region_into_map_bounds(coord_def &pos, const coord_def &size);

[3.423]

[3.495]

void fit_region_into_map_bounds(coord_def &pos, const coord_def &size,
                                int margin = 0);

Replacement in crawl-ref/source/maps.cc at line 198 [4.2007666]

B:BD[5.2524] → [3.638:709]

void fit_region_into_map_bounds(coord_def &pos, const coord_def &size)

[5.2524]

[3.709]

void fit_region_into_map_bounds(coord_def &pos, const coord_def &size,
                                int margin)

Replacement in crawl-ref/source/maps.cc at line 201 [4.2007666]

B:BD[3.711] → [3.711:1023]

    ASSERT(size.x <= GXM && size.y <= GYM);
    if (pos.x < X_BOUND_1)
        pos.x = X_BOUND_1;
    if (pos.y < Y_BOUND_1)
        pos.y = Y_BOUND_1;
    if (pos.x + size.x - 1 > X_BOUND_2)
        pos.x = X_BOUND_2 - size.x + 1;
    if (pos.y + size.y - 1 > Y_BOUND_2)
        pos.y = Y_BOUND_2 - size.y + 1;

[3.711]

[3.1023]

    const int X_1(X_BOUND_1 + margin);
    const int X_2(X_BOUND_2 - margin);
    const int Y_1(Y_BOUND_1 + margin);
    const int Y_2(Y_BOUND_2 - margin);
    ASSERT(size.x <= (X_2 - X_1 + 1) && size.y <= (Y_2 - Y_1 + 1));
    if (pos.x < X_1)
        pos.x = X_1;
    if (pos.y < Y_1)
        pos.y = Y_1;
    if (pos.x + size.x - 1 > X_2)
        pos.x = X_2 - size.x + 1;
    if (pos.y + size.y - 1 > Y_2)
        pos.y = Y_2 - size.y + 1;

Replacement in crawl-ref/source/dungeon.cc at line 3714 [4.3429798]

B:BD[3.3731] → [3.3731:3783]

        fit_region_into_map_bounds(tl, place.size);

[3.3731]

[6.80950]

        fit_region_into_map_bounds(tl, place.size, 1);

Replacement in crawl-ref/source/dat/clua/lm_tmsg.lua at line 37 [8.28064]

B:BD[7.6606] → [7.6606:6665]

  self.entity = tmarker.props.entity or tmarker.props.desc

[7.6606]

[2.3161]

  self.entity = self.entity or tmarker.props.entity or tmarker.props.desc

Replacement in crawl-ref/source/dat/clua/lm_tmsg.lua at line 144 [8.28064]

B:BD[2.4353] → [2.4353:4416]

  local noisemaker = self:range_adjective(cm, self.noisemaker)

[2.4353]

[7.7618]

  local noisemaker =
    self.noisemaker and self:range_adjective(cm, self.noisemaker)