Indented with src/scripts/indent-emp.
This commit is contained in:
parent
5f263a7753
commit
9b7adfbecc
437 changed files with 52211 additions and 51052 deletions
|
|
@ -53,275 +53,272 @@
|
|||
int
|
||||
sona(void)
|
||||
{
|
||||
struct nstr_item ni, nit;
|
||||
struct sctstr sect;
|
||||
struct shpstr ship;
|
||||
struct shpstr targ;
|
||||
struct natstr *natp;
|
||||
struct mchrstr *mcp;
|
||||
struct mchrstr *tmcp;
|
||||
struct nstr_sect ns;
|
||||
int range;
|
||||
int pingrange;
|
||||
int srange;
|
||||
int vrange;
|
||||
int dist;
|
||||
int x,y;
|
||||
int cx,cy;
|
||||
int mines;
|
||||
int changed = 0;
|
||||
int row;
|
||||
/* Where these are used are non-re-entrant, so we keep 'em around */
|
||||
static s_char **rad = (s_char **)0;
|
||||
static s_char *radbuf = (s_char *)0;
|
||||
static s_char **vis = (s_char **)0;
|
||||
static s_char *visbuf = (s_char *)0;
|
||||
struct nstr_item ni, nit;
|
||||
struct sctstr sect;
|
||||
struct shpstr ship;
|
||||
struct shpstr targ;
|
||||
struct natstr *natp;
|
||||
struct mchrstr *mcp;
|
||||
struct mchrstr *tmcp;
|
||||
struct nstr_sect ns;
|
||||
int range;
|
||||
int pingrange;
|
||||
int srange;
|
||||
int vrange;
|
||||
int dist;
|
||||
int x, y;
|
||||
int cx, cy;
|
||||
int mines;
|
||||
int changed = 0;
|
||||
int row;
|
||||
/* Where these are used are non-re-entrant, so we keep 'em around */
|
||||
static s_char **rad = (s_char **)0;
|
||||
static s_char *radbuf = (s_char *)0;
|
||||
static s_char **vis = (s_char **)0;
|
||||
static s_char *visbuf = (s_char *)0;
|
||||
|
||||
if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
|
||||
return RET_SYN;
|
||||
if (!radbuf)
|
||||
radbuf = (s_char *)malloc((WORLD_Y*(WORLD_X+1)) * sizeof(s_char));
|
||||
if (!visbuf)
|
||||
visbuf = (s_char *)malloc((WORLD_Y*(WORLD_X+1)) * sizeof(s_char));
|
||||
if (!rad) {
|
||||
rad = (s_char **)malloc(WORLD_Y * sizeof(s_char *));
|
||||
if (rad && radbuf) {
|
||||
for (x = 0; x < WORLD_Y; x++) {
|
||||
rad[x] = &radbuf[(WORLD_X + 1) * x];
|
||||
}
|
||||
} else if (rad) {
|
||||
free((s_char *)rad);
|
||||
rad = (s_char **)0;
|
||||
if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
|
||||
return RET_SYN;
|
||||
if (!radbuf)
|
||||
radbuf =
|
||||
(s_char *)malloc((WORLD_Y * (WORLD_X + 1)) * sizeof(s_char));
|
||||
if (!visbuf)
|
||||
visbuf =
|
||||
(s_char *)malloc((WORLD_Y * (WORLD_X + 1)) * sizeof(s_char));
|
||||
if (!rad) {
|
||||
rad = (s_char **)malloc(WORLD_Y * sizeof(s_char *));
|
||||
if (rad && radbuf) {
|
||||
for (x = 0; x < WORLD_Y; x++) {
|
||||
rad[x] = &radbuf[(WORLD_X + 1) * x];
|
||||
}
|
||||
} else if (rad) {
|
||||
free((s_char *)rad);
|
||||
rad = (s_char **)0;
|
||||
}
|
||||
}
|
||||
if (!vis) {
|
||||
vis = (s_char **)malloc(WORLD_Y * sizeof(s_char *));
|
||||
if (vis && visbuf) {
|
||||
for (x = 0; x < WORLD_Y; x++) {
|
||||
vis[x] = &visbuf[(WORLD_X + 1) * x];
|
||||
}
|
||||
} else if (vis) {
|
||||
free((s_char *)vis);
|
||||
vis = (s_char **)0;
|
||||
}
|
||||
}
|
||||
if (!radbuf || !visbuf || !rad || !vis) {
|
||||
pr("Memory error, tell the deity.\n");
|
||||
logerror("malloc failed in sona\n");
|
||||
return RET_FAIL;
|
||||
}
|
||||
while (nxtitem(&ni, (s_char *)&ship)) {
|
||||
if (!player->owner)
|
||||
continue;
|
||||
mcp = &mchr[(int)ship.shp_type];
|
||||
if (!(mcp->m_flags & M_SONAR))
|
||||
continue;
|
||||
getsect(ship.shp_x, ship.shp_y, §);
|
||||
if (sect.sct_type != SCT_WATER)
|
||||
continue;
|
||||
range = (int)techfact(ship.shp_tech, (double)mcp->m_vrnge);
|
||||
srange = min(7, 7 * range * ship.shp_effic / 200);
|
||||
pr("%s at %s efficiency %d%%, max range %d\n",
|
||||
prship(&ship),
|
||||
xyas(ship.shp_x, ship.shp_y, player->cnum),
|
||||
ship.shp_effic, srange);
|
||||
snxtsct_dist(&ns, ship.shp_x, ship.shp_y, srange);
|
||||
blankfill((s_char *)radbuf, &ns.range, 1);
|
||||
while (nxtsct(&ns, §)) {
|
||||
if (player->owner || sect.sct_type == SCT_WATER)
|
||||
rad[ns.dy][ns.dx] = dchr[sect.sct_type].d_mnem;
|
||||
else {
|
||||
rad[ns.dy][ns.dx] = '?';
|
||||
}
|
||||
}
|
||||
if (!vis) {
|
||||
vis = (s_char **)malloc(WORLD_Y * sizeof(s_char *));
|
||||
if (vis && visbuf) {
|
||||
for (x = 0; x < WORLD_Y; x++) {
|
||||
vis[x] = &visbuf[(WORLD_X + 1) * x];
|
||||
snxtsct_dist(&ns, ship.shp_x, ship.shp_y, srange);
|
||||
cx = deltax(ship.shp_x, ns.range.lx);
|
||||
cy = deltay(ship.shp_y, ns.range.ly);
|
||||
while (nxtsct(&ns, §)) {
|
||||
if (!line_of_sight(rad, cx, cy, ns.dx, ns.dy)) {
|
||||
rad[ns.dy][ns.dx] = ' ';
|
||||
continue;
|
||||
}
|
||||
if (ship.shp_tech >= 310 && sect.sct_type == SCT_WATER) {
|
||||
mines = getvar(V_MINE, (s_char *)§, EF_SECTOR);
|
||||
if (mines) {
|
||||
pr("Sonar detects %d mines in %s!\n",
|
||||
mines, xyas(sect.sct_x, sect.sct_y, player->cnum));
|
||||
rad[ns.dy][ns.dx] = 'X';
|
||||
}
|
||||
} else if (vis) {
|
||||
free((s_char *)vis);
|
||||
vis = (s_char **)0;
|
||||
}
|
||||
changed |= map_set(player->cnum, sect.sct_x, sect.sct_y,
|
||||
rad[ns.dy][ns.dx], 0);
|
||||
|
||||
}
|
||||
bzero((s_char *)visbuf, (WORLD_Y * (WORLD_X + 1)));
|
||||
snxtitem_dist(&nit, EF_SHIP, ship.shp_x, ship.shp_y, range);
|
||||
while (nxtitem(&nit, (caddr_t)&targ)) {
|
||||
|
||||
if (targ.shp_own == player->cnum || targ.shp_own == 0)
|
||||
continue;
|
||||
tmcp = &mchr[(int)targ.shp_type];
|
||||
pingrange = min(7, max(targ.shp_visib, 10) * range / 10);
|
||||
vrange = pingrange * ship.shp_effic / 200;
|
||||
dist = mapdist(targ.shp_x, targ.shp_y, ship.shp_x, ship.shp_y);
|
||||
pingrange = (max(pingrange, 2) * targ.shp_effic) / 100;
|
||||
if (dist > pingrange)
|
||||
continue;
|
||||
if (tmcp->m_flags & M_SONAR && targ.shp_own) {
|
||||
natp = getnatp(targ.shp_own);
|
||||
if (natp->nat_flags & NF_SONAR)
|
||||
wu(0, targ.shp_own,
|
||||
"Sonar ping from %s detected by %s!\n",
|
||||
xyas(ship.shp_x, ship.shp_y,
|
||||
targ.shp_own), prship(&targ));
|
||||
if (targ.shp_rflags & RET_SONARED) {
|
||||
retreat_ship(&targ, 's');
|
||||
putship(targ.shp_uid, &targ);
|
||||
}
|
||||
}
|
||||
if (dist > vrange)
|
||||
continue;
|
||||
x = deltx(&ns.range, (int)targ.shp_x);
|
||||
y = delty(&ns.range, (int)targ.shp_y);
|
||||
if (rad[y][x] != dchr[SCT_WATER].d_mnem && rad[y][x] != 'X')
|
||||
continue;
|
||||
if (tmcp->m_flags & M_SUB &&
|
||||
getrel(getnatp(targ.shp_own), player->cnum) < FRIENDLY) {
|
||||
if (mcp->m_vrnge + targ.shp_visib < 8)
|
||||
pr("Sonar detects sub #%d @ %s\n",
|
||||
targ.shp_uid,
|
||||
xyas(targ.shp_x, targ.shp_y, player->cnum));
|
||||
else if (mcp->m_vrnge + targ.shp_visib < 10)
|
||||
pr("Sonar detects %s @ %s\n",
|
||||
prship(&targ),
|
||||
xyas(targ.shp_x, targ.shp_y, player->cnum));
|
||||
else
|
||||
pr("Sonar detects %s %s @ %s\n", cname(targ.shp_own),
|
||||
prship(&targ),
|
||||
xyas(targ.shp_x, targ.shp_y, player->cnum));
|
||||
} else
|
||||
pr("Sonar detects %s %s @ %s\n", cname(targ.shp_own),
|
||||
prship(&targ),
|
||||
xyas(targ.shp_x, targ.shp_y, player->cnum));
|
||||
|
||||
if (targ.shp_visib > vis[y][x]) {
|
||||
vis[y][x] = targ.shp_visib;
|
||||
/* &~0x20 makes it a cap letter */
|
||||
rad[y][x] = (*mchr[(int)targ.shp_type].m_name) & ~0x20;
|
||||
}
|
||||
}
|
||||
if (!radbuf || !visbuf || !rad || !vis) {
|
||||
pr("Memory error, tell the deity.\n");
|
||||
logerror("malloc failed in sona\n");
|
||||
return RET_FAIL;
|
||||
if (!player->argp[2]) {
|
||||
rad[cy][cx] = '0';
|
||||
for (row = 0; row < ns.range.height; row++)
|
||||
if (!blankrow(rad[row]))
|
||||
pr("%s\n", rad[row]);
|
||||
}
|
||||
while (nxtitem(&ni, (s_char *)&ship)) {
|
||||
if (!player->owner)
|
||||
continue;
|
||||
mcp = &mchr[(int)ship.shp_type];
|
||||
if (!(mcp->m_flags & M_SONAR))
|
||||
continue;
|
||||
getsect(ship.shp_x, ship.shp_y, §);
|
||||
if (sect.sct_type != SCT_WATER)
|
||||
continue;
|
||||
range = (int) techfact(ship.shp_tech,
|
||||
(double) mcp->m_vrnge);
|
||||
srange = min(7, 7 * range * ship.shp_effic / 200);
|
||||
pr("%s at %s efficiency %d%%, max range %d\n",
|
||||
prship(&ship),
|
||||
xyas(ship.shp_x, ship.shp_y, player->cnum),
|
||||
ship.shp_effic,
|
||||
srange);
|
||||
snxtsct_dist(&ns,ship.shp_x,ship.shp_y,srange);
|
||||
blankfill((s_char *)radbuf, &ns.range, 1);
|
||||
while(nxtsct(&ns,§)){
|
||||
if (player->owner || sect.sct_type == SCT_WATER)
|
||||
rad[ns.dy][ns.dx] = dchr[sect.sct_type].d_mnem;
|
||||
else {
|
||||
rad[ns.dy][ns.dx] = '?';
|
||||
}
|
||||
}
|
||||
snxtsct_dist(&ns,ship.shp_x,ship.shp_y,srange);
|
||||
cx = deltax(ship.shp_x, ns.range.lx);
|
||||
cy = deltay(ship.shp_y, ns.range.ly);
|
||||
while(nxtsct(&ns,§)) {
|
||||
if (!line_of_sight(rad, cx, cy, ns.dx, ns.dy)) {
|
||||
rad[ns.dy][ns.dx] = ' ';
|
||||
continue;
|
||||
}
|
||||
if (ship.shp_tech >= 310 &&
|
||||
sect.sct_type == SCT_WATER) {
|
||||
mines=getvar(V_MINE,(s_char *)§,EF_SECTOR);
|
||||
if (mines) {
|
||||
pr("Sonar detects %d mines in %s!\n",
|
||||
mines,
|
||||
xyas(sect.sct_x,sect.sct_y,player->cnum));
|
||||
rad[ns.dy][ns.dx] = 'X';
|
||||
}
|
||||
}
|
||||
changed |= map_set(player->cnum, sect.sct_x, sect.sct_y,
|
||||
rad[ns.dy][ns.dx], 0);
|
||||
pr("\n");
|
||||
|
||||
}
|
||||
bzero((s_char *)visbuf, (WORLD_Y * (WORLD_X + 1)));
|
||||
snxtitem_dist(&nit, EF_SHIP, ship.shp_x, ship.shp_y, range);
|
||||
while (nxtitem(&nit, (caddr_t)&targ)) {
|
||||
|
||||
if (targ.shp_own == player->cnum || targ.shp_own == 0)
|
||||
continue;
|
||||
tmcp = &mchr[(int)targ.shp_type];
|
||||
pingrange = min(7, max(targ.shp_visib,10)*range/10);
|
||||
vrange = pingrange * ship.shp_effic / 200;
|
||||
dist = mapdist(targ.shp_x, targ.shp_y,
|
||||
ship.shp_x, ship.shp_y);
|
||||
pingrange = (max(pingrange, 2) * targ.shp_effic)/100;
|
||||
if (dist > pingrange)
|
||||
continue;
|
||||
if (tmcp->m_flags & M_SONAR && targ.shp_own) {
|
||||
natp = getnatp(targ.shp_own);
|
||||
if (natp->nat_flags & NF_SONAR)
|
||||
wu(0, targ.shp_own,
|
||||
"Sonar ping from %s detected by %s!\n",
|
||||
|
||||
xyas(ship.shp_x, ship.shp_y,
|
||||
targ.shp_own),
|
||||
prship(&targ));
|
||||
if (targ.shp_rflags & RET_SONARED){
|
||||
retreat_ship(&targ, 's');
|
||||
putship(targ.shp_uid,&targ);
|
||||
}
|
||||
}
|
||||
if (dist > vrange)
|
||||
continue;
|
||||
x = deltx(&ns.range,(int)targ.shp_x);
|
||||
y = delty(&ns.range,(int)targ.shp_y);
|
||||
if (rad[y][x] != dchr[SCT_WATER].d_mnem &&
|
||||
rad[y][x] != 'X')
|
||||
continue;
|
||||
if (tmcp->m_flags & M_SUB &&
|
||||
getrel(getnatp(targ.shp_own), player->cnum) < FRIENDLY) {
|
||||
if (mcp->m_vrnge + targ.shp_visib < 8)
|
||||
pr("Sonar detects sub #%d @ %s\n",
|
||||
targ.shp_uid,
|
||||
xyas(targ.shp_x, targ.shp_y, player->cnum));
|
||||
else if (mcp->m_vrnge + targ.shp_visib < 10)
|
||||
pr("Sonar detects %s @ %s\n",
|
||||
prship(&targ),
|
||||
xyas(targ.shp_x, targ.shp_y, player->cnum));
|
||||
else
|
||||
pr("Sonar detects %s %s @ %s\n", cname(targ.shp_own),
|
||||
prship(&targ),
|
||||
xyas(targ.shp_x, targ.shp_y, player->cnum));
|
||||
} else
|
||||
pr("Sonar detects %s %s @ %s\n", cname(targ.shp_own),
|
||||
prship(&targ),
|
||||
xyas(targ.shp_x, targ.shp_y, player->cnum));
|
||||
|
||||
if (targ.shp_visib > vis[y][x]) {
|
||||
vis[y][x] = targ.shp_visib;
|
||||
/* &~0x20 makes it a cap letter */
|
||||
rad[y][x] = (*mchr[(int)targ.shp_type].m_name) & ~0x20;
|
||||
}
|
||||
}
|
||||
if (!player->argp[2]) {
|
||||
rad[cy][cx] = '0';
|
||||
for (row=0; row < ns.range.height; row++)
|
||||
if (!blankrow(rad[row]))
|
||||
pr("%s\n", rad[row]);
|
||||
}
|
||||
pr("\n");
|
||||
|
||||
}
|
||||
if (changed)
|
||||
writemap(player->cnum);
|
||||
return RET_OK;
|
||||
}
|
||||
if (changed)
|
||||
writemap(player->cnum);
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
void
|
||||
plane_sona(struct emp_qelem *plane_list, int x, int y, struct shiplook *head)
|
||||
plane_sona(struct emp_qelem *plane_list, int x, int y,
|
||||
struct shiplook *head)
|
||||
{
|
||||
struct plnstr *pp;
|
||||
struct plchrstr *pcp;
|
||||
struct mchrstr *tmcp;
|
||||
struct shpstr *targ,s;
|
||||
struct natstr *natp;
|
||||
struct emp_qelem *qp;
|
||||
struct emp_qelem *next;
|
||||
struct plist *ip;
|
||||
struct sctstr sect;
|
||||
int found=0;
|
||||
int range,i;
|
||||
int pingrange;
|
||||
int vrange;
|
||||
int dist;
|
||||
struct plnstr *pp;
|
||||
struct plchrstr *pcp;
|
||||
struct mchrstr *tmcp;
|
||||
struct shpstr *targ, s;
|
||||
struct natstr *natp;
|
||||
struct emp_qelem *qp;
|
||||
struct emp_qelem *next;
|
||||
struct plist *ip;
|
||||
struct sctstr sect;
|
||||
int found = 0;
|
||||
int range, i;
|
||||
int pingrange;
|
||||
int vrange;
|
||||
int dist;
|
||||
|
||||
getsect(x,y,§);
|
||||
if ((sect.sct_type != SCT_WATER) && (sect.sct_type != SCT_HARBR))
|
||||
return;
|
||||
for (qp = plane_list->q_forw; qp != plane_list; qp = next) {
|
||||
next = qp->q_forw;
|
||||
ip = (struct plist *) qp;
|
||||
pp = &ip->plane;
|
||||
pcp = ip->pcp;
|
||||
if (!(pcp->pl_flags & P_A)) /* if it isn't an ASW plane */
|
||||
continue;
|
||||
range = (int) techfact(pp->pln_tech, (double) ((100-pp->pln_acc)/10));
|
||||
getsect(x, y, §);
|
||||
if ((sect.sct_type != SCT_WATER) && (sect.sct_type != SCT_HARBR))
|
||||
return;
|
||||
for (qp = plane_list->q_forw; qp != plane_list; qp = next) {
|
||||
next = qp->q_forw;
|
||||
ip = (struct plist *)qp;
|
||||
pp = &ip->plane;
|
||||
pcp = ip->pcp;
|
||||
if (!(pcp->pl_flags & P_A)) /* if it isn't an ASW plane */
|
||||
continue;
|
||||
range =
|
||||
(int)techfact(pp->pln_tech,
|
||||
(double)((100 - pp->pln_acc) / 10));
|
||||
/*
|
||||
for (i=0; targ = getshipp(i); i++) {
|
||||
*/
|
||||
for (i=0; getship(i,&s) ; i++) {
|
||||
targ = &s;
|
||||
if (targ->shp_own == pp->pln_own || targ->shp_own == 0)
|
||||
continue;
|
||||
for (i = 0; getship(i, &s); i++) {
|
||||
targ = &s;
|
||||
if (targ->shp_own == pp->pln_own || targ->shp_own == 0)
|
||||
continue;
|
||||
/*
|
||||
if (have_looked(targ->shp_uid,head))
|
||||
continue;
|
||||
*/
|
||||
if (have_found(targ->shp_uid,head))
|
||||
continue;
|
||||
set_have_looked(targ->shp_uid,head);
|
||||
tmcp = &mchr[(int)targ->shp_type];
|
||||
if (!(tmcp->m_flags & M_SUB))
|
||||
continue;
|
||||
if (roll(100) > pln_identchance(pp, shp_hardtarget(targ), EF_SHIP))
|
||||
continue;
|
||||
pingrange = max(targ->shp_visib, 10) * range / 10;
|
||||
vrange = ((float)pingrange) * ((float)pp->pln_effic / 200.0);
|
||||
dist = mapdist(targ->shp_x, targ->shp_y, x, y);
|
||||
pingrange = (max(pingrange, 2) * targ->shp_effic);
|
||||
pingrange = roundavg(pingrange/100.0);
|
||||
if (dist > pingrange)
|
||||
continue;
|
||||
if (tmcp->m_flags & M_SONAR && targ->shp_own) {
|
||||
natp = getnatp(targ->shp_own);
|
||||
if (natp->nat_flags & NF_SONAR)
|
||||
wu(0, targ->shp_own,
|
||||
"Sonar ping from %s detected by %s!\n",
|
||||
xyas(x, y, targ->shp_own),
|
||||
prship(targ));
|
||||
}
|
||||
if ((dist > vrange))
|
||||
continue;
|
||||
set_have_found(targ->shp_uid,head);
|
||||
if (!found){
|
||||
mpr(pp->pln_own,
|
||||
"\nSonar contact in %s\n",xyas(x,y,pp->pln_own));
|
||||
found=1;
|
||||
}
|
||||
if (getrel(getnatp(targ->shp_own), pp->pln_own) < FRIENDLY &&
|
||||
roll(100) > pln_identchance(pp, shp_hardtarget(targ), EF_SHIP))
|
||||
if (roll(100) > pln_identchance(pp, shp_hardtarget(targ), EF_SHIP))
|
||||
mpr(pp->pln_own,
|
||||
"sub #%d %s\n",
|
||||
targ->shp_uid,
|
||||
xyas(targ->shp_x, targ->shp_y, pp->pln_own));
|
||||
else
|
||||
mpr(pp->pln_own,
|
||||
"%s %s\n",
|
||||
prship(targ),
|
||||
xyas(targ->shp_x, targ->shp_y, pp->pln_own));
|
||||
else
|
||||
mpr(pp->pln_own,
|
||||
"%s %s @ %s\n", cname(targ->shp_own),
|
||||
prship(targ),
|
||||
xyas(targ->shp_x, targ->shp_y, pp->pln_own));
|
||||
}
|
||||
if (have_found(targ->shp_uid, head))
|
||||
continue;
|
||||
set_have_looked(targ->shp_uid, head);
|
||||
tmcp = &mchr[(int)targ->shp_type];
|
||||
if (!(tmcp->m_flags & M_SUB))
|
||||
continue;
|
||||
if (roll(100) >
|
||||
pln_identchance(pp, shp_hardtarget(targ), EF_SHIP))
|
||||
continue;
|
||||
pingrange = max(targ->shp_visib, 10) * range / 10;
|
||||
vrange = ((float)pingrange) * ((float)pp->pln_effic / 200.0);
|
||||
dist = mapdist(targ->shp_x, targ->shp_y, x, y);
|
||||
pingrange = (max(pingrange, 2) * targ->shp_effic);
|
||||
pingrange = roundavg(pingrange / 100.0);
|
||||
if (dist > pingrange)
|
||||
continue;
|
||||
if (tmcp->m_flags & M_SONAR && targ->shp_own) {
|
||||
natp = getnatp(targ->shp_own);
|
||||
if (natp->nat_flags & NF_SONAR)
|
||||
wu(0, targ->shp_own,
|
||||
"Sonar ping from %s detected by %s!\n",
|
||||
xyas(x, y, targ->shp_own), prship(targ));
|
||||
}
|
||||
if ((dist > vrange))
|
||||
continue;
|
||||
set_have_found(targ->shp_uid, head);
|
||||
if (!found) {
|
||||
mpr(pp->pln_own,
|
||||
"\nSonar contact in %s\n", xyas(x, y, pp->pln_own));
|
||||
found = 1;
|
||||
}
|
||||
if (getrel(getnatp(targ->shp_own), pp->pln_own) < FRIENDLY &&
|
||||
roll(100) > pln_identchance(pp, shp_hardtarget(targ),
|
||||
EF_SHIP))
|
||||
if (roll(100) >
|
||||
pln_identchance(pp, shp_hardtarget(targ), EF_SHIP))
|
||||
mpr(pp->pln_own, "sub #%d %s\n", targ->shp_uid,
|
||||
xyas(targ->shp_x, targ->shp_y, pp->pln_own));
|
||||
else
|
||||
mpr(pp->pln_own,
|
||||
"%s %s\n",
|
||||
prship(targ),
|
||||
xyas(targ->shp_x, targ->shp_y, pp->pln_own));
|
||||
else
|
||||
mpr(pp->pln_own,
|
||||
"%s %s @ %s\n", cname(targ->shp_own),
|
||||
prship(targ),
|
||||
xyas(targ->shp_x, targ->shp_y, pp->pln_own));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -336,67 +333,67 @@ plane_sona(struct emp_qelem *plane_list, int x, int y, struct shiplook *head)
|
|||
int
|
||||
line_of_sight(s_char **rad, int ax, int ay, int bx, int by)
|
||||
{
|
||||
int dx = bx - ax;
|
||||
int dy = by - ay;
|
||||
int dlen = LEN(dx, dy);
|
||||
int n;
|
||||
int cx = 0;
|
||||
int cy = 0;
|
||||
int tx, ty; /* test point */
|
||||
double cd_dist = dlen; /* closest distance from c to vector d */
|
||||
double md_dist; /* minimum distance from t to vector d */
|
||||
double td_dist; /* distance from t to vector d */
|
||||
double td_proj; /* the projection of t onto vector d */
|
||||
int closest; /* index of closest */
|
||||
int blocked = 0;
|
||||
struct sctstr *sectp;
|
||||
int dx = bx - ax;
|
||||
int dy = by - ay;
|
||||
int dlen = LEN(dx, dy);
|
||||
int n;
|
||||
int cx = 0;
|
||||
int cy = 0;
|
||||
int tx, ty; /* test point */
|
||||
double cd_dist = dlen; /* closest distance from c to vector d */
|
||||
double md_dist; /* minimum distance from t to vector d */
|
||||
double td_dist; /* distance from t to vector d */
|
||||
double td_proj; /* the projection of t onto vector d */
|
||||
int closest; /* index of closest */
|
||||
int blocked = 0;
|
||||
struct sctstr *sectp;
|
||||
|
||||
while (cd_dist) {
|
||||
if (blocked)
|
||||
return 0;
|
||||
md_dist = 100; /* will always be <= 2 */
|
||||
closest = -1;
|
||||
for (n = 1; n <= 6; ++n) { /* Directions */
|
||||
tx = cx + diroff[n][0];
|
||||
ty = cy + diroff[n][1];
|
||||
if (DIST(tx,ty,dx,dy) >= cd_dist)
|
||||
continue;
|
||||
td_proj = (double)DOT(tx,ty,dx,dy) / dlen;
|
||||
td_dist = DIST(tx,ty,td_proj*dx,td_proj*dy);
|
||||
if (td_dist < md_dist) {
|
||||
md_dist = td_dist;
|
||||
closest = n;
|
||||
}
|
||||
}
|
||||
if (closest < 0) /* not possible */
|
||||
return 0;
|
||||
cx = cx + diroff[closest][0];
|
||||
cy = cy + diroff[closest][1];
|
||||
if (rad) {
|
||||
blocked = (rad[ay+cy][ax+cx] != dchr[SCT_WATER].d_mnem);
|
||||
} else {
|
||||
sectp = getsectp((ax + cx), (ay + cy));
|
||||
if (sectp) {
|
||||
if (sectp->sct_type == SCT_WATER ||
|
||||
sectp->sct_type == SCT_BSPAN) {
|
||||
blocked = 0;
|
||||
} else {
|
||||
blocked = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
cd_dist = DIST(cx,cy,dx,dy);
|
||||
while (cd_dist) {
|
||||
if (blocked)
|
||||
return 0;
|
||||
md_dist = 100; /* will always be <= 2 */
|
||||
closest = -1;
|
||||
for (n = 1; n <= 6; ++n) { /* Directions */
|
||||
tx = cx + diroff[n][0];
|
||||
ty = cy + diroff[n][1];
|
||||
if (DIST(tx, ty, dx, dy) >= cd_dist)
|
||||
continue;
|
||||
td_proj = (double)DOT(tx, ty, dx, dy) / dlen;
|
||||
td_dist = DIST(tx, ty, td_proj * dx, td_proj * dy);
|
||||
if (td_dist < md_dist) {
|
||||
md_dist = td_dist;
|
||||
closest = n;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
if (closest < 0) /* not possible */
|
||||
return 0;
|
||||
cx = cx + diroff[closest][0];
|
||||
cy = cy + diroff[closest][1];
|
||||
if (rad) {
|
||||
blocked = (rad[ay + cy][ax + cx] != dchr[SCT_WATER].d_mnem);
|
||||
} else {
|
||||
sectp = getsectp((ax + cx), (ay + cy));
|
||||
if (sectp) {
|
||||
if (sectp->sct_type == SCT_WATER ||
|
||||
sectp->sct_type == SCT_BSPAN) {
|
||||
blocked = 0;
|
||||
} else {
|
||||
blocked = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
cd_dist = DIST(cx, cy, dx, dy);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int
|
||||
blankrow(s_char *s)
|
||||
{
|
||||
while (*s) {
|
||||
if (*s != ' ')
|
||||
return 0;
|
||||
++s;
|
||||
}
|
||||
return 1;
|
||||
while (*s) {
|
||||
if (*s != ' ')
|
||||
return 0;
|
||||
++s;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue