fiddlerwoaroof/crawl - Change 4SUUJM2DQUEWHDG3UKJUDZABLHFVF2CFUX5GVAWKT7BBBGR2ISTQC

Added rock worm and transparent wall tiles from Denzi.

Added blood splatter. More tile code cleanup.

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

Created by ennewalker on January 19, 2008

4SUUJM2DQUEWHDG3UKJUDZABLHFVF2CFUX5GVAWKT7BBBGR2ISTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tile2.cc at line 697 [3.13289]

B:BD[2.1850] → [2.1850:1865]

    if(new_bg)

[2.1850]

[2.1865]


    if (bg0 & TILE_FLAG_BLOOD)
        tcache_overlay(tc_img, ix, TILE_BLOOD0, TREGION_0_NORMAL, &c, NULL);
    if (new_bg)

Replacement in crawl-ref/source/tile1.cc at line 772 [3.96318]
B:BD[4.21750] → [4.21750:21776]
```
        return TILE_TODO;
```
[4.21750]
[4.21776]
```
        return TILE_MONS_ROCK_WORM;
```
Replacement in crawl-ref/source/tile1.cc at line 1713 [3.96318]
B:BD[3.148064] → [3.148064:148097]
```
int tileidx_feature(int object){
```
[3.148064]
[3.148097]
```
int tileidx_feature(int object)
{
```
Insertion in crawl-ref/source/tile1.cc at line 1716 [3.96318]
[3.148122]
[3.148122]

Replacement in crawl-ref/source/tile1.cc at line 1719 [3.96318]

B:BD[3.148148] → [3.148148:148198]

    case DNGN_UNSEEN: ch=TILE_DNGN_UNSEEN; break;

[3.148148]

[3.148198]

    case DNGN_UNSEEN:
        return TILE_DNGN_UNSEEN;

Replacement in crawl-ref/source/tile1.cc at line 1724 [3.96318]

B:BD[3.148280] → [3.148280:148323]

B:BD[3.148323] → [4.22505:22668]

∅:D[4.22668] → [3.148323:149113]

B:BD[3.148323] → [3.148323:149113]

        ch=TILE_DNGN_ROCK_WALL_OFS; break;
    case DNGN_CLEAR_ROCK_WALL: ch=TILE_TODO; break;
    case DNGN_CLEAR_STONE_WALL: ch=TILE_TODO; break;
    case DNGN_CLEAR_PERMAROCK_WALL: ch=TILE_TODO; break;
    case DNGN_STONE_WALL: ch=TILE_DNGN_STONE_WALL; break;
    case DNGN_CLOSED_DOOR: ch=TILE_DNGN_CLOSED_DOOR; break;
    case DNGN_METAL_WALL: ch=TILE_DNGN_METAL_WALL; break;
    case DNGN_GREEN_CRYSTAL_WALL: ch=TILE_DNGN_GREEN_CRYSTAL_WALL; break;
    case DNGN_ORCISH_IDOL: ch=TILE_DNGN_ORCISH_IDOL; break;
    case DNGN_WAX_WALL: ch=TILE_DNGN_WAX_WALL; break;
    //case DNGN_LAST_SOLID_CH: ch=TILE_DNGN_LAST_SOLID_CH; break;
    case DNGN_GRANITE_STATUE: ch=TILE_DNGN_GRANITE_STATUE; break;
    //  case DNGN_STATUE_39: ch=TILE_DNGN_STATUE_39; break;
    case DNGN_LAVA: ch=TILE_DNGN_LAVA; break;
    case DNGN_DEEP_WATER: ch=TILE_DNGN_DEEP_WATER; break;
    case DNGN_SHALLOW_WATER: ch=TILE_DNGN_SHALLOW_WATER; break;
    //  case DNGN_WATER_STUCK: ch=TILE_DNGN_WATER_STUCK; break;

[3.148280]

[3.149113]

        return TILE_DNGN_ROCK_WALL_OFS;
    case DNGN_CLEAR_ROCK_WALL:
    case DNGN_CLEAR_STONE_WALL:
    case DNGN_CLEAR_PERMAROCK_WALL:
        return TILE_DNGN_TRANSPARENT_WALL;
    case DNGN_STONE_WALL:
        return TILE_DNGN_STONE_WALL;
    case DNGN_CLOSED_DOOR:
        return TILE_DNGN_CLOSED_DOOR;
    case DNGN_METAL_WALL:
        return TILE_DNGN_METAL_WALL;
    case DNGN_GREEN_CRYSTAL_WALL:
        return TILE_DNGN_GREEN_CRYSTAL_WALL;
    case DNGN_ORCISH_IDOL:
        return TILE_DNGN_ORCISH_IDOL;
    case DNGN_WAX_WALL:
        return TILE_DNGN_WAX_WALL;
    case DNGN_GRANITE_STATUE:
        return TILE_DNGN_GRANITE_STATUE;
    case DNGN_LAVA:
        return TILE_DNGN_LAVA;
    case DNGN_DEEP_WATER:
        return TILE_DNGN_DEEP_WATER;
    case DNGN_SHALLOW_WATER:
        return TILE_DNGN_SHALLOW_WATER;

Replacement in crawl-ref/source/tile1.cc at line 1751 [3.96318]
B:BD[3.149168] → [3.149168:149203]
```
        ch=TILE_DNGN_FLOOR; break;
```
[3.149168]
[3.149203]
```
       return TILE_DNGN_FLOOR;
```

Replacement in crawl-ref/source/tile1.cc at line 1753 [3.96318]

B:BD[3.149232] → [3.149232:149588]

B:BD[3.149588] → [4.22669:22718]

∅:D[4.22718] → [3.149644:149770]

B:BD[3.149644] → [3.149644:149770]

        ch=TILE_DNGN_FLOOR_SPECIAL; break;
    case DNGN_ENTER_HELL: ch=TILE_DNGN_ENTER_HELL; break;
    case DNGN_OPEN_DOOR: ch=TILE_DNGN_OPEN_DOOR; break;
    //  case DNGN_BRANCH_STAIRS: ch=TILE_DNGN_BRANCH_STAIRS; break;
    case DNGN_TRAP_MECHANICAL: ch=TILE_DNGN_TRAP_MECHANICAL; break;
    case DNGN_TRAP_MAGICAL: ch=TILE_DNGN_TRAP_MAGICAL; break;
    case DNGN_TRAP_NATURAL: ch=TILE_TODO; break;
    case DNGN_ENTER_SHOP: ch=TILE_DNGN_ENTER_SHOP; break;
    case DNGN_ENTER_LABYRINTH: ch=TILE_DNGN_ENTER_LABYRINTH; break;

[3.149232]

[3.149770]

       return TILE_DNGN_FLOOR_SPECIAL;
    case DNGN_ENTER_HELL:
        return TILE_DNGN_ENTER_HELL;
    case DNGN_OPEN_DOOR:
        return TILE_DNGN_OPEN_DOOR;
    case DNGN_TRAP_MECHANICAL:
        return TILE_DNGN_TRAP_MECHANICAL;
    case DNGN_TRAP_MAGICAL:
        return TILE_DNGN_TRAP_MAGICAL;
    case DNGN_TRAP_NATURAL:
        return TILE_TODO;
    case DNGN_ENTER_SHOP:
        return TILE_DNGN_ENTER_SHOP;
    case DNGN_ENTER_LABYRINTH:
        return TILE_DNGN_ENTER_LABYRINTH;

Replacement in crawl-ref/source/tile1.cc at line 1770 [3.96318]

