fiddlerwoaroof/crawl - Change G725PD3HGAFFFQ3SKJ7E2O6I422Y54HSDFVVBM2QGLC26TGQXWEAC

Fixed bug where Pan lords were not getting their spells loaded. This

was because spell loading was happening before spell creation. Now it gets loaded twice, which is slightly inefficient, but who cares.

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

Created by haranp on January 17, 2007

G725PD3HGAFFFQ3SKJ7E2O6I422Y54HSDFVVBM2QGLC26TGQXWEAC

Dependencies

[2] K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC

In channels

main

Change contents

Replacement in crawl-ref/source/files.cc at line 1917 [2.3084589]

B:BD[2.3133423] → [2.3133423:3133474]

        ghost.values[ GVAL_BRAND ] = random2(17);

[2.3133423]

[2.3133474]

        do {
            ghost.values[ GVAL_BRAND ] = random2(17);

Replacement in crawl-ref/source/files.cc at line 1920 [2.3084589]

B:BD[2.3133530] → [2.3133530:3133969]

        if (ghost.values[ GVAL_BRAND ] == SPWPN_HOLY_WRATH 
            || ghost.values[ GVAL_BRAND ] == SPWPN_ORC_SLAYING
            || ghost.values[ GVAL_BRAND ] == SPWPN_PROTECTION 
            || ghost.values[ GVAL_BRAND ] == SPWPN_FLAME 
            || ghost.values[ GVAL_BRAND ] == SPWPN_FROST 
            || ghost.values[ GVAL_BRAND ] == SPWPN_DISRUPTION)
        {
            ghost.values[ GVAL_BRAND ] = SPWPN_SPEED;
        }

[2.3133530]

[2.3133969]

        } while (ghost.values[ GVAL_BRAND ] == SPWPN_HOLY_WRATH 
                 || ghost.values[ GVAL_BRAND ] == SPWPN_ORC_SLAYING
                 || ghost.values[ GVAL_BRAND ] == SPWPN_PROTECTION 
                 || ghost.values[ GVAL_BRAND ] == SPWPN_FLAME 
                 || ghost.values[ GVAL_BRAND ] == SPWPN_FROST 
                 || ghost.values[ GVAL_BRAND ] == SPWPN_DISRUPTION);

Insertion in crawl-ref/source/files.cc at line 1963 [2.3084589]

[2.3135531]

        mpr("making pan lord spells");
#define RANDOM_ARRAY_ELEMENT(x) x[random2(sizeof(x) / sizeof(x[0]))]

Replacement in crawl-ref/source/files.cc at line 1967 [2.3084589]

B:BD[2.3135555] → [2.3135555:3135869]

        {
            for (;;)
            {
                if (one_chance_in(3))
                    break;
                ghost.values[ GVAL_SPELL_1 ] = search_order_conj[i];
                i++;
                if (search_order_conj[i] == SPELL_NO_SPELL)
                    break;
            }
        }

[2.3135555]

[2.3135869]

            ghost.values[GVAL_SPELL_1]=RANDOM_ARRAY_ELEMENT(search_order_conj);

Insertion in crawl-ref/source/files.cc at line 1969 [2.3084589]
[2.3135870]
[2.3135870]
```
        // Might duplicate the first spell, but that isn't a problem.
```

Replacement in crawl-ref/source/files.cc at line 1971 [2.3084589]

B:BD[2.3135894] → [2.3135894:3136186]

        {
            for (;;)
            {
                if (one_chance_in(3))
                    break;
                ghost.values[ GVAL_SPELL_2 ] = search_order_conj[i];
                if (search_order_conj[i] == SPELL_NO_SPELL)
                    break;
            }
        }

[2.3135894]

[2.3136186]

            ghost.values[GVAL_SPELL_2]=RANDOM_ARRAY_ELEMENT(search_order_conj);

Replacement in crawl-ref/source/files.cc at line 1974 [2.3084589]

B:BD[2.3136218] → [2.3136218:3136533]

        {
            for (;;)
            {
                if (one_chance_in(3))
                    break;
                ghost.values[ GVAL_SPELL_3 ] = search_order_third[i];
                i++;
                if (search_order_third[i] == SPELL_NO_SPELL)
                    break;
            }
        }

[2.3136218]

[2.3136533]

            ghost.values[GVAL_SPELL_3]=RANDOM_ARRAY_ELEMENT(search_order_third);

Replacement in crawl-ref/source/files.cc at line 1977 [2.3084589]

B:BD[2.3136558] → [2.3136558:3136871]

        {
            for (;;)
            {
                if (one_chance_in(3))
                    break;
                ghost.values[ GVAL_SPELL_4 ] = search_order_misc[i];
                i++;
                if (search_order_misc[i] == SPELL_NO_SPELL)
                    break;
            }
        }

[2.3136558]

[2.3136871]

            ghost.values[GVAL_SPELL_4]=RANDOM_ARRAY_ELEMENT(search_order_misc);

Replacement in crawl-ref/source/files.cc at line 1980 [2.3084589]

B:BD[2.3136896] → [2.3136896:3137096]

        {
            for(;;)
            {
                if (one_chance_in(3))
                    break;
                ghost.values[ GVAL_SPELL_5 ] = search_order_misc[i];
                i++;

[2.3136896]

[2.3137096]

            ghost.values[GVAL_SPELL_5]=RANDOM_ARRAY_ELEMENT(search_order_misc);

Replacement in crawl-ref/source/files.cc at line 1982 [2.3084589]

B:BD[2.3137097] → [2.3137097:3137208]

                if (search_order_misc[i] == SPELL_NO_SPELL)
                    break;
            }
        }

[2.3137097]

[2.3137208]

#undef RANDOM_ARRAY_ELEMENT

Replacement in crawl-ref/source/files.cc at line 2024 [2.3084589]
B:BD[2.3138840] → [2.3138840:3138888]
```
        if (ghost.values[17] == SPELL_NO_SPELL)
```
[2.3138840]
[2.3138888]
```
        if (ghost.values[GVAL_SPELL_4] == SPELL_NO_SPELL)
```
Insertion in crawl-ref/source/files.cc at line 2029 [2.3084589]
[2.3139027]
[2.3139027]
```
        mons_load_spells(&menv[rdem], MST_GHOST);
```