fiddlerwoaroof/crawl - Change 34RCM6RXIWHZMYXNGFQKLKQIAJ6QISIQ3D5HMK4HZNLVX66BSUBAC

Note improvements (1749776). Double notes are possible if regexps

are careless.

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

Created by haranp on July 8, 2007

34RCM6RXIWHZMYXNGFQKLKQIAJ6QISIQ3D5HMK4HZNLVX66BSUBAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/notes.cc at line 105 [4.370339]

[3.6772]

[4.373500]

         note.type == NOTE_GET_ITEM ||
         note.type == NOTE_ID_ITEM ||

Deletion in crawl-ref/source/notes.cc at line 179 [4.370339]

B:BD[3.8046] → [3.8046:8073]

B:BD[3.8073] → [2.4029:4057]

∅:D[2.4057] → [3.8073:8260]

B:BD[3.8073] → [3.8073:8260]

        case NOTE_ID_ITEM:
        case NOTE_GET_ITEM:
            /* re-id'ing an item, e.g. second copy of book, isn't
               noteworthy */
            if ( rnote.name == note.name )
                return false;
            break;

Replacement in crawl-ref/source/items.cc at line 848 [6.2584728]
B:BD[5.4267] → [2.15510:15560]
```
static void check_note_item(const item_def &item)
```
[5.4267]
[2.15560]
```
static void check_note_item(item_def &item)
```

Replacement in crawl-ref/source/items.cc at line 850 [6.2584728]

B:BD[2.15562] → [2.15562:15597]

    if (is_interesting_item(item))

[2.15562]

