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

Futureproofing hypothetical type mismatches

Browse Source 
If we ever want huge maps with COLNO or ROWNO larger than signed char,
this will at least allow the game to compile and start when typedef'ing
xchar to int. Trying to use huge maps exposes more bugs.
This commit is contained in:
Pasi Kallinen
2020-11-14 13:41:31 +02:00
parent 08310c8a71
commit 289c8d654d
8 changed files with 130 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/decl.h
View File

@@ -803,8 +803,8 @@ struct instance_globals {
/* display.c */
gbuf_entry gbuf[ROWNO][COLNO];
char gbuf_start[ROWNO];
char gbuf_stop[ROWNO];
xchar gbuf_start[ROWNO];
xchar gbuf_stop[ROWNO];
/* do.c */
@@ -828,7 +828,7 @@ struct instance_globals {
int petname_used; /* user preferred pet name has been used */
xchar gtyp; /* type of dog's current goal */
xchar gx; /* x position of dog's current goal */
char gy; /* y position of dog's current goal */
xchar gy; /* y position of dog's current goal */
char dogname[PL_PSIZ];
char catname[PL_PSIZ];
char horsename[PL_PSIZ];
@@ -1169,9 +1169,9 @@ struct instance_globals {
Stormbringer's maliciousness. */
/* vision.c */
char **viz_array; /* used in cansee() and couldsee() macros */
char *viz_rmin; /* min could see indices */
char *viz_rmax; /* max could see indices */
xchar **viz_array; /* used in cansee() and couldsee() macros */
xchar *viz_rmin; /* min could see indices */
xchar *viz_rmax; /* max could see indices */
boolean vision_full_recalc;
/* weapon.c */

4
include/extern.h
View File

@@ -1119,7 +1119,7 @@ E int NDECL(dosuspend);
E void FDECL(new_light_source, (XCHAR_P, XCHAR_P, int, int, ANY_P *));
E void FDECL(del_light_source, (int, ANY_P *));
E void FDECL(do_light_sources, (char **));
E void FDECL(do_light_sources, (xchar **));
E void FDECL(show_transient_light, (struct obj *, int, int));
E void NDECL(transient_light_cleanup);
E struct monst *FDECL(find_mid, (unsigned, unsigned));
@@ -2497,7 +2497,7 @@ E void FDECL(set_selection_floodfillchk, (int FDECL((*), (int,int))));
E void FDECL(selection_floodfill, (struct selectionvar *, int, int,
BOOLEAN_P));
E boolean FDECL(pm_good_location, (int, int, struct permonst *));
E void FDECL(get_location_coord, (schar *, schar *, int, struct mkroom *,
E void FDECL(get_location_coord, (xchar *, xchar *, int, struct mkroom *,
long));
E void FDECL(selection_setpoint, (int, int, struct selectionvar *, XCHAR_P));
E struct selectionvar * FDECL(selection_not, (struct selectionvar *));

2
include/mkroom.h
View File

@@ -9,7 +9,7 @@
/* mkroom.h - types and structures for room and shop initialization */
struct mkroom {
schar lx, hx, ly, hy; /* usually xchar, but hx may be -1 */
xchar lx, hx, ly, hy; /* usually xchar, but hx may be -1 */
schar rtype; /* type of room (zoo, throne, etc...) */
schar orig_rtype; /* same as rtype, but not zeroed later */
schar rlit; /* is the room lit ? */

2
include/patchlevel.h
View File

@@ -17,7 +17,7 @@
* Incrementing EDITLEVEL can be used to force invalidation of old bones
* and save files.
*/
#define EDITLEVEL 25
#define EDITLEVEL 26
/*
* Development status possibilities.