be more consistent with coordinates

This commit is contained in:
nhmall
2022-07-02 09:10:03 -04:00
parent 0bd5b3d39e
commit 3004cf2d34
74 changed files with 831 additions and 746 deletions

View File

@@ -18,7 +18,7 @@ static boolean uncommon(int);
static int align_shift(struct permonst *);
static boolean mk_gen_ok(int, unsigned, unsigned);
static boolean wrong_elem_type(struct permonst *);
static void m_initgrp(struct monst *, int, int, int, mmflags_nht);
static void m_initgrp(struct monst *, coordxy, coordxy, int, mmflags_nht);
static void m_initthrow(struct monst *, int, int);
static void m_initweap(struct monst *);
static void m_initinv(struct monst *);
@@ -71,7 +71,7 @@ wrong_elem_type(struct permonst *ptr)
/* make a group just like mtmp */
static void
m_initgrp(struct monst *mtmp, int x, int y, int n, mmflags_nht mmflags)
m_initgrp(struct monst *mtmp, coordxy x, coordxy y, int n, mmflags_nht mmflags)
{
coord mm;
register int cnt = rnd(n);
@@ -1054,7 +1054,7 @@ makemon_rnd_goodpos(
coord *cc) /* output */
{
int tryct = 0;
int nx, ny;
coordxy nx, ny;
boolean good;
do {
@@ -1068,9 +1068,9 @@ makemon_rnd_goodpos(
/* else go through all map positions, twice, first round
ignoring positions in sight, and pick first good one.
skip first round if we're in special level loader or blind */
int xofs = nx;
int yofs = ny;
int dx,dy;
coordxy xofs = nx;
coordxy yofs = ny;
coordxy dx,dy;
int bl = (g.in_mklev || Blind) ? 1 : 0;
for ( ; bl < 2; bl++) {
@@ -1120,7 +1120,7 @@ makemon_rnd_goodpos(
struct monst *
makemon(
struct permonst *ptr,
int x, int y,
coordxy x, coordxy y,
mmflags_nht mmflags)
{
register struct monst *mtmp;
@@ -1514,7 +1514,7 @@ create_critters(int cnt,
boolean neverask)
{
coord c;
int x, y;
coordxy x, y;
struct monst *mon;
boolean known = FALSE;
boolean ask = (wizard && !neverask);