fiddlerwoaroof/crawl - Change BTHEX36BHZOAGTT5SNO6OPWDAZJQSUUNDXSJ77FBEFZE3NGJ7CAQC

If a beam has range == -1 then set it to LOS_RADIUS and, in debug builds,

complain about it. Eventually turn this into an ASSERT when all code that makes this assumption is caught and fixed.

If beam.chose_ray is true and source is still the default then change source to ray.pos()

Fix Banishment and Dig having range -1.

Sanity check spell definitions at startup in init_spell_descs()

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

Created by zelgadis on December 27, 2008

BTHEX36BHZOAGTT5SNO6OPWDAZJQSUUNDXSJ77FBEFZE3NGJ7CAQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-util.cc at line 93 [6.245665]

∅:D[3.316] → [5.390:431]

B:BD[5.390] → [5.390:431]

        spell_list[spelldata[i].id] = i;

[3.316]

[2.263]

    {
        spell_desc &data = spelldata[i];
#if DEBUG
        if (data.id < SPELL_NO_SPELL || data.id >= NUM_SPELLS)
            end(1, false, "spell #%d has invalid id %d", i, data.id);
        if (data.title == NULL || strlen(data.title) == 0)
            end(1, false, "spell #%d, id %d has no name", i, data.id);
        if (data.level < 1 || data.level > 9)
            end(1, false, "spell '%s' has invalid level %d",
                data.title, data.level);
        if (data.min_range > data.max_range)
            end(1, false, "spell '%s' has min_range larger than max_range",
                data.title);
        if (data.flags & SPFLAG_TARGETING_MASK)
        {
            if (data.min_range <= -1 || data.max_range <= 0)
                end(1, false, "targeted/directed spell '%s' has invalid range",
                    data.title);
        }
#endif
        spell_list[data.id] = i;
    }

Replacement in crawl-ref/source/spl-data.h at line 320 [6.268152]
B:BD[5.833] → [7.1353:1366]
```
     -1, -1,
```
[5.833]
[8.1604]
```
     LOS_RADIUS, LOS_RADIUS,
```
Replacement in crawl-ref/source/spl-data.h at line 1416 [6.268152]
B:BD[5.1842] → [7.2729:2742]
```
     -1, -1,
```
[5.1842]
[8.2409]
```
     LOS_RADIUS, LOS_RADIUS,
```
Insertion in crawl-ref/source/spl-data.h at line 2910 [6.268152]
[3.489]
[9.124472]
```
     1,
```
Deletion in crawl-ref/source/spl-data.h at line 2912 [6.268152]
B:BD[9.124480] → [5.3025:3033]
```
     0,
```
Deletion in crawl-ref/source/beam.cc at line 166 [6.4128068]
B:BD[10.16658] → [7.10130:10188]
```
    if (beam.range <= 0)
        beam.range = LOS_RADIUS;
```

Insertion in crawl-ref/source/beam.cc at line 1458 [6.4128068]

[6.4169482]

[11.10416]

    if (chose_ray)
    {
        ASSERT(in_bounds(ray.pos()));
        if (source == coord_def())
            source = ray.pos();
    }
    if (range == -1)
    {
#if DEBUG
        if (is_tracer)
        {
            mpr("Tracer with range == -1, skipping.", MSGCH_ERROR);
            return;
        }
        std::string item_name   = item ? item->name(DESC_PLAIN, false, true)
                                       : "none";
        std::string source_name = "unknown";
        if (beam_source == NON_MONSTER && source == you.pos())
        {
            source_name = "player";
        }
        else if (!invalid_monster_index(beam_source))
            source_name = menv[beam_source].name(DESC_PLAIN, true);
        mprf(MSGCH_ERROR, "beam '%s' (source '%s', item '%s') has range -1; "
                          "setting to LOS_RADIUS",
             name.c_str(), source_name.c_str(), item_name.c_str());
#endif
        range = LOS_RADIUS;
    }
    ASSERT(!name.empty() || is_tracer);
    ASSERT(in_bounds(source));

Replacement in crawl-ref/source/beam.cc at line 1495 [6.4128068]
B:BD[11.10480] → [11.10480:10512]
```
    ASSERT(!drop_item || item);
```
[11.10480]
[11.10512]
```
    ASSERT(!drop_item || item && is_valid_item(*item));
```

Deletion in crawl-ref/source/beam.cc at line 1497 [6.4128068]

B:BD[11.10536] → [4.3452:3545]

    ASSERT(chose_ray && in_bounds(ray.pos())
           || !chose_ray && in_bounds(source));

Replacement in crawl-ref/source/beam.cc at line 1501 [6.4128068]
B:BD[11.10622] → [11.10622:10642]
```
    range_used = 0;
```
[11.10622]
[11.10642]
```
    range_used         = 0;
```
Replacement in crawl-ref/source/beam.cc at line 1503 [6.4128068]
B:BD[11.10674] → [11.10674:10705]
```
    use_target_as_pos = false;
```
[11.10674]
[12.2851]
```
    use_target_as_pos  = false;
```

Deletion in crawl-ref/source/beam.cc at line 1974 [6.4128068]

B:BD[4.4088] → [4.4088:4295]

#ifdef DEBUG
        mprf(MSGCH_DIAGNOSTICS, "fire_beam(): beam '%s' passed off edge of "
             "map (item = '%s')", name.c_str(),
             item ? item->name(DESC_PLAIN).c_str() : "none");
#endif

Deletion in crawl-ref/source/beam.cc at line 1976 [6.4128068]
B:BD[4.4336] → [4.4336:4337]

If a beam has range == -1 then set it to LOS_RADIUS and, in debug builds,

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-util.cc at line 93 [6.245665]

Replacement in crawl-ref/source/spl-data.h at line 320 [6.268152]

Replacement in crawl-ref/source/spl-data.h at line 1416 [6.268152]

Insertion in crawl-ref/source/spl-data.h at line 2910 [6.268152]

Deletion in crawl-ref/source/spl-data.h at line 2912 [6.268152]

Deletion in crawl-ref/source/beam.cc at line 166 [6.4128068]

Insertion in crawl-ref/source/beam.cc at line 1458 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 1495 [6.4128068]

Deletion in crawl-ref/source/beam.cc at line 1497 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 1501 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 1503 [6.4128068]

Deletion in crawl-ref/source/beam.cc at line 1974 [6.4128068]

Deletion in crawl-ref/source/beam.cc at line 1976 [6.4128068]