fiddlerwoaroof/crawl - Change IJ4GH6RYJYT4METQIJYT3IITJEHZ4IAF4WBPA5RH6RSYX4KHXMYAC

2058436: better interface for the range-1 attack spells.

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

Created by haranp on September 20, 2008

IJ4GH6RYJYT4METQIJYT3IITJEHZ4IAF4WBPA5RH6RSYX4KHXMYAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 934 [6.293070]

[4.1710]

[5.161]

beam_type _spell_to_beam_type(spell_type spell)
{
    switch (spell)
    {
    case SPELL_BURN: return BEAM_FIRE;
    case SPELL_FREEZE: return BEAM_COLD;
    case SPELL_CRUSH: return BEAM_MISSILE;
    case SPELL_ARC: return BEAM_ELECTRICITY;
    default: break;
    }
    return BEAM_NONE;
}

Replacement in crawl-ref/source/spl-cast.cc at line 964 [6.293070]
B:BD[7.129613] → [8.1842:1888]
```
    const int flags = get_spell_flags(spell);
```
[7.129613]
[9.207]
```
    const unsigned int flags = get_spell_flags(spell);
```

Replacement in crawl-ref/source/spl-cast.cc at line 972 [6.293070]

B:BD[10.5969] → [11.168:318]

B:BD[11.318] → [3.342:387]

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

[10.5969]

[10.6008]

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

Replacement in crawl-ref/source/spl-cast.cc at line 1117 [6.293070]
B:BD[6.316052] → [12.565:614]
```
    // Attack spells.
    // using burn_freeze()
```
[6.316052]
[12.614]
```
    // spells using burn_freeze()
```
Deletion in crawl-ref/source/spl-cast.cc at line 1119 [6.293070]
B:BD[12.635] → [12.635:717]
∅:D[12.717] → [6.316101:316117]
B:BD[6.316101] → [6.316101:316117]
```
        if (burn_freeze(powc, BEAM_FIRE) == -1)
            return (SPRET_ABORT);
        break;
```
Deletion in crawl-ref/source/spl-cast.cc at line 1120 [6.293070]
B:BD[12.741] → [12.741:823]
∅:D[12.823] → [6.316171:316187]
B:BD[6.316171] → [6.316171:316187]
```
        if (burn_freeze(powc, BEAM_COLD) == -1)
            return (SPRET_ABORT);
        break;
```
Deletion in crawl-ref/source/spl-cast.cc at line 1121 [6.293070]
B:BD[12.846] → [12.846:931]
∅:D[12.931] → [6.316266:316282]
B:BD[6.316266] → [6.316266:316282]
```
        if (burn_freeze(powc, BEAM_MISSILE) == -1)
            return (SPRET_ABORT);
        break;
```

Replacement in crawl-ref/source/spl-cast.cc at line 1122 [6.293070]

B:BD[12.952] → [12.952:1007]

        if (burn_freeze(powc, BEAM_ELECTRICITY) == -1)

[12.952]

