fiddlerwoaroof/crawl - Change DO6W27HYFNVFMX7FSGG4RCX5UW32ORCVYZBQYPCUD4VCHMA4LFFQC

* Fix compilation for Tiles.

Make several of the old uniques appear earlier.

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

Created by j-p-e-g on June 3, 2009

DO6W27HYFNVFMX7FSGG4RCX5UW32ORCVYZBQYPCUD4VCHMA4LFFQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-book.cc at line 1429 [4.397614]
[3.4602]
[3.4602]
```
    {
```
Insertion in crawl-ref/source/spl-book.cc at line 1432 [4.397614]
[3.4740]
[3.4740]
```
    }
```
Insertion in crawl-ref/source/spl-book.cc at line 1434 [4.397614]
[3.4760]
[3.4760]
```
    {
```
Insertion in crawl-ref/source/spl-book.cc at line 1438 [4.397614]
[3.4954]
[3.4954]
```
    }
```
Insertion in crawl-ref/source/spl-book.cc at line 1440 [4.397614]
[3.4978]
[3.4978]
```
    {
```
Insertion in crawl-ref/source/spl-book.cc at line 1444 [4.397614]
[3.5187]
[3.5187]
```
    }
```
Replacement in crawl-ref/source/spl-book.cc at line 1499 [4.397614]
B:BD[3.7025] → [3.7025:7027]
```
 
```
[3.7025]
[3.7027]

Replacement in crawl-ref/source/overmap.cc at line 236 [4.1070017]

B:BD[5.5017] → [5.5017:5149]

    for ( ci_portals = portal_vaults_present.begin();
          ci_portals != portal_vaults_present.end();
          ++ci_portals )

[5.5017]

[5.5149]

    for (ci_portals = portal_vaults_present.begin();
         ci_portals != portal_vaults_present.end(); ++ci_portals)

Replacement in crawl-ref/source/overmap.cc at line 254 [4.1070017]

B:BD[5.5588] → [5.5588:5732]

        for ( ci_portals = portal_vaults_present.begin();
              ci_portals != portal_vaults_present.end();
              ++ci_portals )

[5.5588]

[5.5732]

        for (ci_portals = portal_vaults_present.begin();
             ci_portals != portal_vaults_present.end(); ++ci_portals)

Replacement in crawl-ref/source/overmap.cc at line 260 [4.1070017]

B:BD[5.5942] → [5.5942:6002]

            if ( ci_portals->second == vault_names_vec[i] )

[5.5942]

[5.6002]

            if (ci_portals->second == vault_names_vec[i])

Replacement in crawl-ref/source/overmap.cc at line 262 [4.1070017]

B:BD[5.6016] → [5.6016:6062]

                if ( last_id.depth == 10000 )

[5.6016]

[5.6062]

                if (last_id.depth == 10000)

Replacement in crawl-ref/source/overmap.cc at line 277 [4.1070017]
B:BD[6.2962] → [6.2962:3000]
```
                if ( lid == last_id )
```
[6.2962]
[6.3000]
```
                if (lid == last_id)
```
Replacement in crawl-ref/source/overmap.cc at line 303 [4.1070017]
B:BD[5.6798] → [5.6798:6836]
```
        if ( last_id.depth != 10000 )
```
[5.6798]
[5.6836]
```
        if (last_id.depth != 10000)
```
Replacement in crawl-ref/source/overmap.cc at line 322 [4.1070017]
∅:D[7.2998] → [8.9542:9603]
B:BD[8.9542] → [8.9542:9603]
```
        if ( stair_level.find(branch) != stair_level.end() )
```
[7.2998]
[4.1073620]
```
        if (stair_level.find(branch) != stair_level.end())
```
Replacement in crawl-ref/source/overmap.cc at line 324 [4.1070017]
B:BD[4.1073630] → [8.9604:9636]
```
            if ( !branchcount )
```
[4.1073630]
[4.1074478]
```
            if (!branchcount)
```