B:BD[3.149843] → [3.149843:149989]

    case DNGN_STONE_STAIRS_DOWN_III: ch=TILE_DNGN_STONE_STAIRS_DOWN; break;
    case DNGN_ROCK_STAIRS_DOWN: ch=TILE_DNGN_ROCK_STAIRS_DOWN; break;

[3.149843]

[3.149989]

    case DNGN_STONE_STAIRS_DOWN_III:
        return TILE_DNGN_STONE_STAIRS_DOWN;
    case DNGN_ROCK_STAIRS_DOWN:
        return TILE_DNGN_ROCK_STAIRS_DOWN;

Replacement in crawl-ref/source/tile1.cc at line 1776 [3.96318]

B:BD[3.150056] → [3.150056:150504]

    case DNGN_STONE_STAIRS_UP_III: ch=TILE_DNGN_STONE_STAIRS_UP; break;
    case DNGN_ROCK_STAIRS_UP: ch=TILE_DNGN_ROCK_STAIRS_UP; break;
    case DNGN_ENTER_DIS: ch=TILE_DNGN_ENTER_DIS; break;
    case DNGN_ENTER_GEHENNA: ch=TILE_DNGN_ENTER_GEHENNA; break;
    case DNGN_ENTER_COCYTUS: ch=TILE_DNGN_ENTER_COCYTUS; break;
    case DNGN_ENTER_TARTARUS: ch=TILE_DNGN_ENTER_TARTARUS; break;
    case DNGN_ENTER_ABYSS: ch=TILE_DNGN_ENTER_ABYSS; break;

[3.150056]

[3.150504]

    case DNGN_STONE_STAIRS_UP_III:
        return TILE_DNGN_STONE_STAIRS_UP;
    case DNGN_ROCK_STAIRS_UP:
        return TILE_DNGN_ROCK_STAIRS_UP;
    case DNGN_ENTER_DIS:
        return TILE_DNGN_ENTER_DIS;
    case DNGN_ENTER_GEHENNA:
        return TILE_DNGN_ENTER_GEHENNA;
    case DNGN_ENTER_COCYTUS:
        return TILE_DNGN_ENTER_COCYTUS;
    case DNGN_ENTER_TARTARUS:
        return TILE_DNGN_ENTER_TARTARUS;
    case DNGN_ENTER_ABYSS:
        return TILE_DNGN_ENTER_ABYSS;

Replacement in crawl-ref/source/tile1.cc at line 1792 [3.96318]

B:BD[3.150555] → [3.150555:151036]

        ch=TILE_DNGN_EXIT_ABYSS; break;
    case DNGN_STONE_ARCH: ch=TILE_DNGN_STONE_ARCH; break;
    case DNGN_ENTER_PANDEMONIUM: ch=TILE_DNGN_ENTER_PANDEMONIUM; break;
    case DNGN_EXIT_PANDEMONIUM: ch=TILE_DNGN_EXIT_PANDEMONIUM; break;
    case DNGN_TRANSIT_PANDEMONIUM: ch=TILE_DNGN_TRANSIT_PANDEMONIUM; break;
    // case DNGN_BUILDER_SPECIAL_WALL: ch=TILE_DNGN_BUILDER_SPECIAL_WALL; break;
    // case DNGN_BUILDER_SPECIAL_FLOOR: ch=TILE_DNGN_BUILDER_SPECIAL_FLOOR; break;

[3.150555]

[3.151036]

       return TILE_DNGN_EXIT_ABYSS;
    case DNGN_STONE_ARCH:
        return TILE_DNGN_STONE_ARCH;
    case DNGN_ENTER_PANDEMONIUM:
        return TILE_DNGN_ENTER_PANDEMONIUM;
    case DNGN_EXIT_PANDEMONIUM:
        return TILE_DNGN_EXIT_PANDEMONIUM;
    case DNGN_TRANSIT_PANDEMONIUM:
        return TILE_DNGN_TRANSIT_PANDEMONIUM;