[2.15597]

    if (!(item.flags & ISFLAG_NOTED_GET) && is_interesting_item(item))
    {

Insertion in crawl-ref/source/items.cc at line 854 [6.2584728]
[2.15726]
[2.15726]
```
        item.flags |= ISFLAG_NOTED_GET;
    }
```
Deletion in crawl-ref/source/items.cc at line 871 [6.2584728]
B:BD[7.346456] → [2.15730:15761]
```
        check_note_item(item);
```
Deletion in crawl-ref/source/items.cc at line 1296 [6.2584728]
B:BD[6.2614080] → [4.635208:635227]
∅:D[4.635227] → [6.2614103:2614126]
B:BD[6.2614103] → [6.2614103:2614126]
```
    int imass = 0;
    int unit_mass = 0;
```
Deletion in crawl-ref/source/items.cc at line 1297 [6.2584728]
B:BD[6.2614154] → [6.2614154:2614221]
```
    char brek = 0;
    bool partialPickup = false;
    int m = 0;
```
Replacement in crawl-ref/source/items.cc at line 1315 [6.2584728]
B:BD[6.2614689] → [4.635262:635302]
```
    unit_mass = item_mass( mitm[obj] );
```
[6.2614689]
[7.354186]
```
    const int unit_mass = item_mass( mitm[obj] );
```
Deletion in crawl-ref/source/items.cc at line 1318 [6.2584728]
B:BD[7.354284] → [7.354284:354289]
B:BD[7.354289] → [4.635303:635338]
```
    
    imass = unit_mass * quant_got;
```
Replacement in crawl-ref/source/items.cc at line 1319 [6.2584728]
∅:D[7.354333] → [6.2614813:2614827]
B:BD[6.2614813] → [6.2614813:2614827]
```
    brek = 0;
```
[7.354333]
[6.2614827]
```
    const int imass = unit_mass * quant_got;
```
Replacement in crawl-ref/source/items.cc at line 1321 [6.2584728]
B:BD[6.2614828] → [6.2614828:2614864]
```
    // multiply both constants * 10
```
[6.2614828]
[6.2614864]
```
    bool partial_pickup = false;
```
Replacement in crawl-ref/source/items.cc at line 1333 [6.2584728]
B:BD[6.2615167] → [6.2615167:2615197]
```
        partialPickup = true;
```
[6.2615167]
[6.2615197]
```
        partial_pickup = true;
```
Replacement in crawl-ref/source/items.cc at line 1340 [6.2584728]
B:BD[6.2615274] → [6.2615274:2615314]
```
        for (m = 0; m < ENDOFPACK; m++)
```
[6.2615274]
[6.2615314]
```
        for (int m = 0; m < ENDOFPACK; m++)
```
Replacement in crawl-ref/source/items.cc at line 1344 [6.2584728]
B:BD[6.2615392] → [6.2615392:2615437]
```
                if (!quiet && partialPickup)
```
[6.2615392]
[6.2615437]
```
                if (!quiet && partial_pickup)
```
Insertion in crawl-ref/source/items.cc at line 1346 [6.2584728]
[6.2615506]
[6.2615506]
```
                check_note_item(mitm[obj]);
```
Replacement in crawl-ref/source/items.cc at line 1360 [6.2584728]
B:BD[6.2615892] → [6.2615892:2615950]
```
        }                           // end of for m loop.
```
[6.2615892]
[6.2615950]
```
        }
```
Replacement in crawl-ref/source/items.cc at line 1367 [6.2584728]
B:BD[6.2616056] → [6.2616056:2616089]
```
    if (!quiet && partialPickup)
```
[6.2616056]
[6.2616089]
```
    if (!quiet && partial_pickup)
```

Replacement in crawl-ref/source/itemprop.cc at line 465 [4.646661]

B:BD[4.666387] → [8.3949:4059]

    if ( notes_are_active() &&
         !known_before && fully_identified(item) && is_interesting_item(item))

[4.666387]

[9.9208]

    if (notes_are_active() && !(item.flags & ISFLAG_NOTED_ID) &&
        !known_before && fully_identified(item) && is_interesting_item(item))

Insertion in crawl-ref/source/itemprop.cc at line 471 [4.646661]
[9.9343]
[4.666709]
```
        item.flags |= ISFLAG_NOTED_ID;
```

Insertion in crawl-ref/source/item_use.cc at line 3646 [6.2781507]

[6.2867912]

        if ( id_the_scroll )
            set_ident_flags( scroll, ISFLAG_KNOW_TYPE ); // for notes

Replacement in crawl-ref/source/enum.h at line 1523 [6.3287960]

B:BD[6.3322497] → [6.3322497:3322576]

    ISFLAG_DEBUG_MARK        = 0x80000000   // used for testing item structure

[6.3322497]

[6.3322576]

    ISFLAG_NOTED_ID          = 0x08000000,
    ISFLAG_NOTED_GET         = 0x10000000

Replacement in crawl-ref/source/debug.cc at line 1027 [6.4016436]

B:BD[6.4051482] → [6.4051482:4051584]

    // unset marks
    for (i = 0; i < MAX_ITEMS; i++)
        mitm[i].flags &= (~ISFLAG_DEBUG_MARK);

[6.4051482]

[6.4051584]

    FixedVector<bool, MAX_ITEMS> visited;
    visited.init(false);

Replacement in crawl-ref/source/debug.cc at line 1061 [6.4016436]
B:BD[6.4053091] → [6.4053091:4053148]
```
                if (mitm[obj].flags & ISFLAG_DEBUG_MARK)
```
[6.4053091]
[6.4053148]
```
                if (visited[obj])
```
Replacement in crawl-ref/source/debug.cc at line 1067 [6.4016436]
B:BD[6.4053350] → [6.4053350:4053405]
```
                mitm[obj].flags |= ISFLAG_DEBUG_MARK;
```
[6.4053350]
[6.4053405]
```
                visited[obj] = true;
```

Replacement in crawl-ref/source/debug.cc at line 1081 [6.4016436]

B:BD[6.4053700] → [6.4053700:4053799]

        if ((mitm[i].x > 0 || mitm[i].y > 0) 
            && !(mitm[i].flags & ISFLAG_DEBUG_MARK))

[6.4053700]

[6.4053799]

        if ((mitm[i].x > 0 || mitm[i].y > 0) && !visited[i])

Deletion in crawl-ref/source/debug.cc at line 1146 [6.4016436]

B:BD[6.4056376] → [6.4056376:4056526]


    // Don't want debugging marks interfering with anything else.
    for (i = 0; i < MAX_ITEMS; i++)
        mitm[i].flags &= (~ISFLAG_DEBUG_MARK);

Note improvements (1749776). Double notes are possible if regexps

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/notes.cc at line 105 [4.370339]

Deletion in crawl-ref/source/notes.cc at line 179 [4.370339]

Replacement in crawl-ref/source/items.cc at line 848 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 850 [6.2584728]

Insertion in crawl-ref/source/items.cc at line 854 [6.2584728]

Deletion in crawl-ref/source/items.cc at line 871 [6.2584728]

Deletion in crawl-ref/source/items.cc at line 1296 [6.2584728]

Deletion in crawl-ref/source/items.cc at line 1297 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 1315 [6.2584728]

Deletion in crawl-ref/source/items.cc at line 1318 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 1319 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 1321 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 1333 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 1340 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 1344 [6.2584728]

Insertion in crawl-ref/source/items.cc at line 1346 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 1360 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 1367 [6.2584728]

Replacement in crawl-ref/source/itemprop.cc at line 465 [4.646661]

Insertion in crawl-ref/source/itemprop.cc at line 471 [4.646661]

Insertion in crawl-ref/source/item_use.cc at line 3646 [6.2781507]

Replacement in crawl-ref/source/enum.h at line 1523 [6.3287960]

Replacement in crawl-ref/source/debug.cc at line 1027 [6.4016436]

Replacement in crawl-ref/source/debug.cc at line 1061 [6.4016436]

Replacement in crawl-ref/source/debug.cc at line 1067 [6.4016436]

Replacement in crawl-ref/source/debug.cc at line 1081 [6.4016436]

Deletion in crawl-ref/source/debug.cc at line 1146 [6.4016436]