fiddlerwoaroof/crawl - Change HPV2KABLOLNNUC3L2E5XQOWDOAOVLIGASQ2Z7SVS33QKON34OT4QC

Apply my tile doll fixes to trunk.

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

Created by j-p-e-g on June 20, 2009

HPV2KABLOLNNUC3L2E5XQOWDOAOVLIGASQ2Z7SVS33QKON34OT4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tiles.h at line 60 [4.7013]

B:BD[4.7652] → [4.7652:7722]

void tilep_race_default(int race, int gender, int level, int *parts);

[4.7652]

[4.7722]

int get_gender_from_tile(int parts[]);
int tilep_species_to_base_tile(int sp = you.species,
                               int level = you.experience_level);
void tilep_race_default(int sp, int gender, int level, int *parts);

Deletion in crawl-ref/source/tilereg.cc at line 13 [7.54399]
B:BD[5.780] → [6.1470:1487]
```
#include <cmath>
```

Insertion in crawl-ref/source/tilereg.cc at line 353 [7.54399]

[3.1507]

                if (gender == -1)
                    gender = coinflip();

Replacement in crawl-ref/source/tilereg.cc at line 370 [7.54399]

B:BD[8.1571] → [8.1571:1637]

                    gender = dolls[0].parts[TILEP_PART_BASE] % 2;

[8.1571]

[8.1637]

                    gender = get_gender_from_tile(dolls[0].parts);

Replacement in crawl-ref/source/tilereg.cc at line 401 [7.54399]

B:BD[9.2683] → [9.2683:2734]

    if (gender == -1)
        gender = coinflip();

[9.2683]

[8.2178]

    default_doll[0].parts[TILEP_PART_BASE]
        = tilep_species_to_base_tile(you.species, you.experience_level);

Insertion in crawl-ref/source/tilereg.cc at line 407 [7.54399]
[3.2037]
[7.63105]
```
    if (gender == -1)
        gender = coinflip();
```
Insertion in crawl-ref/source/tilereg.cc at line 686 [7.54399]
[3.6451]
[3.6451]
```
        gender = get_gender_from_tile(player_doll.parts);
```
Deletion in crawl-ref/source/tilereg.cc at line 2287 [7.54399]
∅:D[10.4126] → [7.108240:108246]
B:BD[7.108240] → [7.108240:108246]
```
    {
```
Deletion in crawl-ref/source/tilereg.cc at line 2296 [7.54399]
B:BD[7.109031] → [7.109031:109037]
```
    }
```

Replacement in crawl-ref/source/tilepick.cc at line 2793 [4.96318]

B:BD[4.161780] → [4.161780:161849]

void tilep_race_default(int race, int gender, int level, int *parts)

[4.161780]

[4.161849]

int get_gender_from_tile(int parts[])
{
    return ((parts[TILEP_PART_BASE]
             - tile_player_part_start[TILEP_PART_BASE]) % 2);
}
int tilep_species_to_base_tile(int sp, int level)
{
    switch (sp)
    {
    case SP_HUMAN:
        return TILEP_BASE_HUMAN;
    case SP_ELF:
    case SP_HIGH_ELF:
    case SP_SLUDGE_ELF:
        return TILEP_BASE_ELF;
    case SP_DEEP_ELF:
        return TILEP_BASE_DEEP_ELF;
    case SP_MOUNTAIN_DWARF:
        return TILEP_BASE_DWARF;
    case SP_HALFLING:
        return TILEP_BASE_HALFLING;
    case SP_HILL_ORC:
        return TILEP_BASE_ORC;
    case SP_KOBOLD:
        return TILEP_BASE_KOBOLD;
    case SP_MUMMY:
        return TILEP_BASE_MUMMY;
    case SP_NAGA:
        return TILEP_BASE_NAGA;
    case SP_OGRE:
        return TILEP_BASE_OGRE;
    case SP_TROLL:
        return TILEP_BASE_TROLL;
    case SP_BASE_DRACONIAN:
    case SP_RED_DRACONIAN:
    case SP_WHITE_DRACONIAN:
    case SP_GREEN_DRACONIAN:
    case SP_YELLOW_DRACONIAN:
    case SP_GREY_DRACONIAN:
    case SP_BLACK_DRACONIAN:
    case SP_PURPLE_DRACONIAN:
    case SP_MOTTLED_DRACONIAN:
    case SP_PALE_DRACONIAN:
    {
        const int colour_offset = _draconian_colour(sp, level);
        return (TILEP_BASE_DRACONIAN + colour_offset * 2);
    }
    case SP_CENTAUR:
        return TILEP_BASE_CENTAUR;
    case SP_DEMIGOD:
        return TILEP_BASE_DEMIGOD;
    case SP_SPRIGGAN:
        return TILEP_BASE_SPRIGGAN;
    case SP_MINOTAUR:
        return TILEP_BASE_MINOTAUR;
    case SP_DEMONSPAWN:
        return TILEP_BASE_DEMONSPAWN;
    case SP_GHOUL:
        return TILEP_BASE_GHOUL;
    case SP_KENKU:
        return TILEP_BASE_KENKU;
    case SP_MERFOLK:
        return TILEP_BASE_MERFOLK;
    case SP_VAMPIRE:
        return TILEP_BASE_VAMPIRE;
    case SP_DEEP_DWARF:
        return TILEP_BASE_DEEP_DWARF;
    default:
        return TILEP_BASE_HUMAN;
    }
}
void tilep_race_default(int sp, int gender, int level, int *parts)

