X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fcommands%2Fload.c;h=0e8bea59816cc92f5b93d6191e5101c3189c5d8e;hp=4e46212a98cca224b17edd63bc483b05a4f041be;hb=8cb7b755574f67e43d752fb46cf090ee6d23177a;hpb=6807cd91b5b8aa457ef18885b7dbca5ec8d5de9e diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c index 4e46212a9..0e8bea598 100644 --- a/src/lib/commands/load.c +++ b/src/lib/commands/load.c @@ -117,7 +117,7 @@ load(void) if (!player->owner) { if (load_unload == UNLOAD || !noisy) continue; - if (getrel(getnatp(ship.shp_own), player->cnum) < FRIENDLY) + if (relations_with(ship.shp_own, player->cnum) < FRIENDLY) continue; } @@ -145,7 +145,7 @@ load(void) } if (load_unload == UNLOAD && !player->owner - && getrel(getnatp(sect.sct_own), player->cnum) < FRIENDLY) { + && relations_with(sect.sct_own, player->cnum) < FRIENDLY) { if (noisy) pr("You can't unload into an unfriendly %s\n", dchr[sect.sct_type].d_name); @@ -251,7 +251,7 @@ lload(void) if (!player->owner) { if (load_unload == UNLOAD || !noisy) continue; - if (getrel(getnatp(land.lnd_own), player->cnum) != ALLIED) + if (relations_with(land.lnd_own, player->cnum) != ALLIED) continue; } @@ -266,7 +266,7 @@ lload(void) xyas(sect.sct_x, sect.sct_y, player->cnum)); continue; } - if (getrel(getnatp(sect.sct_own), player->cnum) != ALLIED) { + if (relations_with(sect.sct_own, player->cnum) != ALLIED) { pr("Sector %s is not yours.\n", xyas(sect.sct_x, sect.sct_y, player->cnum)); continue;