fiddlerwoaroof/crawl - Change TYCM7ZQG5JPPK4A5K6IBVRKJYQS2F2A3SESBC53MUNXHMZCKYF5QC

FR 2006559: fix descriptions of viewed monsters not always fitting into

24 rows, like it was fixed for lookup (?/ command).

Also, fixed probem with zombies and other derived monsters not having a description when viewed.

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

Created by zelgadis on July 5, 2008

TYCM7ZQG5JPPK4A5K6IBVRKJYQS2F2A3SESBC53MUNXHMZCKYF5QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mon-util.cc at line 1762 [5.1699344]

[5.1727650]

[6.6665]

    if (desc == DESC_DBNAME)
        return get_monster_data(mon.type)->name;

Replacement in crawl-ref/source/describe.cc at line 2285 [5.3736416]
∅:D[7.3316] → [8.2648:2684]
∅:D[9.4909] → [8.2648:2684]
B:BD[5.3886896] → [8.2648:2684]
```
    std::ostringstream description;
```
[7.3316]
[10.3694]
```
    std::ostringstream body;
    std::string title, prefix, suffix;
```
Replacement in crawl-ref/source/describe.cc at line 2289 [5.3736416]
B:BD[10.3743] → [10.3743:3771]
```
    description << capname;
```
[10.3743]
[10.3771]
```
    title = capname;
```

Replacement in crawl-ref/source/describe.cc at line 2291 [5.3736416]

B:BD[10.3801] → [10.3801:3896]

        description << ", " << mons.base_name(DESC_NOCAP_THE, false);
    description << "$$";

[10.3801]

[9.4910]

    {
        title += ", ";
        title += mons.base_name(DESC_NOCAP_THE, false);
    }

Replacement in crawl-ref/source/describe.cc at line 2297 [5.3736416]
B:BD[9.4977] → [9.4977:5029]
```
        description << getLongDescription("mimic");
```
[9.4977]
[9.5029]
```
        body <<  getLongDescription("mimic");
```

Replacement in crawl-ref/source/describe.cc at line 2299 [5.3736416]

B:BD[9.5038] → [4.2674:2829]

        description << getLongDescription(mons.base_name(DESC_DBNAME, false),
                                          mons.type == MONS_DANCING_WEAPON);

[9.5038]

[11.536]

        body <<  getLongDescription(mons.base_name(DESC_DBNAME, false),
                                    mons.type == MONS_DANCING_WEAPON);

Replacement in crawl-ref/source/describe.cc at line 2310 [5.3736416]
B:BD[11.703] → [11.703:757]
```
    description << getLongDescription(symbol_prefix);
```
[11.703]
[12.3493]
```
    prefix = getLongDescription(symbol_prefix);
```

Deletion in crawl-ref/source/describe.cc at line 2314 [5.3736416]

B:BD[5.3887224] → [13.286:406]

B:BD[13.406] → [14.2863:2864]

∅:D[14.2864] → [13.415:602]

B:BD[13.415] → [13.415:602]

B:BD[13.602] → [15.2799:2862]

∅:D[15.2862] → [13.659:782]

B:BD[13.659] → [13.659:782]

B:BD[13.782] → [3.2674:2748]

    case MONS_ZOMBIE_SMALL: case MONS_ZOMBIE_LARGE:
        description << getLongDescription("zombie");
        break;
    case MONS_SKELETON_SMALL: case MONS_SKELETON_LARGE:
        description << getLongDescription("skeleton");
        break;
    case MONS_SIMULACRUM_SMALL: case MONS_SIMULACRUM_LARGE:
        description << getLongDescription("large simulacrum");
        break;
    case MONS_SPECTRAL_THING:
        description << getLongDescription("spectral thing");
        break;
    case MONS_DANCING_WEAPON:
        // Already handled.
        break;

Replacement in crawl-ref/source/describe.cc at line 2318 [5.3736416]
∅:D[16.33687] → [17.6930:6981]
B:BD[17.6930] → [17.6930:6981]
```
                description << "It smells great!";
```
[16.33687]
[17.6981]
```
                body << "It smells great!";
```
Replacement in crawl-ref/source/describe.cc at line 2320 [5.3736416]
B:BD[17.6998] → [17.6998:7043]
```
                description << "It stinks.";
```
[17.6998]
[17.7043]
```
                body << "It stinks.";
```
Replacement in crawl-ref/source/describe.cc at line 2326 [5.3736416]
B:BD[18.1292] → [8.2905:2955]
```
            description << "It smells horrible.";
```
[18.1292]
[5.3902530]
```
            body << "It smells horrible.";
```

Replacement in crawl-ref/source/describe.cc at line 2335 [5.3736416]

B:BD[19.39779] → [8.3407:3468]

            description << "It is particularly attractive.";

[19.39779]

[19.39838]

            body << "It is particularly attractive.";

Replacement in crawl-ref/source/describe.cc at line 2337 [5.3736416]

B:BD[19.39851] → [8.3469:3528]

            description << "It is strange and repulsive.";

[19.39851]

[5.3907811]

            body << "It is strange and repulsive.";

Replacement in crawl-ref/source/describe.cc at line 2344 [5.3736416]

B:BD[5.3908392] → [8.3529:3591]

            description << " It wants to drink your blood! ";

[5.3908392]

[5.3912955]

            body << "It wants to drink your blood! ";

