fiddlerwoaroof/crawl - Change HSHTFTGAWBWARTWJ5QNCCSQBNOODVSQBU4MXFBV3EKGJSQ77QZJAC

Fix [2011576]: The "Which direction?" prompt is no longer given twice

for spells that are wrappers around burn_freeze() (e.g. Freeze).

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

Created by dolorous on July 6, 2008

HSHTFTGAWBWARTWJ5QNCCSQBNOODVSQBU4MXFBV3EKGJSQ77QZJAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 999 [5.293070]

B:BD[3.5969] → [4.161:238]

    if ((flags & SPFLAG_TARGETING_MASK) && spell != SPELL_PORTAL_PROJECTILE)

[3.5969]

[3.6008]

    if ((flags & SPFLAG_TARGETING_MASK)
        && spell != SPELL_BURN && spell != SPELL_FREEZE
        && spell != SPELL_CRUSH && spell != SPELL_ARC
        && spell != SPELL_PORTAL_PROJECTILE)

Insertion in crawl-ref/source/spells2.cc at line 890 [5.569242]

[2.220]

[5.596334]


    mpr("Which direction?", MSGCH_PROMPT);
    direction(spd, DIR_DIR, TARG_ENEMY);

Replacement in crawl-ref/source/spells2.cc at line 894 [5.569242]
B:BD[5.596335] → [5.596335:596366]
```
    while (mgr == NON_MONSTER)
```
[5.596335]
[5.596366]
```
    if (!spd.isValid)
```

Replacement in crawl-ref/source/spells2.cc at line 896 [5.569242]

B:BD[5.596372] → [5.596372:596419]

B:BD[5.596419] → [2.221:266]

        mpr("Which direction?", MSGCH_PROMPT);
        direction(spd, DIR_DIR, TARG_ENEMY);

[5.596372]

[5.596468]

        canned_msg(MSG_OK);
        return (-1);
    }

Replacement in crawl-ref/source/spells2.cc at line 900 [5.569242]
B:BD[5.596469] → [2.267:293]
∅:D[2.293] → [5.596497:596507]
B:BD[5.596497] → [5.596497:596507]
B:BD[5.596507] → [6.152155:152187]
B:BD[6.152187] → [2.294:319]
∅:D[2.319] → [5.596573:596583]
B:BD[5.596573] → [5.596573:596583]
```
        if (!spd.isValid)
        {
            canned_msg(MSG_OK);
            return (-1);
        }
```
[5.596469]
[5.596583]
```
    if (spd.isMe)
    {
        canned_msg(MSG_UNTHINKING_ACT);
        return (-1);
    }
```
Replacement in crawl-ref/source/spells2.cc at line 906 [5.569242]
B:BD[5.596584] → [2.320:342]
∅:D[2.342] → [5.596608:596662]
B:BD[5.596608] → [5.596608:596662]
B:BD[5.596662] → [2.343:368]
∅:D[2.368] → [5.596685:596696]
B:BD[5.596685] → [5.596685:596696]
B:BD[5.596696] → [2.369:429]
∅:D[2.429] → [5.596760:596761]
B:BD[5.596760] → [5.596760:596761]
B:BD[5.596761] → [2.430:594]
∅:D[7.247] → [5.596838:596935]
∅:D[2.594] → [5.596838:596935]
∅:D[8.18333] → [5.596838:596935]
B:BD[5.596838] → [5.596838:596935]
B:BD[5.596935] → [2.595:619]
∅:D[2.619] → [5.596958:596968]
∅:D[6.152210] → [5.596958:596968]
B:BD[5.596958] → [5.596958:596968]
```
        if (spd.isMe)
        {
            canned_msg(MSG_UNTHINKING_ACT);
            return (-1);
        }
        mgr = mgrd[you.x_pos + spd.dx][you.y_pos + spd.dy];
        // Yes, this is strange, but it does maintain the original
        // behaviour.  Possibly to avoid giving information about
        // invisible monsters?
        if (mgr == NON_MONSTER)
        {
            mpr("There isn't anything close enough!");
            return (0);
        }
```
[5.596584]
[9.5796]
```
    mgr = mgrd[you.x_pos + spd.dx][you.y_pos + spd.dy];
```

Replacement in crawl-ref/source/spells2.cc at line 908 [5.569242]

B:BD[9.5797] → [2.620:669]

∅:D[2.669] → [9.5852:5916]

B:BD[9.5852] → [9.5852:5916]

B:BD[9.5916] → [2.670:694]

∅:D[2.694] → [9.5938:5948]

B:BD[9.5938] → [9.5938:5948]

        if (trans_wall_blocking(spd.tx, spd.ty))
        {
            mpr("A translucent wall is in the way.");
            return (0);
        }

[9.5797]

[5.596968]

    // Yes, this is strange, but it does maintain the original
    // behaviour.  Possibly to avoid giving information about invisible
    // monsters?
    if (mgr == NON_MONSTER)
    {
        mpr("There isn't anything close enough!");
        return (0);