fiddlerwoaroof/crawl - Change IHICVTO5AR5SZKS4RI32XKDEO6VJEAB6XMZTSJHDI6AZXMB5PCQAC

Apply patch 2825337 by zebez: move trapping net tile to player.png to

save on memory and only load title.png if Options.tile_title_screen is true.

Also: delete m_region_title once the title screen was shown.

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

Created by j-p-e-g on July 22, 2009

IHICVTO5AR5SZKS4RI32XKDEO6VJEAB6XMZTSJHDI6AZXMB5PCQAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/tilesdl.cc at line 151 [5.19415]
B:BD[3.431] → [4.870:897]
```
    delete m_region_title;
```

Replacement in crawl-ref/source/tilesdl.cc at line 159 [5.19415]

∅:D[6.1542] → [4.898:925]

B:BD[3.458] → [4.898:925]

    m_region_title = NULL;

[6.1542]

[5.21720]


    if (m_region_title)
    {
        delete m_region_title;
        m_region_title = NULL;
    }

Insertion in crawl-ref/source/tilesdl.cc at line 187 [5.19415]
[4.1036]
[5.21838]
```
    delete m_region_title;
    m_region_title = NULL;
```
Deletion in crawl-ref/source/tilesdl.cc at line 341 [5.19415]
B:BD[5.23843] → [4.1037:1104]
```
    m_region_title = new TitleRegion(m_windowsz.x, m_windowsz.y);
```

Replacement in crawl-ref/source/tilesdl.cc at line 350 [5.19415]

B:BD[5.24285] → [4.1105:1168]

    m_layers[LAYER_TITLE].m_regions.push_back(m_region_title);

[5.24285]

[4.1168]

    // Only initialize title region if we'll actually want to draw it.
    if (Options.tile_title_screen)
    {
        m_region_title = new TitleRegion(m_windowsz.x, m_windowsz.y);
        m_layers[LAYER_TITLE].m_regions.push_back(m_region_title);
    }

Replacement in crawl-ref/source/tilereg.cc at line 882 [5.54399]
B:BD[5.74366] → [7.4132:4177]
```
        m_buf_main.add(TILE_TRAP_NET, x, y);
```
[5.74366]
[5.74418]
```
        m_buf_doll.add(TILEP_TRAP_NET, x, y);
```

Deletion in crawl-ref/source/tilereg.cc at line 3370 [5.54399]

B:BD[8.849] → [2.1307:1396]

        return (false);
    if (!m_textures[TEX_DEFAULT].load_texture("main.png", mip))

Deletion in crawl-ref/source/tilereg.cc at line 3374 [5.54399]
B:BD[8.924] → [2.1397:1467]
```
    m_textures[TEX_DEFAULT].set_info(TILE_MAIN_MAX, &tile_main_info);
```
Insertion in crawl-ref/source/rltiles/dc-player.txt at line 869 [10.4176224]
[9.18392]
[9.18392]
```
effect/net_trap TRAP_NET
```
Deletion in crawl-ref/source/rltiles/dc-main.txt at line 16 [10.5654941]
B:BD[9.33897] → [9.33897:33934]
```
####PLAYER 
####include dc-jobs.txt
```
Deletion in crawl-ref/source/rltiles/dc-item.txt at line 231 [10.5044666]
B:BD[9.38673] → [9.38673:38698]
```
effect/net_trap TRAP_NET
```

Replacement in crawl-ref/source/menu.cc at line 904 [11.261322]

B:BD[2.11550] → [2.11550:11615]

        tileset.push_back(tile_def(TILE_TRAP_NET, TEX_DEFAULT));

[2.11550]

[2.11615]

        tileset.push_back(tile_def(TILEP_TRAP_NET, TEX_PLAYER));

Apply patch 2825337 by zebez: move trapping net tile to player.png to

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/tilesdl.cc at line 151 [5.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 159 [5.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 187 [5.19415]

Deletion in crawl-ref/source/tilesdl.cc at line 341 [5.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 350 [5.19415]

Replacement in crawl-ref/source/tilereg.cc at line 882 [5.54399]

Deletion in crawl-ref/source/tilereg.cc at line 3370 [5.54399]

Deletion in crawl-ref/source/tilereg.cc at line 3374 [5.54399]

Insertion in crawl-ref/source/rltiles/dc-player.txt at line 869 [10.4176224]

Deletion in crawl-ref/source/rltiles/dc-main.txt at line 16 [10.5654941]

Deletion in crawl-ref/source/rltiles/dc-item.txt at line 231 [10.5044666]

Replacement in crawl-ref/source/menu.cc at line 904 [11.261322]