Replacement in crawl-ref/source/overmap.cc at line 328 [4.1070017]

B:BD[9.428] → [10.2680:2749]

                    disp += " (use <white>G</white> to reach them)";

[9.428]

[9.502]

                {
                    disp += " (use <white>G</white> to reach them and "
                            "<white>?/B</white> for more information)";
                }

Replacement in crawl-ref/source/overmap.cc at line 348 [4.1070017]
B:BD[8.10144] → [8.10144:10188]
```
    if ( branchcount && (branchcount % 4) )
```
[8.10144]
[11.221]
```
    if (branchcount && (branchcount % 4))
```
Replacement in crawl-ref/source/overmap.cc at line 357 [4.1070017]
B:BD[8.10291] → [12.4508:4543]
```
    if ( !notable_altars.empty() )
```
[8.10291]
[8.10326]
```
    if (!notable_altars.empty())
```

Replacement in crawl-ref/source/overmap.cc at line 361 [4.1070017]

B:BD[9.643] → [9.643:719]

            disp += " (use <white>Ctrl-F \"altar\"</white> to reach them)";

[9.643]

[9.719]

        {
            disp += " (use <white>Ctrl-F \"altar\"</white> to reach them and "
                    "<white>?/G</white> for information about gods)";
        }

Replacement in crawl-ref/source/overmap.cc at line 371 [4.1070017]
∅:D[13.6810] → [8.10505:10573]
B:BD[8.10505] → [8.10505:10573]
```
    for ( int cur_god = GOD_NO_GOD; cur_god < NUM_GODS; ++cur_god )
```
[13.6810]
[8.10573]
```
    for (int cur_god = GOD_NO_GOD; cur_god < NUM_GODS; ++cur_god)
```
Insertion in crawl-ref/source/overmap.cc at line 373 [4.1070017]
[8.10579]
[8.10579]
```
        if (cur_god == you.religion)
            continue;
```
Insertion in crawl-ref/source/overmap.cc at line 377 [4.1070017]
[8.10651]
[8.10651]
Deletion in crawl-ref/source/overmap.cc at line 380 [4.1070017]
B:BD[8.10763] → [8.10763:10824]
```
        if ( cur_god == you.religion )
            continue;
```

Replacement in crawl-ref/source/overmap.cc at line 381 [4.1070017]

B:BD[4.1076468] → [12.4544:4641]

∅:D[12.4641] → [8.10922:10949]

B:BD[8.10922] → [8.10922:10949]

        for ( ci_altar = notable_altars.begin();
              ci_altar != notable_altars.end();
              ++ci_altar )

[4.1076468]

[8.10949]

        for (ci_altar = notable_altars.begin();
             ci_altar != notable_altars.end(); ++ci_altar)

Replacement in crawl-ref/source/overmap.cc at line 384 [4.1070017]
B:BD[8.10959] → [8.10959:11007]
```
            if ( ci_altar->second == real_god )
```
[8.10959]
[4.1076623]
```
            if (ci_altar->second == real_god)
```
Replacement in crawl-ref/source/overmap.cc at line 386 [4.1070017]
B:BD[4.1076637] → [8.11008:11054]
```
                if ( last_id.depth == 10000 )
```
[4.1076637]
[4.1076809]
```
                if (last_id.depth == 10000)
```

Replacement in crawl-ref/source/overmap.cc at line 394 [4.1070017]

B:BD[4.1080152] → [8.11247:11304]

                    if ( last_id == ci_altar->first.id )

[4.1080152]

[8.11304]

                    if (last_id == ci_altar->first.id)

Replacement in crawl-ref/source/overmap.cc at line 405 [4.1070017]
B:BD[4.1080449] → [8.11570:11608]
```
        if ( last_id.depth != 10000 )
```
[4.1080449]
[11.291]
```
        if (last_id.depth != 10000)
```