[12.1007]

        if (!burn_freeze(powc, _spell_to_beam_type(spell),
                         mgrd(you.pos() + spd.delta)))
        {

Insertion in crawl-ref/source/spl-cast.cc at line 1126 [6.293070]
[12.1041]
[6.316600]
```
        }
```
Replacement in crawl-ref/source/spl-cast.cc at line 1128 [6.293070]
B:BD[6.316615] → [6.316615:316616]
[6.316615]
[12.1042]
```
        
```
Replacement in crawl-ref/source/spells2.h at line 28 [6.562867]
B:BD[6.564235] → [13.557:599]
```
char burn_freeze(int pow, beam_type b_f);
```
[6.564235]
[6.564272]
```
bool burn_freeze(int pow, beam_type flavour, int targetmon);
```
Replacement in crawl-ref/source/spells2.cc at line 822 [6.569242]
B:BD[6.596151] → [13.601:646]
```
char burn_freeze(int pow, beam_type flavour)
```
[6.596086]
[6.596191]
```
bool burn_freeze(int pow, beam_type flavour, int targetmon )
```
Deletion in crawl-ref/source/spells2.cc at line 824 [6.569242]
B:BD[6.596220] → [14.176:190]
∅:D[14.190] → [6.596297:596298]
B:BD[6.596297] → [6.596297:596298]
```
    dist spd;
```

Deletion in crawl-ref/source/spells2.cc at line 825 [6.569242]

B:BD[14.220] → [11.372:457]


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

Replacement in crawl-ref/source/spells2.cc at line 826 [6.569242]
B:BD[6.596335] → [11.458:480]
```
    if (!spd.isValid)
```
[6.596335]
[6.596366]
```
    if (targetmon == NON_MONSTER)
```
Deletion in crawl-ref/source/spells2.cc at line 828 [6.569242]
B:BD[6.596372] → [11.481:536]
∅:D[14.266] → [6.596468:596469]
∅:D[11.536] → [6.596468:596469]
∅:D[15.714] → [6.596468:596469]
∅:D[7.152154] → [6.596468:596469]
B:BD[6.596468] → [6.596468:596469]
B:BD[6.596469] → [11.537:628]
∅:D[11.628] → [6.596583:596584]
B:BD[6.596583] → [6.596583:596584]
B:BD[6.596584] → [2.32871:32920]
∅:D[16.242] → [17.5796:5797]
∅:D[11.685] → [17.5796:5797]
∅:D[2.32920] → [17.5796:5797]
B:BD[6.596968] → [17.5796:5797]
B:BD[17.5797] → [11.686:872]
```
        canned_msg(MSG_OK);
        return (-1);
    }
    if (spd.isMe)
    {
        canned_msg(MSG_UNTHINKING_ACT);
        return (-1);
    }
    const int mgr = mgrd(you.pos() + spd.delta);
    // Yes, this is strange, but it does maintain the original
    // behaviour.  Possibly to avoid giving information about invisible
    // monsters?
    if (mgr == NON_MONSTER)
    {
```

Replacement in crawl-ref/source/spells2.cc at line 829 [6.569242]

B:BD[11.923] → [11.923:943]

        return (0);

[11.923]

[6.596968]

        // If there's no monster there, you still pay the costs in
        // order to prevent locating invisible monsters, unless
        // you know that you see invisible.
        return (!player_see_invis(false));

Replacement in crawl-ref/source/spells2.cc at line 835 [6.569242]
B:BD[6.596975] → [18.1525:1561]
```
    monsters *monster = &menv[mgr];
```
[6.596975]
[6.597509]
```
    monsters *monster = &menv[targetmon];
```

Replacement in crawl-ref/source/spells2.cc at line 840 [6.569242]

B:BD[6.597539] → [19.399:462]

    bool success = !stop_attack_prompt(monster, false, false);

[6.597539]

[20.336]

    const bool success = !stop_attack_prompt(monster, false, false);

Insertion in crawl-ref/source/spells2.cc at line 863 [6.569242]
[21.2406]
[22.169]
```
        beam.thrower = KILL_YOU;
```

Insertion in crawl-ref/source/spells2.cc at line 866 [6.569242]

[21.2455]

[18.1891]

        hurted = mons_adjust_flavoured(monster, beam, hurted);
        monster->hurt(&you, hurted);

Replacement in crawl-ref/source/spells2.cc at line 869 [6.569242]
B:BD[18.1892] → [21.2456:2560]
∅:D[22.219] → [23.257:258]
∅:D[24.628] → [23.257:258]
∅:D[25.686] → [23.257:258]
∅:D[18.1924] → [23.257:258]
∅:D[21.2560] → [23.257:258]
B:BD[23.257] → [23.257:258]
∅:D[23.379] → [6.597658:597795]
B:BD[6.597658] → [6.597658:597795]
```
        if (flavour != BEAM_MISSILE)
            hurted = mons_adjust_flavoured(monster, beam, hurted);
        hurt_monster(monster, hurted);
        if (monster->hit_points < 1)
            monster_die(monster, KILL_YOU, 0);
        else
```
[18.1892]
[6.597795]
```
        if (monster->alive())
```

Replacement in crawl-ref/source/spells2.cc at line 875 [6.569242]

B:BD[6.597893] → [21.2561:2626]

∅:D[21.2626] → [23.447:500]

B:BD[23.447] → [23.447:500]

                if (mons_class_flag(monster->type, M_COLD_BLOOD)
                    && coinflip())
                {

[6.597893]

[26.4119]

                if (mons_class_flag(monster->type, M_COLD_BLOOD) && coinflip())

Deletion in crawl-ref/source/spells2.cc at line 877 [6.569242]
∅:D[26.4169] → [23.501:519]
B:BD[6.598024] → [23.501:519]
```
                }
```
Replacement in crawl-ref/source/spells2.cc at line 888 [6.569242]
B:BD[6.598322] → [14.695:711]
```
    return (1);
```
[6.598322]
[27.559]
```
    return (success);
```
Replacement in crawl-ref/source/misc.cc at line 2677 [6.1933596]
B:BD[21.5364] → [28.5585:5609]
```
    if (you.confused())
```
[21.5364]
[28.5609]
```
    if (you.confused() || !you.can_see(mon))
```

2058436: better interface for the range-1 attack spells.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 934 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 964 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 972 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1117 [6.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1119 [6.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1120 [6.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1121 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1122 [6.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 1126 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1128 [6.293070]

Replacement in crawl-ref/source/spells2.h at line 28 [6.562867]

Replacement in crawl-ref/source/spells2.cc at line 822 [6.569242]

Deletion in crawl-ref/source/spells2.cc at line 824 [6.569242]

Deletion in crawl-ref/source/spells2.cc at line 825 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 826 [6.569242]

Deletion in crawl-ref/source/spells2.cc at line 828 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 829 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 835 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 840 [6.569242]

Insertion in crawl-ref/source/spells2.cc at line 863 [6.569242]

Insertion in crawl-ref/source/spells2.cc at line 866 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 869 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 875 [6.569242]

Deletion in crawl-ref/source/spells2.cc at line 877 [6.569242]

Replacement in crawl-ref/source/spells2.cc at line 888 [6.569242]

Replacement in crawl-ref/source/misc.cc at line 2677 [6.1933596]