Replacement in crawl-ref/source/tilepick.cc at line 2868 [4.96318]

B:BD[4.161851] → [4.161851:161881]

B:BD[4.161881] → [11.738:757]

    int result;
    int hair;
    int beard = 0;

[4.161851]

[4.161898]

    if (gender == -1)
        gender = get_gender_from_tile(parts);
    ASSERT(gender == TILEP_GENDER_MALE || gender == TILEP_GENDER_FEMALE);
    int result = tilep_species_to_base_tile(sp, level) + gender;
    int hair   = 0;
    int beard  = 0;

Replacement in crawl-ref/source/tilepick.cc at line 2881 [4.96318]
B:BD[4.162020] → [12.505:523]
```
    switch (race)
```
[4.162020]
[4.162037]
```
    switch (sp)
```
Deletion in crawl-ref/source/tilepick.cc at line 2883 [4.96318]
B:BD[4.162043] → [4.162043:162066]
B:BD[4.162066] → [13.3947:3986]
∅:D[13.3986] → [4.162106:162125]
B:BD[4.162106] → [4.162106:162125]
```
        case SP_HUMAN:
            result = TILEP_BASE_HUMAN;
            break;
```

Replacement in crawl-ref/source/tilepick.cc at line 2886 [4.96318]

B:BD[4.162226] → [4.162226:162263]

B:BD[4.162263] → [14.28813:28857]

            result = TILEP_BASE_ELF;
            hair   = TILEP_HAIR_ELF_YELLOW;

[4.162226]

[4.162305]

            hair = TILEP_HAIR_ELF_YELLOW;

Replacement in crawl-ref/source/tilepick.cc at line 2889 [4.96318]

B:BD[4.162350] → [4.162350:162392]

B:BD[4.162392] → [14.28858:28901]

            result = TILEP_BASE_DEEP_ELF;
            hair   = TILEP_HAIR_ELF_WHITE;

[4.162350]

[4.162433]

            hair = TILEP_HAIR_ELF_WHITE;

Deletion in crawl-ref/source/tilepick.cc at line 2893 [4.96318]
B:BD[4.162512] → [4.162512:162551]
```
            result = TILEP_BASE_DWARF;
```

Deletion in crawl-ref/source/tilepick.cc at line 2903 [4.96318]

B:BD[4.162848] → [4.162848:162935]

            break;
        case SP_HALFLING:
            result = TILEP_BASE_HALFLING;