Replacement in crawl-ref/source/overmap.cc at line 427 [4.1070017]

∅:D[14.770] → [8.11878:11988]

B:BD[8.11878] → [8.11878:11988]

    for ( ci_shops = shops_present.begin();
          ci_shops != shops_present.end();
          ++ci_shops )

[14.770]

[4.1082499]

    for (ci_shops = shops_present.begin();
         ci_shops != shops_present.end(); ++ci_shops)

Replacement in crawl-ref/source/overmap.cc at line 430 [4.1070017]
B:BD[4.1082505] → [8.11989:12034]
```
        if ( ci_shops->first.id != last_id )
```
[4.1082505]
[4.1082681]
```
        if (ci_shops->first.id != last_id)
```
Replacement in crawl-ref/source/overmap.cc at line 432 [4.1070017]
B:BD[4.1082691] → [14.771:815]
```
            if ( column_count > maxcolumn )
```
[4.1082691]
[8.12065]
```
            if (column_count > maxcolumn)
```
Replacement in crawl-ref/source/overmap.cc at line 437 [4.1070017]
B:BD[8.12438] → [14.881:923]
```
            else if ( column_count != 0 )
```
[8.12438]
[14.923]
```
            else if (column_count != 0)
```

Replacement in crawl-ref/source/overmap.cc at line 462 [4.1070017]

B:BD[8.12755] → [5.6886:6956]

    if ( !portals_present.empty() || !portal_vaults_present.empty() )

[8.12755]

[8.12791]

    if (!portals_present.empty() || !portal_vaults_present.empty())

Replacement in crawl-ref/source/mon-data.h at line 4034 [4.1826214]
B:BD[15.12837] → [15.12837:12894]
```
    500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, 90,
```
[15.12837]
[15.12894]
```
    500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -9,
```
Replacement in crawl-ref/source/mon-data.h at line 4068 [4.1826214]
B:BD[15.14121] → [15.14121:14170]
```
    600, 12, MONS_ORC, MONS_ORC, MH_NATURAL, 50,
```
[15.14121]
[15.14170]
```
    600, 12, MONS_ORC, MONS_ORC, MH_NATURAL, -5,
```

Replacement in crawl-ref/source/mon-data.h at line 4080 [4.1826214]

