fiddlerwoaroof/crawl - Change UQZTF7HDI7VXYYYKZKVHKB53TEQC45XHYD3XNCRDTYNUSLSIMGIQC

Fix the ASSERT when undetected traps run out of ammo and display "You

hear a click" instead of "The trap is out of ammo". Also, fix the miscolouring of the lua eating prompt.

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

Created by j-p-e-g on November 9, 2008

UQZTF7HDI7VXYYYKZKVHKB53TEQC45XHYD3XNCRDTYNUSLSIMGIQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/traps.cc at line 51 [6.5308]
B:BD[5.615] → [5.615:636]
```
    bool rc = false;
```
Replacement in crawl-ref/source/traps.cc at line 55 [6.5308]
B:BD[5.777] → [5.777:796]
```
        rc = true;
```
[5.777]
[5.796]
```
        return (true);
```
Replacement in crawl-ref/source/traps.cc at line 59 [6.5308]
B:BD[5.830] → [3.230:245]
```
    return rc;
```
[5.830]
[5.853]
```
    return (false);
```

Insertion in crawl-ref/source/traps.cc at line 81 [6.5308]

[5.1270]

    if (!in_bounds(this->pos))
        ASSERT("trap position out of bounds!");

Insertion in crawl-ref/source/traps.cc at line 380 [6.5308]

[5.4749]


    // Store the position now in case it gets cleared inbetween.
    const coord_def p(this->pos);

Replacement in crawl-ref/source/traps.cc at line 578 [6.5308]

B:BD[5.11072] → [5.11072:11137]

                : "Oh no! You have blundered into a Zot trap!");

[5.11072]

[5.11137]

                             : "Oh no! You have blundered into a Zot trap!");

Replacement in crawl-ref/source/traps.cc at line 656 [6.5308]

B:BD[5.13057] → [5.13057:13114]

        learned_something_new(TUT_SEEN_TRAP, this->pos);

[5.13057]

[3.258]

        learned_something_new(TUT_SEEN_TRAP, p);

Replacement in crawl-ref/source/traps.cc at line 658 [6.5308]

∅:D[3.259] → [5.13123:13219]

B:BD[5.13123] → [5.13123:13219]

        // Exercise T&D if the trap revealed itself.
        if (!you_know && this->is_known())

[3.259]

[5.13219]

        // Exercise T&D if the trap revealed itself, but not if it ran
        // out of ammo.
        if (!you_know && this->type != TRAP_UNASSIGNED && this->is_known())

Replacement in crawl-ref/source/traps.cc at line 1104 [6.5308]
B:BD[6.22407] → [5.16942:16981]
```
        if (act.atype() == ACT_PLAYER)
```
[6.22407]
[5.16981]
```
        if (was_known && act.atype() == ACT_PLAYER)
```
Deletion in crawl-ref/source/state.cc at line 145 [7.1546]
B:BD[7.4856] → [4.648:684]
```
    mpr("in interrupt_cmd_repeat");
```

Replacement in crawl-ref/source/message.cc at line 1029 [9.1993826]

B:BD[8.6641] → [8.6641:6704]

            for ( unsigned int j = 0; j < fs.ops.size(); ++j )

[8.6641]

[10.7260]

            for (unsigned int j = 0; j < fs.ops.size(); ++j)

Replacement in crawl-ref/source/itemname.cc at line 2708 [9.2667494]

B:BD[11.4337] → [11.4337:4390]

        item_name = colour + item_name + colour_off;

[11.4337]

[11.4390]

        item_name   = colour + item_name + colour_off;

Replacement in crawl-ref/source/dat/lua/eat.lua at line 15 [12.307163]
B:BD[12.307659] → [2.2767:2825]
```
    crawl.formatted_mpr("Eat " .. iname .. "?", "prompt")
```
[12.307659]
[12.307707]
```
    crawl.mpr("Eat " .. iname .. "?", "prompt")
```

Fix the ASSERT when undetected traps run out of ammo and display "You

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/traps.cc at line 51 [6.5308]

Replacement in crawl-ref/source/traps.cc at line 55 [6.5308]

Replacement in crawl-ref/source/traps.cc at line 59 [6.5308]