fiddlerwoaroof/crawl - Change DHXIQXK5VTL5JDDEERAVLZK4KBQLXFTBN5TQ6MH3PRBLG5ULOS4AC

Added "error" channel for runtime errors, and changed error messages that

used the "danger" or "warning" channels to use that. Sending an error message to the error channel has the side effect of interrupting all activity.

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

Created by zelgadis on May 26, 2008

DHXIQXK5VTL5JDDEERAVLZK4KBQLXFTBN5TQ6MH3PRBLG5ULOS4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/traps.cc at line 507 [8.5308]

B:BD[8.16197] → [8.16197:16250]

            mpr("Error - couldn't find that trap.");

[8.16197]

[8.16250]

            mpr("Error - couldn't find that trap.", MSGCH_ERROR);

Replacement in crawl-ref/source/stash.cc at line 69 [10.147324]

∅:D[2.529] → [9.377:440]

B:BD[9.377] → [9.377:440]

        mprf(MSGCH_WARN, "Lua error: %s", clua.error.c_str());

[2.529]

[10.148545]

        mprf(MSGCH_ERROR, "Lua error: %s", clua.error.c_str());

Replacement in crawl-ref/source/shopping.cc at line 1509 [11.759950]

B:BD[11.797759] → [12.3694:3749]

        mpr("Help! Non-existent shop.", MSGCH_DANGER);

[11.797759]

[11.797800]

        mpr("Help! Non-existent shop.", MSGCH_ERROR);

Replacement in crawl-ref/source/religion.cc at line 4654 [11.804403]

B:BD[13.655] → [14.162:241]

        mprf(MSGCH_DANGER, "Bad god, no biscuit! %d", static_cast<int>(god) );

[13.655]

[13.720]

        mprf(MSGCH_ERROR, "Bad god, no biscuit! %d", static_cast<int>(god) );

Replacement in crawl-ref/source/player.cc at line 5289 [11.962854]
B:BD[15.3565] → [15.3565:3615]
```
        mprf(MSGCH_DANGER, "Bad stat: %d", stat);
```
[15.3565]
[15.3615]
```
        mprf(MSGCH_ERROR, "Bad stat: %d", stat);
```
Insertion in crawl-ref/source/mpr.h at line 50 [8.58938]
[16.6591]
[16.6591]
```
    MSGCH_ERROR,            // error messages
```

Replacement in crawl-ref/source/misc.cc at line 2879 [11.1933596]

B:BD[5.2835] → [5.2835:2909]

        mpr("ERROR: unknown transformation in your_hand() (spells4.cc)");

[5.2835]

[5.2909]

        mpr("ERROR: unknown transformation in your_hand() (spells4.cc)",
            MSGCH_ERROR);

Replacement in crawl-ref/source/message.cc at line 135 [11.1993826]

B:BD[17.2991] → [17.2991:3044]

            mpr("oops, hit overflow", MSGCH_DANGER);

[17.2991]

[17.3044]

            mpr("oops, hit overflow", MSGCH_ERROR);

Insertion in crawl-ref/source/message.cc at line 265 [11.1993826]
[11.1996889]
[11.1996889]
```
        case MSGCH_ERROR:
```

Insertion in crawl-ref/source/message.cc at line 375 [11.1993826]

[18.555978]


    if (channel == MSGCH_ERROR)
        interrupt_activity( AI_FORCE_INTERRUPT );

Replacement in crawl-ref/source/message.cc at line 409 [11.1993826]
B:BD[19.5497] → [19.5497:5532]
```
        if (channel == MSGCH_WARN)
```
[19.5497]
[19.5532]
```
        if (channel == MSGCH_ERROR)
```
Replacement in crawl-ref/source/maps.cc at line 136 [11.2007666]
∅:D[20.650] → [21.582:638]
B:BD[21.582] → [21.582:638]
```
        mprf(MSGCH_WARN, "Lua error: %s", err.c_str());
```
[20.650]
[21.638]
```
        mprf(MSGCH_ERROR, "Lua error: %s", err.c_str());
```

Replacement in crawl-ref/source/maps.cc at line 144 [11.2007666]

B:BD[22.4675] → [22.4675:4727]

        mprf(MSGCH_WARN, "Error: %s", err.c_str());

[22.4675]

[22.4727]

        mprf(MSGCH_ERROR, "Error: %s", err.c_str());

Replacement in crawl-ref/source/maps.cc at line 724 [11.2007666]

B:BD[23.2093] → [23.2093:2172]

                mprf(MSGCH_WARN, "Lua error: %s", chunk.orig_error().c_str());

[23.2093]

[23.2172]

                mprf(MSGCH_ERROR, "Lua error: %s", chunk.orig_error().c_str());

Replacement in crawl-ref/source/maps.cc at line 733 [11.2007666]

