]> git.pond.sub.org Git - empserver/commitdiff
(init_nats): Use CANT_HAPPEN() where appropriate.
authorMarkus Armbruster <armbru@pond.sub.org>
Thu, 23 Feb 2006 07:38:38 +0000 (07:38 +0000)
committerMarkus Armbruster <armbru@pond.sub.org>
Thu, 23 Feb 2006 07:38:38 +0000 (07:38 +0000)
src/lib/player/init_nats.c

index 04db2a03d591addd6d4b470c022653b9978705bb..adfd0978f1445da6aacf0123ea644b4db6798c50 100644 (file)
@@ -55,7 +55,8 @@ init_nats(void)
     };
     struct natstr *np;
 
-    if ((np = getnatp(player->cnum)) == 0)
+    np = getnatp(player->cnum);
+    if (CANT_HAPPEN(!np))
        return -1;
     player->nstat = nstat[np->nat_stat];
     player->god = np->nat_stat == STAT_GOD;
@@ -86,8 +87,7 @@ nat_cap(int btu)
 
     np = getnatp(player->cnum);
     if (!getsect(np->nat_xcap, np->nat_ycap, &sect)) {
-       logerror("can't read %s's cap @ %d,%d",
-                np->nat_cnam, np->nat_xcap, np->nat_ycap);
+       CANT_HAPPEN("read cap");
        return -1;
     }
     if (np->nat_stat >= STAT_ACTIVE) {