fiddlerwoaroof/crawl - Change 4JJ6TWOZOPXBIOEQA2CXASS2TO5AMNXNY7LG67NXIVLDVJTJW6KAC

Fixed dead code in monstuff.cc [1783674, zelgadis]

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

Created by haranp on September 16, 2007

4JJ6TWOZOPXBIOEQA2CXASS2TO5AMNXNY7LG67NXIVLDVJTJW6KAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2219 [3.1396662]

B:BD[3.1468974] → [3.1468974:1469174]

B:BD[3.1469174] → [2.8731:8778]

∅:D[2.8778] → [3.1469227:1469755]

B:BD[3.1469227] → [3.1469227:1469755]

B:BD[3.1469755] → [2.8779:8830]

∅:D[2.8830] → [3.1469813:1469837]

B:BD[3.1469813] → [3.1469813:1469837]

B:BD[3.1469837] → [4.422176:422296]

∅:D[4.422296] → [3.1469916:1470087]

B:BD[3.1469916] → [3.1469916:1470087]

B:BD[3.1470087] → [4.422297:422439]

∅:D[4.422439] → [3.1470087:1470420]

B:BD[3.1470087] → [3.1470087:1470420]

        // XXX: We're being a bit player-centric here right now...
        // really we should replace the grid_distance() check
        // with one that checks for unaligned monsters as well. -- bwr
        if (monster->has_ench(ENCH_SUBMERGED))
        {
            if (grd[monster->x][monster->y] == DNGN_SHALLOW_WATER
                || grd[monster->x][monster->y] == DNGN_BLUE_FOUNTAIN
                || (!mons_friendly(monster) 
                    && grid_distance( monster->x, monster->y, 
                                      you.x_pos, you.y_pos ) == 1
                    && (monster->hit_points == monster->max_hit_points
                        || (monster->hit_points > monster->max_hit_points / 2
                            && coinflip()))))
            {
                monster->del_ench(ENCH_SUBMERGED);
            }
        }
        else if (monster_can_submerge(monster->type,
                                      grd[monster->x][monster->y])
                 && (one_chance_in(5) 
                     || (grid_distance( monster->x, monster->y, 
                                        you.x_pos, you.y_pos ) > 1
                            // FIXME This is better expressed as a function
                            // such as monster_has_ranged_attack:
                            && monster->type != MONS_ELECTRICAL_EEL
                            && monster->type != MONS_LAVA_SNAKE
                            && !one_chance_in(20))
                     || monster->hit_points <= monster->max_hit_points / 2)
                     || env.cgrid[monster->x][monster->y] != EMPTY_CLOUD)

[3.1468974]

[3.1470420]

        if (monster_can_submerge(monster->type, grd[monster->x][monster->y])
            && (one_chance_in(5) || (grid_distance( monster->x, monster->y, 
                                                    you.x_pos, you.y_pos ) > 1
                                     // FIXME This is better expressed as a
                                     // function such as
                                     // monster_has_ranged_attack:
                                     && monster->type != MONS_ELECTRICAL_EEL
                                     && monster->type != MONS_LAVA_SNAKE
                                     && !one_chance_in(20))
                || monster->hit_points <= monster->max_hit_points / 2)
            || env.cgrid[monster->x][monster->y] != EMPTY_CLOUD)