diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-17 21:36:30 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-17 21:36:30 +0000 |
| commit | 7b768f7fac47ee709312b381e5844b55f58d3553 (patch) | |
| tree | b2876cd5f9a27add79eaa6e99e82c7dbe5dbd7ca /crawl-ref/source/tilepick.cc | |
| parent | 5f770d9133518e7f43d8064ca11acbd9830c0cfc (diff) | |
| download | crawl-ref-7b768f7fac47ee709312b381e5844b55f58d3553.tar.gz crawl-ref-7b768f7fac47ee709312b381e5844b55f58d3553.zip | |
* More steps on the path to reintroducing player doll customization.
Also apply my two previous commits to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9995 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilepick.cc')
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 1035271e68..344193e21e 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2933,9 +2933,12 @@ void tilep_race_default(int race, int gender, int level, int *parts) if (gender == TILEP_GENDER_MALE) result++; - parts[TILEP_PART_BASE] = result; - parts[TILEP_PART_HAIR] = hair; - parts[TILEP_PART_BEARD] = beard; + parts[TILEP_PART_BASE] = result; + //Don't overwrite doll parts defined elsewhere. + if (parts[TILEP_PART_HAIR] == TILEP_SHOW_EQUIP) + parts[TILEP_PART_HAIR] = hair; + if (parts[TILEP_PART_BEARD] == TILEP_SHOW_EQUIP) + parts[TILEP_PART_BEARD] = beard; parts[TILEP_PART_SHADOW] = TILEP_SHADOW_SHADOW; } |