Replacement in crawl-ref/source/tilepick.cc at line 2905 [4.96318]
B:BD[4.162980] → [4.162980:163017]
B:BD[4.163017] → [14.29041:29065]
```
            result = TILEP_BASE_ORC;
            hair   = 0;
```
[4.162980]
[4.163039]
```
            hair = 0;
```
Replacement in crawl-ref/source/tilepick.cc at line 2908 [4.96318]
B:BD[4.163082] → [4.163082:163122]
B:BD[4.163122] → [14.29066:29090]
```
            result = TILEP_BASE_KOBOLD;
            hair   = 0;
```
[4.163082]
[4.163144]
```
            hair = 0;
```
Replacement in crawl-ref/source/tilepick.cc at line 2911 [4.96318]
B:BD[4.163186] → [4.163186:163225]
B:BD[4.163225] → [14.29091:29115]
```
            result = TILEP_BASE_MUMMY;
            hair   = 0;
```
[4.163186]
[4.163247]
```
            hair = 0;
```

Deletion in crawl-ref/source/tilepick.cc at line 2913 [4.96318]

B:BD[4.163266] → [4.163266:163326]

B:BD[4.163407] → [4.163407:163505]

        case SP_NAGA:
            result = TILEP_BASE_NAGA;
            break;
        case SP_OGRE:
            result = TILEP_BASE_OGRE;
            break;

Replacement in crawl-ref/source/tilepick.cc at line 2914 [4.96318]
B:BD[4.163528] → [4.163528:163567]
B:BD[4.163567] → [14.29116:29140]
```
            result = TILEP_BASE_TROLL;
            hair   = 0;
```
[4.163528]
[4.163589]
```
            hair = 0;
```
Deletion in crawl-ref/source/tilepick.cc at line 2916 [4.96318]
B:BD[4.163697] → [4.163697:163698]

Replacement in crawl-ref/source/tilepick.cc at line 2927 [4.96318]

B:BD[15.2705] → [15.2705:2775]

            const int colour_offset = _draconian_colour(race, level);

[15.2705]

[15.2775]

            const int colour_offset = _draconian_colour(sp, level);

Replacement in crawl-ref/source/tilepick.cc at line 2929 [4.96318]
∅:D[15.2838] → [4.164027:164049]
B:BD[4.164027] → [4.164027:164049]
```
            hair = 0;
```
[15.2838]
[15.2839]
```
            hair   = 0;
```

Deletion in crawl-ref/source/tilepick.cc at line 2940 [4.96318]

∅:D[15.3106] → [4.164296:164553]

B:BD[4.164296] → [4.164296:164553]

        case SP_CENTAUR:
            result = TILEP_BASE_CENTAUR;
            break;
        case SP_DEMIGOD:
            result = TILEP_BASE_DEMIGOD;
            break;
        case SP_SPRIGGAN:
            result = TILEP_BASE_SPRIGGAN;
            break;

Replacement in crawl-ref/source/tilepick.cc at line 2941 [4.96318]
B:BD[4.164579] → [4.164579:164621]
B:BD[4.164621] → [14.29143:29167]
```
            result = TILEP_BASE_MINOTAUR;
            hair   = 0;
```
[4.164579]
[4.164643]
```
            hair = 0;
```
Replacement in crawl-ref/source/tilepick.cc at line 2944 [4.96318]
B:BD[4.164690] → [4.164690:164734]
B:BD[4.164734] → [14.29168:29192]
```
            result = TILEP_BASE_DEMONSPAWN;
            hair   = 0;
```
[4.164690]
[4.164756]
```
            hair = 0;
```
Replacement in crawl-ref/source/tilepick.cc at line 2947 [4.96318]
B:BD[4.164798] → [4.164798:164837]
B:BD[4.164837] → [14.29193:29217]
∅:D[14.29217] → [4.164859:164940]
B:BD[4.164859] → [4.164859:164940]
```
            result = TILEP_BASE_GHOUL;
            hair   = 0;
            break;
        case SP_KENKU:
            result = TILEP_BASE_KENKU;
```
[4.164798]
[4.164940]
```
            hair = 0;
```
Deletion in crawl-ref/source/tilepick.cc at line 2954 [4.96318]
B:BD[4.165149] → [4.165149:165190]
```
            result = TILEP_BASE_VAMPIRE;
```
Deletion in crawl-ref/source/tilepick.cc at line 2960 [4.96318]
B:BD[2.269] → [2.269:313]
```
            result = TILEP_BASE_DEEP_DWARF;
```
Replacement in crawl-ref/source/tilepick.cc at line 2972 [4.96318]
B:BD[4.165226] → [4.165226:165265]
```
            result = TILEP_BASE_HUMAN;
```
[4.165226]
[4.165265]
```
            // nothing to do
```
Replacement in crawl-ref/source/tilepick.cc at line 2976 [4.96318]
B:BD[4.165291] → [14.29392:29447]
B:BD[14.29447] → [15.3107:3108]
B:BD[15.3108] → [9.3794:3831]
```
    if (gender == TILEP_GENDER_MALE)
        result++;
    parts[TILEP_PART_BASE] = result;
```
[4.165291]
[16.1094]
```
    parts[TILEP_PART_BASE]   = result;
```