Replacement in crawl-ref/source/tile1.cc at line 1818 [3.96318]
B:BD[3.151539] → [3.151539:151575]
```
        ch=TILE_DNGN_ENTER; break;
```
[3.151539]
[3.151575]
```
       return TILE_DNGN_ENTER;
```
Replacement in crawl-ref/source/tile1.cc at line 1836 [3.96318]
B:BD[3.152165] → [3.152165:152202]
```
        ch=TILE_DNGN_RETURN; break;
```
[3.152165]
[3.152202]
```
       return TILE_DNGN_RETURN;
```

Replacement in crawl-ref/source/tile1.cc at line 1839 [3.96318]

B:BD[3.152269] → [3.152269:153296]

        ch=TILE_DNGN_TRANSIT_PANDEMONIUM; break;
    case DNGN_ALTAR_ZIN: ch=TILE_DNGN_ALTAR_ZIN; break;
    case DNGN_ALTAR_SHINING_ONE: ch=TILE_DNGN_ALTAR_SHINING_ONE; break;
    case DNGN_ALTAR_KIKUBAAQUDGHA: ch=TILE_DNGN_ALTAR_KIKUBAAQUDGHA; break;
    case DNGN_ALTAR_YREDELEMNUL: ch=TILE_DNGN_ALTAR_YREDELEMNUL; break;
    case DNGN_ALTAR_XOM: ch=TILE_DNGN_ALTAR_XOM; break;
    case DNGN_ALTAR_VEHUMET: ch=TILE_DNGN_ALTAR_VEHUMET; break;
    case DNGN_ALTAR_OKAWARU: ch=TILE_DNGN_ALTAR_OKAWARU; break;
    case DNGN_ALTAR_MAKHLEB: ch=TILE_DNGN_ALTAR_MAKHLEB; break;
    case DNGN_ALTAR_SIF_MUNA: ch=TILE_DNGN_ALTAR_SIF_MUNA; break;
    case DNGN_ALTAR_TROG: ch=TILE_DNGN_ALTAR_TROG; break;
    case DNGN_ALTAR_NEMELEX_XOBEH: ch=TILE_DNGN_ALTAR_NEMELEX_XOBEH; break;
    case DNGN_ALTAR_ELYVILON: ch=TILE_DNGN_ALTAR_ELYVILON; break;
    case DNGN_ALTAR_LUGONU: ch=TILE_DNGN_ALTAR_LUGONU; break;
    case DNGN_ALTAR_BEOGH: ch=TILE_DNGN_ALTAR_BEOGH; break;
    case DNGN_BLUE_FOUNTAIN: ch=TILE_DNGN_BLUE_FOUNTAIN; break;

[3.152269]

[3.153296]

       return TILE_DNGN_TRANSIT_PANDEMONIUM;
    case DNGN_ALTAR_ZIN:
        return TILE_DNGN_ALTAR_ZIN;
    case DNGN_ALTAR_SHINING_ONE:
        return TILE_DNGN_ALTAR_SHINING_ONE;
    case DNGN_ALTAR_KIKUBAAQUDGHA:
        return TILE_DNGN_ALTAR_KIKUBAAQUDGHA;
    case DNGN_ALTAR_YREDELEMNUL:
        return TILE_DNGN_ALTAR_YREDELEMNUL;
    case DNGN_ALTAR_XOM:
        return TILE_DNGN_ALTAR_XOM;
    case DNGN_ALTAR_VEHUMET:
        return TILE_DNGN_ALTAR_VEHUMET;
    case DNGN_ALTAR_OKAWARU:
        return TILE_DNGN_ALTAR_OKAWARU;
    case DNGN_ALTAR_MAKHLEB:
        return TILE_DNGN_ALTAR_MAKHLEB;
    case DNGN_ALTAR_SIF_MUNA:
        return TILE_DNGN_ALTAR_SIF_MUNA;
    case DNGN_ALTAR_TROG:
        return TILE_DNGN_ALTAR_TROG;
    case DNGN_ALTAR_NEMELEX_XOBEH:
        return TILE_DNGN_ALTAR_NEMELEX_XOBEH;
    case DNGN_ALTAR_ELYVILON:
        return TILE_DNGN_ALTAR_ELYVILON;
    case DNGN_ALTAR_LUGONU:
        return TILE_DNGN_ALTAR_LUGONU;
    case DNGN_ALTAR_BEOGH:
        return TILE_DNGN_ALTAR_BEOGH;
    case DNGN_BLUE_FOUNTAIN:
        return TILE_DNGN_BLUE_FOUNTAIN;

