nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

change xchar to other typedefs

Browse Source 
One of the drivers of this change was that screen coordinates require a
type that can hold values greater than 127. Parameters to the window
port routines require a large type in order to be able to have values
a fair bit larger than COLNO and ROWNO passed to them, particularly for
their use to the right of the map window.

This splits the uses of xchar into 3 different situations, and adjusts
their type and size:

                        xchar
                          |
               -----------------------
               |          |          |
            coordxy     xint16     xint8

coordxy: Actual x or y coordinates for various things (moved to 16-bits).

xint16:  Same data size as coordxy, but for non-coordinate use (16-bits).

xint8:   There are only a few use cases initially, where it was very
         plain to see that the variable could remain as 8-bits, rather
         than be bumped to 16-bits.  There are probably more such cases
         that could be changed after additional review.

Note: This first changed all xchar variables to coordxy. Some were
reviewed and got changed to xint16 or xint8 when it became apparent that
their usage was not for coordinates.

This increments EDITLEVEL in patchlevel.h
This commit is contained in:
nhmall
2022-06-30 23:48:18 -04:00
parent 751b6e646f
commit 30b557f7d5
104 changed files with 1016 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ball.c
View File

@@ -431,8 +431,8 @@ set_bc(int already_blind)
* Should not be called while swallowed.
*/
void
move_bc(int before, int control, xchar ballx, xchar bally,
xchar chainx, xchar chainy)
move_bc(int before, int control, coordxy ballx, coordxy bally,
coordxy chainx, coordxy chainy)
{
if (Blind) {
/*
@@ -554,8 +554,8 @@ move_bc(int before, int control, xchar ballx, xchar bally,
/* return TRUE if the caller needs to place the ball and chain down again */
boolean
drag_ball(xchar x, xchar y, int *bc_control,
xchar *ballx, xchar *bally, xchar *chainx, xchar *chainy,
drag_ball(coordxy x, coordxy y, int *bc_control,
coordxy *ballx, coordxy *bally, coordxy *chainx, coordxy *chainy,
boolean *cause_delay, boolean allow_drag)
{
struct trap *t = (struct trap *) 0;
@@ -589,7 +589,7 @@ drag_ball(xchar x, xchar y, int *bc_control,
/* only need to move the chain? */
if (carried(uball) || distmin(x, y, uball->ox, uball->oy) <= 2) {
xchar oldchainx = uchain->ox, oldchainy = uchain->oy;
coordxy oldchainx = uchain->ox, oldchainy = uchain->oy;
*bc_control = BC_CHAIN;
move_bc(1, *bc_control, *ballx, *bally, *chainx, *chainy);
@@ -646,7 +646,7 @@ drag_ball(xchar x, xchar y, int *bc_control,
* 0
*/
case 5: {
xchar tempx, tempy, tempx2, tempy2;
coordxy tempx, tempy, tempx2, tempy2;
/* find position closest to current position of chain;
no effect if current position is already OK */
@@ -835,7 +835,7 @@ drag_ball(xchar x, xchar y, int *bc_control,
*ballx = *chainx = x;
*bally = *chainy = y;
} else {
xchar newchainx = u.ux, newchainy = u.uy;
coordxy newchainx = u.ux, newchainy = u.uy;
/*
* Generally, chain moves to hero's previous location and ball
@@ -877,7 +877,7 @@ DISABLE_WARNING_FORMAT_NONLITERAL
* Should not be called while swallowed.
*/
void
drop_ball(xchar x, xchar y)
drop_ball(coordxy x, coordxy y)
{
if (Blind) {
/* get the order */