Replacement in crawl-ref/source/tilepick.cc at line 2978 [4.96318]

∅:D[16.1147] → [9.3883:4029]

B:BD[9.3883] → [9.3883:4029]

    if (parts[TILEP_PART_HAIR] == TILEP_SHOW_EQUIP)
        parts[TILEP_PART_HAIR]   = hair;
    if (parts[TILEP_PART_BEARD] == TILEP_SHOW_EQUIP)

[16.1147]

[9.4029]

    if (hair == 0 || parts[TILEP_PART_HAIR] == TILEP_SHOW_EQUIP)
        parts[TILEP_PART_HAIR] = hair;
    if (beard == 0 || parts[TILEP_PART_BEARD] == TILEP_SHOW_EQUIP)

Replacement in crawl-ref/source/tilepick.cc at line 2987 [4.96318]

B:BD[4.165532] → [14.29596:29761]

B:BD[14.29761] → [11.796:829]

∅:D[11.829] → [14.29793:29859]

B:BD[14.29793] → [14.29793:29859]

    parts[TILEP_PART_CLOAK] = 0;
    parts[TILEP_PART_BOOTS] = 0;
    parts[TILEP_PART_LEG]   = 0;
    parts[TILEP_PART_BODY]  = 0;
    parts[TILEP_PART_ARM]   = 0;
    parts[TILEP_PART_HAND1] = 0;
    parts[TILEP_PART_HAND2] = 0;
    parts[TILEP_PART_HELM]  = 0;

[4.165532]

[4.165781]

    parts[TILEP_PART_CLOAK] = TILEP_SHOW_EQUIP;
    parts[TILEP_PART_BOOTS] = TILEP_SHOW_EQUIP;
    parts[TILEP_PART_LEG]   = TILEP_SHOW_EQUIP;
    parts[TILEP_PART_BODY]  = TILEP_SHOW_EQUIP;
    parts[TILEP_PART_ARM]   = TILEP_SHOW_EQUIP;
    parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;
    parts[TILEP_PART_HAND2] = TILEP_SHOW_EQUIP;
    parts[TILEP_PART_HELM]  = TILEP_SHOW_EQUIP;

Deletion in crawl-ref/source/tilepick.cc at line 2999 [4.96318]
B:BD[4.165835] → [14.29860:29916]
```
            parts[TILEP_PART_BODY]  = TILEP_SHOW_EQUIP;
```

Deletion in crawl-ref/source/tilepick.cc at line 3000 [4.96318]

B:BD[14.29978] → [14.29978:30090]

            parts[TILEP_PART_HAND2] = TILEP_SHOW_EQUIP;
            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;

Deletion in crawl-ref/source/tilepick.cc at line 3009 [4.96318]

B:BD[14.30451] → [14.30451:30563]

            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;
            parts[TILEP_PART_HAND2] = TILEP_SHOW_EQUIP;

Deletion in crawl-ref/source/tilepick.cc at line 3018 [4.96318]

B:BD[14.30924] → [14.30924:31036]

            parts[TILEP_PART_HAND2] = TILEP_SHOW_EQUIP;
            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;

Deletion in crawl-ref/source/tilepick.cc at line 3026 [4.96318]
B:BD[14.31339] → [14.31339:31395]
```
            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;
```

Deletion in crawl-ref/source/tilepick.cc at line 3034 [4.96318]

B:BD[14.31699] → [14.31699:31811]

            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;
            parts[TILEP_PART_HAND2] = TILEP_SHOW_EQUIP;

Deletion in crawl-ref/source/tilepick.cc at line 3039 [4.96318]

B:BD[14.31937] → [14.31937:32049]

            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;
            parts[TILEP_PART_HAND2] = TILEP_SHOW_EQUIP;