Replacement in crawl-ref/source/tile1.cc at line 1879 [3.96318]

B:BD[3.153581] → [3.153581:153697]

        ch=TILE_DNGN_DRY_FOUNTAIN; break;
    case DNGN_SPARKLING_FOUNTAIN: ch=TILE_DNGN_SPARKLING_FOUNTAIN; break;

[3.153581]

[3.153697]

       return TILE_DNGN_DRY_FOUNTAIN;
    case DNGN_SPARKLING_FOUNTAIN:
        return TILE_DNGN_SPARKLING_FOUNTAIN;

Replacement in crawl-ref/source/tile1.cc at line 1883 [3.96318]
B:BD[3.153703] → [3.153703:153723]
```
    
    return ch;
```
[3.153703]
[3.153723]
```
    return TILE_ERROR;
```

Replacement in crawl-ref/source/tile1.cc at line 3866 [3.96318]

∅:D[5.2142] → [3.217707:217745]

B:BD[3.217707] → [3.217707:217745]

            if (map_bounds( gx, gy ))

[5.2142]

[3.217745]

            const bool in_bounds = (map_bounds(gx, gy));
            if (in_bounds)

Replacement in crawl-ref/source/tile1.cc at line 3882 [3.96318]

B:BD[2.4315] → [2.4315:4388]

            const coord_def gc(gx, gy);
            if (is_excluded(gc))

[2.4315]

[2.4388]

            if (in_bounds)

Replacement in crawl-ref/source/tile1.cc at line 3884 [3.96318]

B:BD[2.4402] → [2.4402:4457]

                tileb[count+1] |= TILE_FLAG_TRAVEL_EX;

[2.4402]

[2.4457]

                const coord_def gc(gx, gy);
                if (is_excluded(gc))
                {
                    tileb[count+1] |= TILE_FLAG_TRAVEL_EX;
                }
                if (is_bloodcovered(gx, gy))
                {
                    tileb[count+1] |= TILE_FLAG_BLOOD;
                }

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 500 [3.4192854]
[6.6865]
```
rock_worm MONS_ROCK_WORM
```
File addition: rock_worm.bmp (----------)
[3.4207328]
Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 41 [3.4951691]
[3.4952499]
[3.4952499]
```
dc-misc/blood_red BLOOD0
```
Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 58 [3.5064923]
[3.5065824]
[3.5065824]
```
dngn_transparent_wall DNGN_TRANSPARENT_WALL
```
File addition: dngn_transparent_wall.bmp (----------)
[3.5069500]

Added rock worm and transparent wall tiles from Denzi.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tile2.cc at line 697 [3.13289]

Replacement in crawl-ref/source/tile1.cc at line 772 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1713 [3.96318]

Insertion in crawl-ref/source/tile1.cc at line 1716 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1719 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1724 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1751 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1753 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1770 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1776 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1792 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1818 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1836 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1839 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1879 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1883 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 3866 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 3882 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 3884 [3.96318]

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 500 [3.4192854]

File addition: rock_worm.bmp (----------)

Insertion in crawl-ref/source/rltiles/dc-misc.txt at line 41 [3.4951691]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 58 [3.5064923]

File addition: dngn_transparent_wall.bmp (----------)