Use CANT_HAPPEN() rather than logerror() for some internal errors.

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index db3618fedb391e0b2dd871a0c59352395e0a57db..46a233c83d6e4bb4c4147e1409892031f4cdc05e 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.c
@@ -263,7 +263,7 @@ tend_nxtitem(struct nstr_item *np, caddr_t ptr)
                selected = 0;
            break;
        default:
-           logerror("nxtitem: bad selector %d\n", np->sel);
+           CANT_HAPPEN("bad np->sel");
            return 0;
        }
        if (selected && np->ncond) {

diff --git a/src/lib/subs/nxtitem.c b/src/lib/subs/nxtitem.c
index 93c7b093e16f60faa1103a8e51acd4a4c0d97bda..dd503f64f1d35fae280c5e927540626561949092 100644 (file)
--- a/src/lib/subs/nxtitem.c
+++ b/src/lib/subs/nxtitem.c
@@ -71,7 +71,6 @@ nxtitem(struct nstr_item *np, caddr_t ptr)
        switch (np->sel) {
            /*
             * This one won't work unless you're running in emp_player
-            *
             */
        case NS_LIST:
            if ((np->flags & EFF_OWNER) && !player->owner)
@@ -105,7 +104,7 @@ nxtitem(struct nstr_item *np, caddr_t ptr)
                selected = 0;
            break;
        default:
-           logerror("nxtitem: bad selector %d\n", np->sel);
+           CANT_HAPPEN("bad np->sel");
            return 0;
        }
        if (selected && np->ncond) {

diff --git a/src/lib/update/nxtitemp.c b/src/lib/update/nxtitemp.c
index 9825c400bd86cc86798c63ee234a9111b28828ac..133a419e2fe9bfa781b0f2c946ec815456c5b7e2 100644 (file)
--- a/src/lib/update/nxtitemp.c
+++ b/src/lib/update/nxtitemp.c
@@ -106,7 +106,7 @@ nxtitemp(struct nstr_item *np, int owner)
                selected = 0;
            break;
        default:
-           logerror("nxtitemp: bad selector %d\n", np->sel);
+           CANT_HAPPEN("bad np->sel");
            return 0;
        }
        if (selected && np->ncond) {