diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-03 16:18:02 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-03 16:18:02 +0000 |
| commit | 2c2a0304ec8308f912860f05dc1099b86f71773c (patch) | |
| tree | 26a30495b0700fcb595aeafb7b3149c9f73d18d6 /crawl-ref/source/menu.cc | |
| parent | 1127ccc6b5bd418aead10e6b968aeef4d6909551 (diff) | |
| download | crawl-ref-2c2a0304ec8308f912860f05dc1099b86f71773c.tar.gz crawl-ref-2c2a0304ec8308f912860f05dc1099b86f71773c.zip | |
* Fix centaur/naga tiles not being displayed correctly in the character
selection menu.
* Add dolls_data to player_save_info struct, to make it easier to read
in per-character doll information once we get around to that.
Including the tiledef files in externs.h is probably overkill, though,
so we might want to move player_save_info into another header file.
* Fix Xom's repel stair effect moving shops.
* Fix decks granting permanent summons at low power (and only at low
power).
* Make default settings of the brand options consistent between init.txt
and initfile.cc.
* Update FAQ.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10086 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/menu.cc')
| -rw-r--r-- | crawl-ref/source/menu.cc | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 431ede02a6..9af8b1681c 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -847,20 +847,7 @@ bool PlayerMenuEntry::get_tiles(std::vector<tile_def>& tileset) const return (false); const player_save_info &player = *static_cast<player_save_info*>( data ); - - dolls_data equip_doll; - for (unsigned int j = 0; j < TILEP_PART_MAX; ++j) - equip_doll.parts[j] = TILEP_SHOW_EQUIP; - - const int gender = TILEP_GENDER_MALE; - tilep_race_default(player.species, gender, player.experience_level, - equip_doll.parts); - - int job = get_class_by_name(player.class_name.c_str()); - if (job == -1) - job = JOB_FIGHTER; - - tilep_job_default(job, gender, equip_doll.parts); + dolls_data equip_doll = player.doll; // FIXME: A lot of code duplication from DungeonRegion::pack_doll(). int p_order[TILEP_PART_MAX] = @@ -902,8 +889,6 @@ bool PlayerMenuEntry::get_tiles(std::vector<tile_def>& tileset) const ASSERT(idx >= TILE_MAIN_MAX && idx < TILEP_PLAYER_MAX); -#if 0 - // FIXME: Is there any way to make this work with tile_def? int ymax = TILE_Y; if (flags[p] == TILEP_FLAG_CUT_CENTAUR @@ -911,9 +896,8 @@ bool PlayerMenuEntry::get_tiles(std::vector<tile_def>& tileset) const { ymax = 18; } - buf->add(doll.parts[p], x, y, 0, 0, true, ymax); -#endif - tileset.push_back(tile_def(idx, TEX_PLAYER)); + + tileset.push_back(tile_def(idx, TEX_PLAYER, ymax)); } return (true); |