fiddlerwoaroof/crawl - Change HQXDLVLTDTWKB5OY5DKOLMY6PFXL7HHWVRM5FIW4FOX3RBRQP44AC

Players never got caught in nets thrown by monsters -> fixed

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

Created by j-p-e-g on August 30, 2007

HQXDLVLTDTWKB5OY5DKOLMY6PFXL7HHWVRM5FIW4FOX3RBRQP44AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/beam.cc at line 2398 [4.4128068]

[3.4435]

[2.2636]

        // nobody there
        if (you.x_pos != x && you.y_pos != y && mgrd[x][y] == NON_MONSTER)
            return;
            
        // player or monster on position but hasn't been caught

Replacement in crawl-ref/source/beam.cc at line 2404 [4.4128068]

∅:D[2.2710] → [3.4511:4591]

B:BD[3.4511] → [3.4511:4591]

            || mgrd[x][y] == NON_MONSTER || !mons_is_caught(&menv[mgrd[x][y]]))

[2.2710]

[3.4591]

            || mgrd[x][y] != NON_MONSTER && !mons_is_caught(&menv[mgrd[x][y]]))

Insertion in crawl-ref/source/beam.cc at line 2409 [4.4128068]

[3.4640]

        // somebody on square who HAS been caught, maybe by this net?