Replacement in crawl-ref/source/describe.cc at line 2349 [5.3736416]

B:BD[5.3913259] → [8.3592:3649]

            description << "It has come for your soul!";

[5.3913259]

[5.3913316]

            body <<  "It has come for your soul!";

Replacement in crawl-ref/source/describe.cc at line 2354 [5.3736416]

B:BD[8.5143] → [8.5143:5207]

        description << "This one is remarkably plain looking.";

[8.5143]

[20.2140]

        body << "This one is remarkably plain looking.";

Replacement in crawl-ref/source/describe.cc at line 2374 [5.3736416]
B:BD[21.989101] → [22.21771:21824]
```
        description << _describe_draconian( &mons );
```
[21.989101]
[7.3453]
```
        body << _describe_draconian( &mons );
```

Replacement in crawl-ref/source/describe.cc at line 2378 [5.3736416]

B:BD[5.3930825] → [2.4043:4147]

        description << "The apparition of " << get_ghost_description(mons)
                    << ".$";

[5.3930825]

[5.3933030]

       body << "The apparition of " << get_ghost_description(mons)
            << ".$";

Replacement in crawl-ref/source/describe.cc at line 2383 [5.3736416]
B:BD[5.3933079] → [23.8861:8907]
```
        description << _describe_demon(mons);
```
[5.3933079]
[5.3938087]
```
        body << _describe_demon(mons);
```
Replacement in crawl-ref/source/describe.cc at line 2388 [5.3736416]
B:BD[18.1325] → [8.5388:5438]
```
            description << "He smells terrible.";
```
[18.1325]
[24.3508]
```
            body << "He smells terrible.";
```

Replacement in crawl-ref/source/describe.cc at line 2392 [5.3736416]

B:BD[5.3939988] → [8.5676:5750]

        description << "If this monster is a \"program bug\", then it's "

[5.3939988]

[5.3940075]

        body << "If this monster is a \"program bug\", then it's "

Deletion in crawl-ref/source/describe.cc at line 2401 [5.3736416]
B:BD[5.3940351] → [11.758:783]
```
    description << "\n";
```

Replacement in crawl-ref/source/describe.cc at line 2404 [5.3736416]

B:BD[11.882] → [11.882:936]

B:BD[11.936] → [3.2749:2816]

    description << getLongDescription(symbol_suffix);
    description << getLongDescription(symbol_suffix + "_examine");

[11.882]

[11.936]

    suffix += getLongDescription(symbol_suffix);
    suffix += getLongDescription(symbol_suffix + "_examine");

Deletion in crawl-ref/source/describe.cc at line 2408 [5.3736416]
B:BD[5.3940373] → [5.3940373:3940374]

Replacement in crawl-ref/source/describe.cc at line 2419 [5.3736416]

B:BD[5.3941061] → [8.5810:5867]

                    description << "$$Monster Spells:$";

[5.3941061]

[5.3941117]

                    body << "$$Monster Spells:$";

Replacement in crawl-ref/source/describe.cc at line 2423 [5.3736416]

B:BD[5.3941176] → [8.5868:5919]

B:BD[8.5919] → [25.14571:14630]

∅:D[25.14630] → [8.5982:6091]

B:BD[8.5982] → [8.5982:6091]

                description << "    " << i << ": "
                            << spell_title(hspell_pass[i])
                            << " (" << static_cast<int>(hspell_pass[i])
                            << ")$";

[5.3941176]

[5.3941338]

                body << "    " << i << ": "
                     << spell_title(hspell_pass[i])
                     << " (" << static_cast<int>(hspell_pass[i])
                     << ")$";

Replacement in crawl-ref/source/describe.cc at line 2438 [5.3736416]

B:BD[5.3941552] → [8.6092:6147]

                description << "$Monster Inventory:$";

[5.3941552]

[5.3941607]

                body << "$Monster Inventory:$";

Replacement in crawl-ref/source/describe.cc at line 2441 [5.3736416]

B:BD[5.3941654] → [26.24141:24188]

∅:D[26.24188] → [8.6187:6265]

B:BD[8.6187] → [8.6187:6265]

            description << "    " << i << ") "
                        << mitm[mons.inv[i]].name(DESC_NOCAP_A, false, true);

[5.3941654]

[5.3941963]

            body << "    " << i << ") "
                 << mitm[mons.inv[i]].name(DESC_NOCAP_A, false, true);

Replacement in crawl-ref/source/describe.cc at line 2447 [5.3736416]
B:BD[8.6281] → [8.6281:6323]
```
    print_description(description.str());
```
[8.6267]
[27.5935151]
```
    print_description(body.str(), title, suffix, prefix);
```

FR 2006559: fix descriptions of viewed monsters not always fitting into

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/mon-util.cc at line 1762 [5.1699344]

Replacement in crawl-ref/source/describe.cc at line 2285 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2289 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2291 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2297 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2299 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2310 [5.3736416]

Deletion in crawl-ref/source/describe.cc at line 2314 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2318 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2320 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2326 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2335 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2337 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2344 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2349 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2354 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2374 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2378 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2383 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2388 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2392 [5.3736416]

Deletion in crawl-ref/source/describe.cc at line 2401 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2404 [5.3736416]

Deletion in crawl-ref/source/describe.cc at line 2408 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2419 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2423 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2438 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2441 [5.3736416]

Replacement in crawl-ref/source/describe.cc at line 2447 [5.3736416]