fiddlerwoaroof/crawl - Change QSSUOKAA4I7BVCCEQRSSYXNBABJ3DCKOBXNNCB5MJDXXN2Q2KGGQC

Simplify further.

Created by David Lawrence Ramsey on October 8, 2009

QSSUOKAA4I7BVCCEQRSSYXNBABJ3DCKOBXNNCB5MJDXXN2Q2KGGQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilepick.cc at line 104 [6.96318]
B:BD[5.1847] → [5.1847:1865]
```
        return 1;
```
[5.1847]
[7.2664]
```
        return (1);
```

Deletion in crawl-ref/source/tilepick.cc at line 112 [6.96318]

B:BD[5.2002] → [5.2002:2060]

B:BD[5.2060] → [4.240:375]

        return 0;
    default:
        return 1;
    }
}
static int _ugly_thing_colour_offset(const monsters *mon)
{
    if (mon->type != MONS_UGLY_THING && mon->type != MONS_VERY_UGLY_THING)

Replacement in crawl-ref/source/tilepick.cc at line 113 [6.96318]

B:BD[4.395] → [4.395:752]


    switch (make_low_colour(mon->colour))
    {
        case GREEN:
            return (0);
        case CYAN:
            return (1);
        case RED:
            return (2);
        case MAGENTA:
            return (3);
        case BROWN:
            return (4);
        case LIGHTGREY:
            return (5);
        default:
            return (0);

[4.395]

[4.752]

    default:
        return (1);

Replacement in crawl-ref/source/tilepick.cc at line 355 [6.96318]

B:BD[8.267] → [4.762:833]

        return TILEP_MONS_UGLY_THING + _ugly_thing_colour_offset(mon);

[8.267]

[9.5962]

    {
        const int colour_offset = ugly_thing_colour_offset(mon);
        if (colour_offset == -1)
            colour_offset = 0;
        return TILEP_MONS_UGLY_THING + colour_offset;
    }

Replacement in crawl-ref/source/tilepick.cc at line 362 [6.96318]

B:BD[9.5993] → [4.834:910]

        return TILEP_MONS_VERY_UGLY_THING + _ugly_thing_colour_offset(mon);

[9.5993]

[9.6036]

    {
        const int colour_offset = ugly_thing_colour_offset(mon);
        if (colour_offset == -1)
            colour_offset = 0;
        return TILEP_MONS_VERY_UGLY_THING + colour_offset;
    }

Replacement in crawl-ref/source/mon-util.h at line 851 [12.1682293]

∅:D[10.4177] → [11.465368:465422]

B:BD[11.465368] → [11.465368:465422]

B:BD[11.465422] → [13.13041:13096]

monster_type draco_subspecies( const monsters *mon );
std::string draconian_colour_name(monster_type mtype);

[10.4177]

[13.13096]

monster_type draco_subspecies(const monsters *mon);
int ugly_thing_colour_offset(const monsters *mon);

Replacement in crawl-ref/source/mon-util.cc at line 2008 [12.1699344]

B:BD[14.3514] → [14.3514:3578]

static std::string _ugly_thing_colour_name(const monsters *mon)

[14.3514]

[14.3578]

static const char *ugly_colour_names[] = {
    "green", "cyan", "red", "purple", "brown", "white"
};
int ugly_thing_colour_offset(const monsters *mon)

Replacement in crawl-ref/source/mon-util.cc at line 2015 [12.1699344]
∅:D[3.3061] → [14.3630:3656]
B:BD[14.3630] → [14.3630:3656]
```
        return ("buggy");
```
[3.3061]
[14.3656]
```
        return (-1);
```
Replacement in crawl-ref/source/mon-util.cc at line 2020 [12.1699344]
B:BD[14.3778] → [14.3778:3808]
```
            return ("green");
```
[14.3778]
[2.2986]
```
            return (0);
```
Replacement in crawl-ref/source/mon-util.cc at line 2022 [12.1699344]
B:BD[2.3005] → [2.3005:3034]
```
            return ("cyan");
```
[2.3005]
[14.3808]
```
            return (1);
```
Replacement in crawl-ref/source/mon-util.cc at line 2024 [12.1699344]
B:BD[14.3826] → [14.3826:3854]
```
            return ("red");
```
[14.3826]
[14.3958]
```
            return (2);
```
Replacement in crawl-ref/source/mon-util.cc at line 2026 [12.1699344]
B:BD[14.3980] → [14.3980:4011]
```
            return ("purple");
```
[14.3980]
[2.3035]
```
            return (3);
```
Replacement in crawl-ref/source/mon-util.cc at line 2028 [12.1699344]
B:BD[2.3055] → [2.3055:3085]
```
            return ("brown");
```
[2.3055]
[2.3085]
```
            return (4);
```
Replacement in crawl-ref/source/mon-util.cc at line 2030 [12.1699344]
B:BD[2.3109] → [2.3109:3139]
```
            return ("white");
```
[2.3109]
[14.4011]
```
            return (5);
```
Replacement in crawl-ref/source/mon-util.cc at line 2032 [12.1699344]
B:BD[14.4028] → [14.4028:4058]
```
            return ("buggy");
```
[14.4028]
[14.4058]
```
            return (-1);
```

Insertion in crawl-ref/source/mon-util.cc at line 2034 [12.1699344]

[14.4064]

[15.2678]

}
static std::string _ugly_thing_colour_name(const monsters *mon)
{
    const int colour_offset = ugly_thing_colour_offset(mon);
    if (colour_offset == -1)
        return ("buggy");
    return (ugly_colour_names[colour_offset]);

Simplify further.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tilepick.cc at line 104 [6.96318]

Deletion in crawl-ref/source/tilepick.cc at line 112 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 113 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 355 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 362 [6.96318]

Replacement in crawl-ref/source/mon-util.h at line 851 [12.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 2008 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2015 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2020 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2022 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2024 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2026 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2028 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2030 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2032 [12.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2034 [12.1699344]