fiddlerwoaroof/crawl - Change MRUMXF3YPJCHAW4DC7DHJR5O77LXAJLMA53IOJP4YEMAOZRNWNKAC

Run some sanity checks when loading ghosts. If anything seems fishy

don't load the ghost(s)
print an error message mentioning the bones file
don't delete the bones file, so players can attach it to a bug report

The last point means that the player (or admin, in the case of the servers) has to delete a buggy bones file themselves, but the benefits of making tracking down bugs easier should outweigh that inconvenience.

Add a new wizmode command that calls debug_stethoscope even if the game is not compiled in debugging mode.

Also, Stone Soup 0.5 bones files are now officially incompatible with 0.4. (The changes to the spell ids cause ghosts casting spells to crash the game.)

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

Created by j-p-e-g on May 26, 2009

MRUMXF3YPJCHAW4DC7DHJR5O77LXAJLMA53IOJP4YEMAOZRNWNKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 3069 [4.39949]
B:BD[4.110872] → [5.1808:1853]
```
    for ( int i = 0; i < NUM_BRANCHES; ++i )
```
[4.110872]
[5.1853]
```
    for (int i = 0; i < NUM_BRANCHES; ++i)
```

Replacement in crawl-ref/source/travel.cc at line 3071 [4.39949]

B:BD[5.1859] → [5.1859:1908]

        if ( gridc == branches[i].entry_stairs )

[5.1859]

[5.1908]

        if (gridc == branches[i].entry_stairs)

Deletion in crawl-ref/source/spl-util.cc at line 946 [7.245665]
B:BD[6.363] → [6.363:364]
Replacement in crawl-ref/source/player.cc at line 1883 [7.962854]
B:BD[8.3141] → [2.2615:2664]
```
    int speed = you.species == SP_NAGA ? 8 : 10;
```
[8.3141]
[8.3189]
```
    int speed = (you.species == SP_NAGA ? 8 : 10);
```
Insertion in crawl-ref/source/ghost.h at line 60 [9.18366]
[9.19370]
[9.19370]
```
bool debug_check_ghosts();
```

Insertion in crawl-ref/source/ghost.cc at line 28 [8.9890]

[8.10281]

#define MAX_GHOST_DAMAGE     50
#define MAX_GHOST_HP        400
#define MAX_GHOST_EVASION    60

Replacement in crawl-ref/source/ghost.cc at line 300 [8.9890]
∅:D[10.4531] → [9.22235:22290]
B:BD[8.17481] → [9.22235:22290]
```
    max_hp = ((you.hp_max >= 400) ? 400 : you.hp_max);
```
[10.4531]
[9.22290]
```
    max_hp = ((you.hp_max >= MAX_GHOST_HP) ? MAX_GHOST_HP : you.hp_max);
```

Replacement in crawl-ref/source/ghost.cc at line 304 [8.9890]

B:BD[8.17648] → [9.22348:22382]

    if (ev > 60)
        ev = 60;

[8.17648]

[9.22382]

    if (ev > MAX_GHOST_EVASION)
        ev = MAX_GHOST_EVASION;

Replacement in crawl-ref/source/ghost.cc at line 351 [8.9890]

B:BD[8.18970] → [11.3385:3427]

    if (damage > 50)
        damage = 50;

[8.18970]

[8.19002]

    if (damage > MAX_GHOST_DAMAGE)
        damage = MAX_GHOST_DAMAGE;

Replacement in crawl-ref/source/ghost.cc at line 533 [8.9890]
B:BD[12.2611] → [12.2611:2636]
```
#ifdef DEBUG_DIAGNOSTICS
```
[12.2611]
[12.2636]
```
#if DEBUG_BONES | DEBUG_DIAGNOSTICS
```

Insertion in crawl-ref/source/ghost.cc at line 595 [8.9890]

[13.11249]