B:BD[15.14568] → [15.14568:14703]

    600, 15, MONS_ORC, MONS_ORC, MH_NATURAL, -3,
    { {AT_HIT, AF_PLAIN, 32}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
    { 15, 4, 7, 0 },

[15.14568]

[15.14703]

    600, 15, MONS_ORC, MONS_ORC, MH_NATURAL, -4,
    { {AT_HIT, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
    { 18, 4, 7, 20 },

Replacement in crawl-ref/source/item_use.cc at line 5556 [4.2781507]
∅:D[16.11149] → [17.7554:7588]
B:BD[17.7554] → [17.7554:7588]
```
                learn_spell(idx);
```
[16.11149]
[18.5389]
```
                learn_spell(); // offers all spells, might not be what we want
```

Replacement in crawl-ref/source/dungeon.cc at line 3263 [4.3429798]

B:BD[19.3496] → [2.2809:2884]

                            MONS_MICHAEL, MONS_EUSTACHIO, MONS_SONJA, -1);

[19.3496]

[19.3543]

                            MONS_MICHAEL, MONS_EUSTACHIO, MONS_SONJA,
                            MONS_JOSEPH, MONS_ERICA, MONS_JOSEPHINE,
                            MONS_HAROLD, MONS_NORBERT, MONS_JOZEF, -1);

Replacement in crawl-ref/source/dungeon.cc at line 3268 [4.3429798]

B:BD[19.3585] → [19.3585:3732]

B:BD[19.3732] → [2.2885:3026]

        ret = random_choose(MONS_URUG, MONS_MICHAEL, MONS_JOSEPH, MONS_SNORG,
                            MONS_ERICA, MONS_JOSEPHINE, MONS_HAROLD,
                            MONS_NORBERT, MONS_JOZEF, MONS_EUSTACHIO,
                            MONS_SONJA, MONS_AZRAEL, MONS_NESSOS, -1);

[19.3585]

[19.3791]

        ret = random_choose(MONS_URUG, MONS_MICHAEL, MONS_EUSTACHIO, MONS_SONJA,
                            MONS_SNORG, MONS_ERICA, MONS_JOSEPHINE, MONS_HAROLD,
                            MONS_ROXANNE, MONS_RUPERT, MONS_NORBERT, MONS_JOZEF,
                            MONS_AZRAEL, MONS_NESSOS, MONS_AGNES,
                            MONS_MAUD, MONS_LOUISE, MONS_NERGALLE, -1);

Replacement in crawl-ref/source/dungeon.cc at line 3275 [4.3429798]

B:BD[19.3833] → [19.3833:4060]

        ret = random_choose(MONS_SNORG, MONS_ERICA, MONS_JOSEPHINE,
                            MONS_HAROLD, MONS_NORBERT, MONS_JOZEF, MONS_AGNES,
                            MONS_MAUD, MONS_LOUISE, MONS_FRANCIS, MONS_FRANCES,

[19.3833]

[2.3027]

        ret = random_choose(MONS_SNORG, MONS_LOUISE, MONS_FRANCIS, MONS_FRANCES,
                            MONS_RUPERT, MONS_WAYNE, MONS_DUANE, MONS_NORRIS,

Replacement in crawl-ref/source/dungeon.cc at line 3282 [4.3429798]

B:BD[19.4147] → [19.4147:4365]

B:BD[19.4365] → [2.3161:3230]

∅:D[2.3230] → [20.5170:5220]

B:BD[15.24963] → [20.5170:5220]

        ret = random_choose(MONS_LOUISE, MONS_FRANCIS, MONS_FRANCES,
                            MONS_RUPERT, MONS_WAYNE, MONS_DUANE, MONS_XTAHUA,
                            MONS_NORRIS, MONS_FREDERICK, MONS_MARGERY,
                            MONS_BORIS, MONS_NERGALLE, MONS_ROXANNE,
                            MONS_SAINT_ROKA, -1);

[19.4147]

[19.4410]

        ret = random_choose(MONS_FRANCIS, MONS_FRANCES, MONS_WAYNE, MONS_DUANE,
                            MONS_XTAHUA, MONS_NORRIS, MONS_FREDERICK,
                            MONS_MARGERY, MONS_BORIS, MONS_SAINT_ROKA, -1);

* Fix compilation for Tiles.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-book.cc at line 1429 [4.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1432 [4.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1434 [4.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1438 [4.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1440 [4.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1444 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1499 [4.397614]

Replacement in crawl-ref/source/overmap.cc at line 236 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 254 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 260 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 262 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 277 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 303 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 322 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 324 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 328 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 348 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 357 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 361 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 371 [4.1070017]

Insertion in crawl-ref/source/overmap.cc at line 373 [4.1070017]

Insertion in crawl-ref/source/overmap.cc at line 377 [4.1070017]

Deletion in crawl-ref/source/overmap.cc at line 380 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 381 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 384 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 386 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 394 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 405 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 427 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 430 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 432 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 437 [4.1070017]

Replacement in crawl-ref/source/overmap.cc at line 462 [4.1070017]

Replacement in crawl-ref/source/mon-data.h at line 4034 [4.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4068 [4.1826214]

Replacement in crawl-ref/source/mon-data.h at line 4080 [4.1826214]

Replacement in crawl-ref/source/item_use.cc at line 5556 [4.2781507]

Replacement in crawl-ref/source/dungeon.cc at line 3263 [4.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3268 [4.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3275 [4.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3282 [4.3429798]