B:BD[24.5493] → [24.5493:5552]

                mprf(MSGCH_WARN, "Lua error (map %s): %s",

[24.5493]

[24.5552]

                mprf(MSGCH_ERROR, "Lua error (map %s): %s",

Replacement in crawl-ref/source/mapmark.cc at line 176 [26.13502]

B:BD[25.567] → [25.567:646]

            mprf(MSGCH_WARN, "lua_marker load error: %s", dlua.error.c_str());

[25.567]

[25.646]

            mprf(MSGCH_ERROR, "lua_marker load error: %s", dlua.error.c_str());

Replacement in crawl-ref/source/mapmark.cc at line 178 [26.13502]

B:BD[25.693] → [25.693:772]

            mprf(MSGCH_WARN, "lua_marker exec error: %s", dlua.error.c_str());

[25.693]

[25.772]

            mprf(MSGCH_ERROR, "lua_marker exec error: %s", dlua.error.c_str());

Replacement in crawl-ref/source/mapmark.cc at line 183 [26.13502]

B:BD[25.872] → [25.872:938]

            mprf(MSGCH_WARN, "lua_marker_mapless exec error: %s",

[25.872]

[25.938]

            mprf(MSGCH_ERROR, "lua_marker_mapless exec error: %s",

Replacement in crawl-ref/source/mapmark.cc at line 213 [26.13502]

B:BD[19.7781] → [19.7781:7853]

        mprf(MSGCH_WARN, "lua_marker: Expected table, didn't get it.");

[19.7781]

[19.7853]

        mprf(MSGCH_ERROR, "lua_marker: Expected table, didn't get it.");

Replacement in crawl-ref/source/mapmark.cc at line 245 [26.13502]
B:BD[26.18556] → [19.8538:8588]
```
        mprf(MSGCH_WARN, "Couldn't find table.");
```
[26.18556]
[19.8588]
```
        mprf(MSGCH_ERROR, "Couldn't find table.");
```

Replacement in crawl-ref/source/mapmark.cc at line 325 [26.13502]

B:BD[19.10843] → [19.10843:10907]

        mprf(MSGCH_WARN, "mlua error: %s", dlua.error.c_str());

[19.10843]

[19.10907]

        mprf(MSGCH_ERROR, "mlua error: %s", dlua.error.c_str());

Replacement in crawl-ref/source/mapmark.cc at line 343 [26.13502]

B:BD[19.11237] → [19.11237:11297]

        mprf(MSGCH_WARN, "notify_dgn_event: Lua error: %s",

[19.11237]

[19.11297]

        mprf(MSGCH_ERROR, "notify_dgn_event: Lua error: %s",

Replacement in crawl-ref/source/mapdef.cc at line 1383 [18.594797]

B:BD[21.1080] → [21.1080:1158]

            mprf(MSGCH_WARN, "Lua error: %s", validate.orig_error().c_str());

[21.1080]

[21.1158]

            mprf(MSGCH_ERROR, "Lua error: %s", validate.orig_error().c_str());

Replacement in crawl-ref/source/mapdef.cc at line 1394 [18.594797]

B:BD[21.1324] → [21.1324:1370]

            mprf(MSGCH_WARN, "Lua error: %s",

[21.1324]

[21.1370]

            mprf(MSGCH_ERROR, "Lua error: %s",

Replacement in crawl-ref/source/items.cc at line 448 [11.2584728]

B:BD[11.2595448] → [6.3043:3125]

    mprf( MSGCH_DANGER, "BUG WARNING: Problems unlinking item '%s', (%d, %d)!!!",

[11.2595448]

[6.3125]

    mprf(MSGCH_ERROR, "BUG WARNING: Problems unlinking item '%s', (%d, %d)!!!",

Replacement in crawl-ref/source/items.cc at line 501 [11.2584728]

B:BD[11.2596978] → [11.2596978:2597059]

        mpr("BUG WARNING: Item didn't seem to be linked at all.", MSGCH_DANGER);

[11.2596978]

[11.2597059]

        mpr("BUG WARNING: Item didn't seem to be linked at all.",
            MSGCH_ERROR);

Replacement in crawl-ref/source/initfile.cc at line 217 [11.2957258]

B:BD[16.11186] → [16.11186:11256]

    "multiturn", "examine", "examine_filter", "diagnostic","tutorial"

[16.11186]

[10.391987]

    "multiturn", "examine", "examine_filter", "diagnostic", "error",
    "tutorial"

Replacement in crawl-ref/source/initfile.cc at line 1396 [11.2957258]

B:BD[27.307] → [27.307:384]

                    mprf(MSGCH_WARN, "Lua error: %s\n", clua.error.c_str());

[27.307]

[10.402593]

                    mprf(MSGCH_ERROR, "Lua error: %s\n", clua.error.c_str());

Replacement in crawl-ref/source/initfile.cc at line 1411 [11.2957258]

B:BD[27.426] → [27.426:503]

                    mprf(MSGCH_WARN, "Lua error: %s\n", clua.error.c_str());

[27.426]

[10.403041]

                    mprf(MSGCH_ERROR, "Lua error: %s\n", clua.error.c_str());

Replacement in crawl-ref/source/initfile.cc at line 1445 [11.2957258]

B:BD[27.537] → [27.537:606]

            mprf(MSGCH_WARN, "Lua error: %s\n", clua.error.c_str());

[27.537]

[10.403739]

            mprf(MSGCH_ERROR, "Lua error: %s\n", clua.error.c_str());

Replacement in crawl-ref/source/initfile.cc at line 1901 [11.2957258]

B:BD[3.390] → [3.390:459]

            mprf(MSGCH_WARN, "Lua error: %s\n", clua.error.c_str());

[3.390]

[10.408808]

            mprf(MSGCH_ERROR, "Lua error: %s\n", clua.error.c_str());

Replacement in crawl-ref/source/initfile.cc at line 2779 [11.2957258]

B:BD[27.780] → [27.780:853]

                mprf(MSGCH_WARN, "Lua error: %s\n", clua.error.c_str());

[27.780]

[11.2980763]

                mprf(MSGCH_ERROR, "Lua error: %s\n", clua.error.c_str());

Replacement in crawl-ref/source/initfile.cc at line 2903 [11.2957258]

B:BD[7.10032] → [7.10032:10088]

        mprf(MSGCH_WARN, "Warning: %s", error.c_str());

[7.10032]

[7.10088]

        mprf(MSGCH_ERROR, "Warning: %s", error.c_str());

Replacement in crawl-ref/source/hiscores.cc at line 999 [11.2987663]

B:BD[4.592] → [4.592:649]

                    mpr("WARNING: Buggy rune in pack!");

[4.592]

[4.649]

                    mpr("WARNING: Buggy rune in pack!", MSGCH_ERROR);

Replacement in crawl-ref/source/files.cc at line 1791 [11.3084589]

B:BD[11.3125523] → [28.28775:28839]

        mprf("Error creating ghost file: %s", cha_fil.c_str());

[11.3125523]

[11.3125626]

        mprf(MSGCH_ERROR, "Error creating ghost file: %s", cha_fil.c_str());

Replacement in crawl-ref/source/dungeon.cc at line 1939 [11.3429798]

B:BD[29.9496] → [29.9496:9556]

            mprf(MSGCH_WARN, "No maps or tags named '%s'.",

[29.9496]

[29.9556]

            mprf(MSGCH_ERROR, "No maps or tags named '%s'.",

Replacement in crawl-ref/source/dungeon.cc at line 3966 [11.3429798]

B:BD[26.33978] → [26.33978:34059]

        mprf(MSGCH_WARN, "Unable to find exit from %s", place.map.name.c_str());

[26.33978]

[26.34059]

        mprf(MSGCH_ERROR, "Unable to find exit from %s",
             place.map.name.c_str());

Replacement in crawl-ref/source/delay.cc at line 1452 [11.3963459]

B:BD[18.1012800] → [30.332:399]

            mprf(MSGCH_WARN, "Lua error: %s", clua.error.c_str());

[18.1012800]

[11.3977248]

            mprf(MSGCH_ERROR, "Lua error: %s", clua.error.c_str());

Replacement in crawl-ref/source/debug.cc at line 1507 [11.4016436]
B:BD[11.4050654] → [11.4050654:4050683]
```
    mpr( name, MSGCH_WARN );
```
[11.4050654]
[11.4050683]
```
    mpr( name, MSGCH_ERROR );
```

Replacement in crawl-ref/source/debug.cc at line 1551 [11.4016436]

B:BD[11.4052264] → [31.29605:29684]

                    mprf(MSGCH_WARN, "Linked invalid item at (%d,%d)!", x, y);

[11.4052264]

[31.29684]

                    mprf(MSGCH_ERROR, "Linked invalid item at (%d,%d)!", x, y);

Replacement in crawl-ref/source/debug.cc at line 1559 [11.4016436]

B:BD[11.4052670] → [32.24537:24617]

                    mprf(MSGCH_WARN,"Item position incorrect at (%d,%d)!",x,y);

[11.4052670]

[31.29801]

                    mprf(MSGCH_ERROR,"Item position incorrect at (%d,%d)!",x,y);

Replacement in crawl-ref/source/debug.cc at line 1568 [11.4016436]
B:BD[11.4053166] → [32.24618:24655]
```
                    mprf(MSGCH_WARN,
```
[11.4053166]
[32.24655]
```
                    mprf(MSGCH_ERROR,
```
Replacement in crawl-ref/source/debug.cc at line 1588 [11.4016436]
B:BD[11.4053809] → [11.4053809:4053858]
```
            mpr( "Unlinked item:", MSGCH_WARN );
```
[11.4053809]
[11.4053858]
```
            mpr( "Unlinked item:", MSGCH_ERROR );
```
Replacement in crawl-ref/source/debug.cc at line 1626 [11.4016436]
B:BD[11.4055379] → [11.4055379:4055423]
```
            mpr( "Bad item:", MSGCH_WARN );
```
[11.4055379]
[11.4055423]
```
            mpr( "Bad item:", MSGCH_ERROR );
```

Replacement in crawl-ref/source/debug.cc at line 1646 [11.4016436]

B:BD[11.4056256] → [11.4056256:4056317]

            mpr( "Bad plus or special value:", MSGCH_WARN );

[11.4056256]

[11.4056317]

            mpr( "Bad plus or special value:", MSGCH_ERROR );

Replacement in crawl-ref/source/debug.cc at line 1662 [11.4016436]

B:BD[11.4056851] → [32.25028:25115]

            mprf( MSGCH_WARN, "Program bug detected!" );
            mprf( MSGCH_WARN,

[11.4056851]

[32.25115]

            mprf( MSGCH_ERROR, "Program bug detected!" );
            mprf( MSGCH_ERROR,

Replacement in crawl-ref/source/debug.cc at line 2057 [11.4016436]

B:BD[33.5283] → [33.5283:5344]

        mprf("Can't write items.stat: %s", strerror(errno));

[33.5283]

[11.4057136]

        mprf(MSGCH_ERROR, "Can't write items.stat: %s", strerror(errno));

Replacement in crawl-ref/source/debug.cc at line 2939 [11.4016436]

B:BD[18.1033639] → [18.1033639:1033700]

        mprf("Can't write fight.stat: %s", strerror(errno));

[18.1033639]

[18.1033700]

        mprf(MSGCH_ERROR, "Can't write fight.stat: %s", strerror(errno));

Replacement in crawl-ref/source/debug.cc at line 3921 [11.4016436]
B:BD[34.10963] → [34.10963:10992]
```
            mprf(MSGCH_WARN,
```
[34.10963]
[34.10992]
```
            mprf(MSGCH_ERROR,
```

Replacement in crawl-ref/source/cloud.cc at line 361 [11.4095717]

B:BD[25.3120] → [25.3120:3190]

        mprf(MSGCH_DIAGNOSTICS, "Error while making fog machine: %s",

[25.3120]

[25.3190]

        mprf(MSGCH_ERROR, "Error while making fog machine: %s",

Replacement in crawl-ref/source/chardump.cc at line 1213 [11.4100336]

B:BD[11.4124387] → [35.756:816]

        mprf("Error opening file '%s'", file_name.c_str());

[11.4124387]

[36.24679]

        mprf(MSGCH_ERROR, "Error opening file '%s'", file_name.c_str());

Replacement in crawl-ref/source/acr.cc at line 3162 [11.4397395]

B:BD[37.11481] → [37.11481:11558]

        mprf(MSGCH_WARN, "Couldn't read %s: %s", SysEnv.messagefile.c_str(),

[37.11481]

[37.11558]

        mprf(MSGCH_ERROR, "Couldn't read %s: %s", SysEnv.messagefile.c_str(),

Replacement in crawl-ref/source/acr.cc at line 3172 [11.4397395]

B:BD[37.11759] → [37.11759:11837]

        mprf(MSGCH_WARN, "Failed to lock %s: %s", SysEnv.messagefile.c_str(),

[37.11759]

[37.11837]

        mprf(MSGCH_ERROR, "Failed to lock %s: %s", SysEnv.messagefile.c_str(),

Replacement in crawl-ref/source/acr.cc at line 3198 [11.4397395]

B:BD[37.12375] → [37.12375:12429]

            mprf(MSGCH_WARN, "Failed to lock %s: %s",

[37.12375]

[37.12429]

            mprf(MSGCH_ERROR, "Failed to lock %s: %s",

Replacement in crawl-ref/source/acr.cc at line 3206 [11.4397395]

B:BD[37.12604] → [37.12604:12660]

        mprf(MSGCH_WARN, "Unable to write lock %s: %s",

[37.12604]

[37.12660]

        mprf(MSGCH_ERROR, "Unable to write lock %s: %s",

Replacement in crawl-ref/docs/options_guide.txt at line 75 [39.63392]

B:BD[38.5786] → [38.5786:5840]

                examine_filter, diagnostics, tutorial

[38.5786]

[40.19488]

                examine_filter, diagnostics, error, tutorial

Insertion in crawl-ref/docs/options_guide.txt at line 1267 [39.63392]
[41.1423]
[41.1423]
```
   error           = error messages
```