From 08501fa9c3d53d837b39a13acca0e23d94dcd0f5 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 23 Feb 2006 07:38:38 +0000 Subject: [PATCH] (init_nats): Use CANT_HAPPEN() where appropriate. --- src/lib/player/init_nats.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c index 04db2a03..adfd0978 100644 --- a/src/lib/player/init_nats.c +++ b/src/lib/player/init_nats.c @@ -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, §)) { - 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) {