Deletion in crawl-ref/source/tilepick.cc at line 3045 [4.96318]
B:BD[14.32241] → [14.32241:32297]
```
            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;
```
Deletion in crawl-ref/source/tilepick.cc at line 3091 [4.96318]
B:BD[14.33867] → [14.33867:33923]
```
            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;
```
Deletion in crawl-ref/source/tilepick.cc at line 3193 [4.96318]
B:BD[4.174836] → [14.36782:36838]
```
            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;
```

Deletion in crawl-ref/source/tilepick.cc at line 3211 [4.96318]

B:BD[14.37242] → [14.37242:37354]

            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;
            parts[TILEP_PART_HAND2] = TILEP_SHOW_EQUIP;

Deletion in crawl-ref/source/tilepick.cc at line 3216 [4.96318]

B:BD[14.37485] → [14.37485:37597]

            parts[TILEP_PART_HAND1] = TILEP_SHOW_EQUIP;
            parts[TILEP_PART_HAND2] = TILEP_SHOW_EQUIP;

Insertion in crawl-ref/source/tilepick.cc at line 3218 [4.96318]

[4.175971]

[4.175974]


        case JOB_ARTIFICER:
            parts[TILEP_PART_HAND1] = TILEP_HAND1_SCEPTRE;
            parts[TILEP_PART_BODY]  = TILEP_BODY_LEATHER_ARMOUR3;
            parts[TILEP_PART_LEG]   = TILEP_LEG_PANTS_BLACK;
            break;

Replacement in crawl-ref/source/tilepick.cc at line 3301 [4.96318]

B:BD[15.3186] → [15.3186:3219]

            parts[p] += idx % 2;

[15.3186]

[15.3219]

            parts[p] = tilep_species_to_base_tile() + idx % 2;

Replacement in crawl-ref/source/tilepick.cc at line 3328 [4.96318]

B:BD[17.2684] → [3.7916:7971]

∅:D[3.7971] → [16.1192:1240]

B:BD[17.2748] → [16.1192:1240]

        if (p == TILEP_PART_BASE) // 0: female  1:male
            sprintf(ptr, "%03d", parts[p] % 2);

[17.2684]

[17.2826]

        if (p == TILEP_PART_BASE) // 0: female  1: male
            sprintf(ptr, "%03d", get_gender_from_tile(parts));

Replacement in crawl-ref/settings/dolls.txt at line 1 [8.11018]
B:BD[8.11018] → [8.11019:11038]
```
MODE=LOADING
NUM=0
```
[8.11018]
[8.11038]
```
MODE=EQUIP
NUM=00
```

Apply my tile doll fixes to trunk.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tiles.h at line 60 [4.7013]

Deletion in crawl-ref/source/tilereg.cc at line 13 [7.54399]

Insertion in crawl-ref/source/tilereg.cc at line 353 [7.54399]

Replacement in crawl-ref/source/tilereg.cc at line 370 [7.54399]

Replacement in crawl-ref/source/tilereg.cc at line 401 [7.54399]

Insertion in crawl-ref/source/tilereg.cc at line 407 [7.54399]

Insertion in crawl-ref/source/tilereg.cc at line 686 [7.54399]

Deletion in crawl-ref/source/tilereg.cc at line 2287 [7.54399]

Deletion in crawl-ref/source/tilereg.cc at line 2296 [7.54399]

Replacement in crawl-ref/source/tilepick.cc at line 2793 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2868 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2881 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2883 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2886 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2889 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2893 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2903 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2905 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2908 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2911 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2913 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2914 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2916 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2927 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2929 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2940 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2941 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2944 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2947 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2954 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2960 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2972 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2976 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2978 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2987 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2999 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3000 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3009 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3018 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3026 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3034 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3039 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3045 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3091 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3193 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3211 [4.96318]

Deletion in crawl-ref/source/tilepick.cc at line 3216 [4.96318]

Insertion in crawl-ref/source/tilepick.cc at line 3218 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 3301 [4.96318]

Replacement in crawl-ref/source/tilepick.cc at line 3328 [4.96318]

Replacement in crawl-ref/settings/dolls.txt at line 1 [8.11018]