[8.27337]

}
// Sanity checks for some ghost values.
bool debug_check_ghosts()
{
    for (unsigned int k = 0; k < ghosts.size(); ++k)
    {
        ghost_demon ghost = ghosts[k];
        // Values greater than the allowed maximum signalize bugginess.
        if (ghost.damage > MAX_GHOST_DAMAGE)
            return (false);
        if (ghost.max_hp > MAX_GHOST_HP)
            return (false);
        if (ghost.xl > 27)
            return (false);
        if (ghost.ev > MAX_GHOST_EVASION)
            return (false);
        // Check for non-existing spells.
        for (int sp = 0; sp < NUM_MONSTER_SPELL_SLOTS; ++sp)
            if (ghost.spells[sp] < 0 || ghost.spells[sp] >= NUM_SPELLS)
                return (false);
    }
    return (true);

Replacement in crawl-ref/source/files.cc at line 1603 [7.3084589]
B:BD[7.3114849] → [7.3114849:3114871]
```
#if DEBUG_DIAGNOSTICS
```
[7.3114849]
[14.20487]
```
#if DEBUG_BONES | DEBUG_DIAGNOSTICS
```
Deletion in crawl-ref/source/files.cc at line 1613 [7.3084589]
B:BD[8.28239] → [15.27871:27872]
Replacement in crawl-ref/source/files.cc at line 1625 [7.3084589]
B:BD[7.3115196] → [7.3115196:3115218]
```
#if DEBUG_DIAGNOSTICS
```
[7.3115196]
[16.871518]
```
#if DEBUG_BONES | DEBUG_DIAGNOSTICS
```

Replacement in crawl-ref/source/files.cc at line 1635 [7.3084589]

B:BD[7.3115399] → [7.3115399:3115421]

#if DEBUG_DIAGNOSTICS

[7.3115399]

[3.8817]

    if (!debug_check_ghosts())
    {
        mprf(MSGCH_DIAGNOSTICS, "Refusing to load buggy ghost from file \"%s\"! "
                                "Please submit a bug report.",
             cha_fil.c_str());
        return;
    }
#if DEBUG_BONES | DEBUG_DIAGNOSTICS

Insertion in crawl-ref/source/enum.h at line 656 [7.3287960]
[17.14333]
[18.2874]
```
    CMD_TARGET_WIZARD_DEBUG_MONSTER,
```

Insertion in crawl-ref/source/directn.cc at line 1562 [7.3697945]

[19.3295]

[20.10891]

        case CMD_TARGET_WIZARD_DEBUG_MONSTER:
            if (!you.wizard || !in_bounds(moves.target))
                break;
            if (monster_at(moves.target))
                debug_stethoscope(mgrd(moves.target));
            break;

Deletion in crawl-ref/source/debug.h at line 119 [7.4011741]
B:BD[21.5476] → [21.5476:5498]
```
#if DEBUG_DIAGNOSTICS
```
Deletion in crawl-ref/source/debug.h at line 120 [7.4011741]
B:BD[21.5531] → [21.5531:5538]
```
#endif
```
Replacement in crawl-ref/source/debug.cc at line 389 [7.4016436]
B:BD[7.4029466] → [7.4029466:4029525]
```
    if ((ret < 0 && nonneg) || (ret == 0 && end == specs))
```
[7.4029466]
[7.4029525]
```
    if (ret < 0 && nonneg || ret == 0 && end == specs)
```
Insertion in crawl-ref/source/debug.cc at line 2515 [7.4016436]
[22.17206]
[22.17206]
```
        {
```
Insertion in crawl-ref/source/debug.cc at line 2518 [7.4016436]
[22.17335]
[22.17335]
```
        }
```
Deletion in crawl-ref/source/debug.cc at line 2537 [7.4016436]
∅:D[22.17746] → [21.6184:6209]
B:BD[7.4045753] → [21.6184:6209]
```
#ifdef DEBUG_DIAGNOSTICS
```

Replacement in crawl-ref/source/debug.cc at line 2587 [7.4016436]

∅:D[23.98627] → [24.3109:3185]

B:BD[24.3109] → [24.3109:3185]

                                                  : "unknown alignment") );

[23.98627]

[7.4047364]

                                               : "unknown alignment") );

Replacement in crawl-ref/source/debug.cc at line 2623 [7.4016436]

∅:D[23.99462] → [25.3077:3135]

B:BD[25.3077] → [25.3077:3135]

                                            : "unknown"),

[23.99462]

[23.99463]

                                         : "unknown"),

Insertion in crawl-ref/source/debug.cc at line 2645 [7.4016436]

[7.4050057]

