fiddlerwoaroof/crawl - Change GHANBXZA7P4BB4MXPEXE7PVTR42UTD4UHHXZ4RUE5DSFHKILF6OQC

Disallow choice of "none" for species/base in the doll edit screen.

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

Created by j-p-e-g on August 19, 2009

GHANBXZA7P4BB4MXPEXE7PVTR42UTD4UHHXZ4RUE5DSFHKILF6OQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilereg.cc at line 682 [3.54399]

B:BD[2.5646] → [2.5646:5789]

    bool is_naga = (doll.parts[TILEP_PART_BASE] == TILEP_BASE_NAGA
                    || doll.parts[TILEP_PART_BASE] == TILEP_BASE_NAGA + 1);

[2.5646]

[2.5789]

    bool is_naga = (doll.parts[TILEP_PART_BASE] >= TILEP_BASE_NAGA
                    && doll.parts[TILEP_PART_BASE]
                       < tilep_species_to_base_tile(SP_NAGA + 1));

Replacement in crawl-ref/source/tilereg.cc at line 692 [3.54399]

B:BD[2.6021] → [2.6021:6170]

    bool is_cent = (doll.parts[TILEP_PART_BASE] == TILEP_BASE_CENTAUR
                    || doll.parts[TILEP_PART_BASE] == TILEP_BASE_CENTAUR + 1);

[2.6021]

[2.6170]

    bool is_cent = (doll.parts[TILEP_PART_BASE] >= TILEP_BASE_CENTAUR
                    && doll.parts[TILEP_PART_BASE]
                       < tilep_species_to_base_tile(SP_CENTAUR + 1));

Replacement in crawl-ref/source/tilereg.cc at line 697 [3.54399]

B:BD[2.6238] → [2.6238:6319]

             && doll.parts[TILEP_PART_BOOTS] <= TILEP_BOOTS_CENTAUR_BARDING_RED)

[2.6238]

[2.6319]

        && doll.parts[TILEP_PART_BOOTS] <= TILEP_BOOTS_CENTAUR_BARDING_RED)

Deletion in crawl-ref/source/tilereg.cc at line 3271 [3.54399]
B:BD[2.7287] → [2.7287:7293]
```
    {
```
Deletion in crawl-ref/source/tilereg.cc at line 3272 [3.54399]
B:BD[2.7314] → [2.7314:7320]
```
    }
```

Replacement in crawl-ref/source/tilereg.cc at line 3274 [3.54399]

B:BD[2.7392] → [2.7392:7490]

    int max_part = tile_player_part_count[cat] + 1;
    int offset = tile_player_part_start[cat];

[2.7392]

[2.7490]

    // (Except for the base, for which "none" is disallowed.)
    const int bonus = (cat == TILEP_PART_BASE ? 0 : 1);
    const int max_part = tile_player_part_count[cat] + bonus;
    const int offset   = tile_player_part_start[cat];

Replacement in crawl-ref/source/tilereg.cc at line 3291 [3.54399]
B:BD[2.7806] → [2.7806:7835]
```
    if (ret == max_part - 1)
```
[2.7806]
[2.7835]
```
    if (cat != TILEP_PART_BASE && ret == max_part - 1)
```

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

B:BD[4.159931] → [5.21124:21232]

    if (parts[TILEP_PART_BASE] == TILEP_BASE_NAGA
        || parts[TILEP_PART_BASE] == TILEP_BASE_NAGA + 1)

[4.159931]

[4.160033]

    if (parts[TILEP_PART_BASE] >= TILEP_BASE_NAGA
        && parts[TILEP_PART_BASE] < tilep_species_to_base_tile(SP_NAGA + 1))

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

B:BD[4.160167] → [6.6549:6673]

    else if (parts[TILEP_PART_BASE] == TILEP_BASE_CENTAUR
             || parts[TILEP_PART_BASE] == TILEP_BASE_CENTAUR + 1)

[4.160167]

[4.160276]

    else if (parts[TILEP_PART_BASE] >= TILEP_BASE_CENTAUR
             && parts[TILEP_PART_BASE]
                < tilep_species_to_base_tile(SP_CENTAUR + 1))