fiddlerwoaroof/crawl - Change 6GCY45KA5LDI722CIIRZDCIQ35QCVVLBTUTDSLYYIXNXPQ7EJZTAC

Code cleanups again, fix Twist.

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

Created by haranp on January 10, 2009

6GCY45KA5LDI722CIIRZDCIQ35QCVVLBTUTDSLYYIXNXPQ7EJZTAC

Dependencies

In channels

main

Change contents

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

B:BD[5.6768] → [5.6768:6801]

        cast_smiting(powc, spd);

[5.6768]

[6.326692]

        if (!cast_smiting(powc, beam.target))
            return (SPRET_ABORT);

Replacement in crawl-ref/source/spells4.cc at line 2037 [6.436250]

B:BD[6.512196] → [4.1641:1665]

        return (false);

[6.512196]

[6.512212]

        // This counts as a real cast, in order not to leak invisible
        // monster locations, and to allow victory-dancing.
        return (true);

Insertion in crawl-ref/source/spells4.cc at line 2044 [6.436250]

[4.1704]

[6.512219]

    // Identify mimics, if necessary.
    if (mons_is_mimic(m.type))
        m.flags |= MF_KNOWN_MIMIC;

Insertion in crawl-ref/source/spells4.cc at line 2064 [6.436250]
[4.1924]
[4.1924]
```
    if (mons_is_mimic(m.type))
        mimic_alert(&m);
```

Deletion in crawl-ref/source/spells3.h at line 18 [6.526814]

B:BD[6.527089] → [6.527089:527303]

// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spells1 - spells3
 * *********************************************************************** */

Deletion in crawl-ref/source/spells3.h at line 19 [6.526814]

∅:D[7.215] → [6.527355:527559]

B:BD[6.527355] → [6.527355:527559]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */

Deletion in crawl-ref/source/spells3.h at line 20 [6.526814]

∅:D[8.7834] → [6.527586:527790]

∅:D[9.146261] → [6.527586:527790]

B:BD[6.527586] → [6.527586:527790]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */

Deletion in crawl-ref/source/spells3.h at line 21 [6.526814]

B:BD[6.528074] → [6.528074:528308]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */
void cast_poison_ammo(void);

Replacement in crawl-ref/source/spells3.h at line 22 [6.526814]

B:BD[6.528309] → [6.528309:528521]

// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - spell
 * *********************************************************************** */

[6.528309]

[9.146296]

void cast_poison_ammo();

Replacement in crawl-ref/source/spells3.h at line 24 [6.526814]

∅:D[9.146337] → [6.528562:528776]

B:BD[6.528562] → [6.528562:528776]

B:BD[6.528776] → [10.814:851]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - spell
 * *********************************************************************** */
int cast_smiting(int power, dist &);

[9.146337]

[11.1572]

bool cast_smiting(int power, const coord_def& where);

Replacement in crawl-ref/source/spells3.h at line 26 [6.526814]
B:BD[11.1620] → [12.833:871]
```
void decrease_sanctuary_radius(void);
```
[11.1620]
[13.166]
```
void decrease_sanctuary_radius();
```
Replacement in crawl-ref/source/spells3.h at line 28 [6.526814]
B:BD[13.204] → [13.204:227]
```
int halo_radius(void);
```
[13.204]
[14.23697]
```
int halo_radius();
```
Replacement in crawl-ref/source/spells3.h at line 30 [6.526814]
∅:D[13.294] → [6.528806:528807]
∅:D[10.851] → [6.528806:528807]
∅:D[11.1652] → [6.528806:528807]
∅:D[14.23739] → [6.528806:528807]
∅:D[9.146367] → [6.528806:528807]
B:BD[6.528806] → [6.528806:528807]
B:BD[6.528808] → [6.528808:529036]
∅:D[15.215] → [6.529301:529516]
∅:D[16.237] → [6.529301:529516]
∅:D[17.455] → [6.529301:529516]
∅:D[18.482] → [6.529301:529516]
∅:D[19.516] → [6.529301:529516]
B:BD[6.529301] → [6.529301:529516]
```
// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */
bool project_noise(void);
// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: item_use - spell
 * *********************************************************************** */
```
[14.23739]
[6.529516]
```
bool project_noise();
```

Deletion in crawl-ref/source/spells3.h at line 32 [6.526814]

B:BD[6.529554] → [6.529554:529766]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: decks - spell
 * *********************************************************************** */

Replacement in crawl-ref/source/spells3.h at line 33 [6.526814]

∅:D[20.201] → [6.529785:529989]

B:BD[6.529785] → [6.529785:529989]

B:BD[6.529989] → [9.146368:146386]

∅:D[9.146386] → [6.530008:530222]

B:BD[6.530008] → [6.530008:530222]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */
int portal(void);
// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - spell
 * *********************************************************************** */

[20.201]

[6.530222]

int portal();

Deletion in crawl-ref/source/spells3.h at line 35 [6.526814]

B:BD[6.530255] → [6.530255:530470]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: item_use - spell
 * *********************************************************************** */

Deletion in crawl-ref/source/spells3.h at line 36 [6.526814]

B:BD[6.530508] → [6.530508:530712]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */

Deletion in crawl-ref/source/spells3.h at line 53 [6.526814]

B:BD[21.628] → [22.404:621]

// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - spell
 * *********************************************************************** */

Deletion in crawl-ref/source/spells3.h at line 59 [6.526814]

B:BD[22.855] → [22.855:1103]

// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - it_use3 - monstuff - mstuff2 - spell
 * *********************************************************************** */

Deletion in crawl-ref/source/spells3.h at line 62 [6.526814]

B:BD[22.1245] → [22.1245:1447]

// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */

Replacement in crawl-ref/source/spells3.h at line 67 [6.526814]

B:BD[6.530971] → [6.530971:531497]


// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - beam - decks - fight - item_use - spell
 * *********************************************************************** */
void you_teleport(void);
// updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - acr - decks - effects - fight - misc - spells
 * *********************************************************************** */

[6.530971]

[23.28091]

void you_teleport();

Replacement in crawl-ref/source/spells3.cc at line 187 [6.531613]
B:BD[6.536774] → [10.853:893]
```
int cast_smiting(int power, dist &beam)
```
[6.536774]
[6.536803]
```
bool cast_smiting(int power, const coord_def& where)
```

Replacement in crawl-ref/source/spells3.cc at line 189 [6.531613]

B:BD[6.536805] → [6.536805:536831]

    bool success = false;

[6.536805]

[6.536994]

    if (invalid_monster_index(mgrd(where)))
    {
        mpr("There's nothing there!");
        // Counts as a real cast, due to victory-dancing and
        // invisible/submerged monsters.
        return (true);
    }

Replacement in crawl-ref/source/spells3.cc at line 197 [6.531613]
B:BD[6.536995] → [14.23741:23796]
∅:D[24.227] → [6.537094:537133]
∅:D[14.23796] → [6.537094:537133]
B:BD[6.537094] → [6.537094:537133]
B:BD[6.537139] → [6.537139:537154]
B:BD[6.537154] → [14.23797:23851]
```
    if (mgrd(beam.target) == NON_MONSTER || beam.isMe)
        canned_msg(MSG_SPELL_FIZZLES);
    else
    {
        monsters *monster = &menv[mgrd(beam.target)];
```
[6.536995]
[6.537203]
```
    monsters& m = menv[mgrd(where)];
```

Replacement in crawl-ref/source/spells3.cc at line 199 [6.531613]

B:BD[6.537204] → [2.167:208]

∅:D[2.208] → [25.208:251]

B:BD[25.208] → [25.208:251]

        god_conduct_trigger conducts[3];
        disable_attack_conducts(conducts);

[6.537204]

[26.167]

    god_conduct_trigger conducts[3];
    disable_attack_conducts(conducts);

Replacement in crawl-ref/source/spells3.cc at line 202 [6.531613]

B:BD[26.168] → [27.167:229]

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

[26.168]

[28.187]

    const bool success = !stop_attack_prompt(&m, false, false);

Replacement in crawl-ref/source/spells3.cc at line 204 [6.531613]

B:BD[28.188] → [24.301:332]

B:BD[24.332] → [25.252:304]

        if (success)
        {
            set_attack_conducts(conducts, monster);

[28.188]

[27.280]

    if (success)
    {
        set_attack_conducts(conducts, &m);

Replacement in crawl-ref/source/spells3.cc at line 208 [6.531613]

∅:D[27.281] → [24.332:406]

B:BD[24.332] → [24.332:406]

            mprf("You smite %s!", monster->name(DESC_NOCAP_THE).c_str());

[27.281]

[29.167]

        mprf("You smite %s!", m.name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells3.cc at line 210 [6.531613]

B:BD[29.168] → [24.407:464]

B:BD[24.464] → [3.271:317]

∅:D[3.317] → [30.215:253]

B:BD[30.215] → [30.215:253]

∅:D[30.253] → [24.464:474]

B:BD[24.464] → [24.464:474]

            behaviour_event(monster, ME_ANNOY, MHITYOU);
            if (mons_is_mimic(monster->type))
                mimic_alert(monster);
        }

[29.168]

[31.570]

        behaviour_event(&m, ME_ANNOY, MHITYOU);
        if (mons_is_mimic(m.type))
            mimic_alert(&m);
    }

Replacement in crawl-ref/source/spells3.cc at line 215 [6.531613]
B:BD[31.571] → [25.305:347]
```
        enable_attack_conducts(conducts);
```
[31.571]
[6.537413]
```
    enable_attack_conducts(conducts);
```

Replacement in crawl-ref/source/spells3.cc at line 217 [6.531613]

B:BD[6.537414] → [24.475:686]

B:BD[24.686] → [32.1469:1569]

∅:D[32.1569] → [24.864:913]

B:BD[24.864] → [24.864:913]

        if (success)
        {
            // Maxes out at around 40 damage at 27 Invocations, which is
            // plenty in my book (the old max damage was around 70,
            // which seems excessive).
            monster->hurt(&you, 7 + (random2(power) * 33 / 191));
            if (monster->alive())
                print_wounds(monster);
        }

[6.537414]

[6.537571]

    if (success)
    {
        // Maxes out at around 40 damage at 27 Invocations, which is
        // plenty in my book (the old max damage was around 70,
        // which seems excessive).
        m.hurt(&you, 7 + (random2(power) * 33 / 191));
        if (m.alive())
            print_wounds(&m);