diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-26 13:18:19 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-26 13:18:19 +0000 |
| commit | c96c36a0477909874c98bdbda3d13333ddb453e2 (patch) | |
| tree | 0c2a18233a65c55086d640be41685824c12d782e /crawl-ref/source/tilesdl.cc | |
| parent | a2c2fe61d7f40cb8f5fecd84fdacfdf47d28f16a (diff) | |
| download | crawl-ref-c96c36a0477909874c98bdbda3d13333ddb453e2.tar.gz crawl-ref-c96c36a0477909874c98bdbda3d13333ddb453e2.zip | |
Implement FR 1894211: All transformations will now cause your equipment
to meld into your body than rather than being removed, so that when
untransforming you don't have to put everything on again.
* Wielded stuff cannot be melded, and does not yet use the autoswap
function.
* As before, the low-level transformation spells refuse to work with
cursed equipment.
* The messages are unnecessarily spammy if you change forms while
already transformed (first everything is re-equipped, then unequipped
again). Conversely, on simply untransforming the lack of messages
might be confusing.
* Might be buggy, feedback welcome!
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7300 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilesdl.cc')
| -rw-r--r-- | crawl-ref/source/tilesdl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index badcfd4656..77c940bda7 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -193,13 +193,13 @@ bool TilesFramework::initialise() m_region_tile = new DungeonRegion(&m_image, m_fonts[lbl_font].font, TILE_X, TILE_Y); - m_region_map = new MapRegion(Options.tile_map_pixels); + m_region_map = new MapRegion(Options.tile_map_pixels); m_region_self_inv = new InventoryRegion(&m_image, m_fonts[lbl_font].font, TILE_X, TILE_Y); - m_region_msg = new MessageRegion(m_fonts[msg_font].font); + m_region_msg = new MessageRegion(m_fonts[msg_font].font); m_region_stat = new StatRegion(m_fonts[stat_font].font); - m_region_crt = new CRTRegion(m_fonts[crt_font].font); + m_region_crt = new CRTRegion(m_fonts[crt_font].font); m_region_menu = new MenuRegion(&m_image, m_fonts[crt_font].font); m_layers[LAYER_NORMAL].m_regions.push_back(m_region_tile); @@ -594,7 +594,7 @@ int TilesFramework::getch_ck() while (!key) { - unsigned int ticks; + unsigned int ticks = 0; if (SDL_WaitEvent(&event)) { @@ -1115,7 +1115,7 @@ void TilesFramework::update_inventory() for (int eq = 0; eq < NUM_EQUIP; eq++) { - if (you.equip[eq] == i) + if (you.equip[eq] == i && you_tran_can_wear(you.inv[i])) { desc.flag |= TILEI_FLAG_EQUIP; break; |