[23.100075]

    std::ostringstream spl;
    const monster_spells &hspell_pass = mons.spells;
    bool found_spell = false;
    for (int k = 0; k < NUM_MONSTER_SPELL_SLOTS; ++k)
    {
        if (hspell_pass[k] != SPELL_NO_SPELL)
        {
            if (found_spell)
                spl << ", ";
            found_spell = true;
            spl << k << ": ";
            if (hspell_pass[k] >= NUM_SPELLS)
                spl << "buggy spell";
            else
                spl << spell_title(hspell_pass[k]);
            spl << " (" << static_cast<int>(hspell_pass[k]) << ")";
        }
    }
    if (found_spell)
        mprf(MSGCH_DIAGNOSTICS, "spells: %s", spl.str().c_str());

Deletion in crawl-ref/source/debug.cc at line 2679 [7.4016436]
∅:D[21.6509] → [7.4050400:4050407]
B:BD[7.4050400] → [7.4050400:4050407]
```
#endif
```
Insertion in crawl-ref/source/command.cc at line 780 [7.4082507]
[26.12679]
[19.15326]
```
    "<w>D</w>: get debugging information about the monster\n"
```
Insertion in crawl-ref/source/cmd-name.h at line 200 [28.12200]
[27.6708]
[28.20423]
```
{CMD_TARGET_WIZARD_DEBUG_MONSTER, "CMD_TARGET_WIZARD_DEBUG_MONSTER"},
```
Insertion in crawl-ref/source/cmd-keys.h at line 156 [28.20639]
[17.18685]
[28.23720]
```
{'D', CMD_TARGET_WIZARD_DEBUG_MONSTER},
```
Replacement in crawl-ref/docs/changes.stone_soup at line 6 [30.210753]
B:BD[29.2877] → [29.2877:2905]
```
Breaks saves compatibility.
```
[29.2877]
[31.3414]
```
Breaks saves and bones compatibility.
```

Run some sanity checks when loading ghosts. If anything seems fishy

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/travel.cc at line 3069 [4.39949]

Replacement in crawl-ref/source/travel.cc at line 3071 [4.39949]

Deletion in crawl-ref/source/spl-util.cc at line 946 [7.245665]

Replacement in crawl-ref/source/player.cc at line 1883 [7.962854]

Insertion in crawl-ref/source/ghost.h at line 60 [9.18366]

Insertion in crawl-ref/source/ghost.cc at line 28 [8.9890]

Replacement in crawl-ref/source/ghost.cc at line 300 [8.9890]

Replacement in crawl-ref/source/ghost.cc at line 304 [8.9890]

Replacement in crawl-ref/source/ghost.cc at line 351 [8.9890]

Replacement in crawl-ref/source/ghost.cc at line 533 [8.9890]

Insertion in crawl-ref/source/ghost.cc at line 595 [8.9890]

Replacement in crawl-ref/source/files.cc at line 1603 [7.3084589]

Deletion in crawl-ref/source/files.cc at line 1613 [7.3084589]

Replacement in crawl-ref/source/files.cc at line 1625 [7.3084589]

Replacement in crawl-ref/source/files.cc at line 1635 [7.3084589]

Insertion in crawl-ref/source/enum.h at line 656 [7.3287960]

Insertion in crawl-ref/source/directn.cc at line 1562 [7.3697945]

Deletion in crawl-ref/source/debug.h at line 119 [7.4011741]

Deletion in crawl-ref/source/debug.h at line 120 [7.4011741]

Replacement in crawl-ref/source/debug.cc at line 389 [7.4016436]

Insertion in crawl-ref/source/debug.cc at line 2515 [7.4016436]

Insertion in crawl-ref/source/debug.cc at line 2518 [7.4016436]

Deletion in crawl-ref/source/debug.cc at line 2537 [7.4016436]

Replacement in crawl-ref/source/debug.cc at line 2587 [7.4016436]

Replacement in crawl-ref/source/debug.cc at line 2623 [7.4016436]

Insertion in crawl-ref/source/debug.cc at line 2645 [7.4016436]

Deletion in crawl-ref/source/debug.cc at line 2679 [7.4016436]

Insertion in crawl-ref/source/command.cc at line 780 [7.4082507]

Insertion in crawl-ref/source/cmd-name.h at line 200 [28.12200]

Insertion in crawl-ref/source/cmd-keys.h at line 156 [28.20639]

Replacement in crawl-ref/docs/changes.stone_soup at line 6 [30.210753]