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

Merge remote-tracking branch 'origin/NetHack-3.6.0'

Browse Source
This commit is contained in:
keni
2017-08-15 07:59:38 -04:00
parent 54888b3e00 0840974b42
commit 88ed50523d
51 changed files with 2521 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
util/lev_main.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 lev_main.c $NHDT-Date: 1448074107 2015/11/21 02:48:27 $ $NHDT-Branch: master $:$NHDT-Revision: 1.43 $ */
/* NetHack 3.6 lev_main.c $NHDT-Date: 1501723418 2017/08/03 01:23:38 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.47 $ */
/* Copyright (c) 1989 by Jean-Christophe Collet */
/* NetHack may be freely redistributed. See license for details. */
@@ -281,7 +281,7 @@ char **argv;
}
fin = freopen(fname, "r", stdin);
if (!fin) {
lc_pline("Can't open \"%s\" for input.\n", fname);
lc_pline("Can't open \"%s\" for input.\n", VA_PASS1(fname));
perror(fname);
errors_encountered = TRUE;
} else {
@@ -615,14 +615,14 @@ VA_DECL2(sp_lev *, sp, const char *, fmt)
#ifdef USE_STDARG
static void
vadd_opvars(sp_lev *sp, const char *fmt, va_list the_args)
{
#else
static void
vadd_opvars(sp, fmt, the_args)
sp_lev *sp;
const char *fmt;
va_list the_args;
{
#endif
#else /* USE_STDARG | USE_VARARG */
@@ -632,7 +632,7 @@ va_list the_args;
void add_opvars
VA_DECL2(sp_lev *, sp, const char *, fmt)
#endif /* USE_STDARG | USE_VARARG */
{
const char *p, *lp;
long la;
/* Do NOT use VA_START and VA_END in here... see above */
@@ -644,56 +644,56 @@ VA_DECL2(sp_lev *, sp, const char *, fmt)
case 'i': /* integer */
{
struct opvar *ov = New(struct opvar);
set_opvar_int(ov, VA_NEXT(la, long) );
set_opvar_int(ov, VA_NEXT(la, long));
add_opcode(sp, SPO_PUSH, ov);
break;
}
case 'c': /* coordinate */
{
struct opvar *ov = New(struct opvar);
set_opvar_coord(ov, VA_NEXT(la, long) );
set_opvar_coord(ov, VA_NEXT(la, long));
add_opcode(sp, SPO_PUSH, ov);
break;
}
case 'r': /* region */
{
struct opvar *ov = New(struct opvar);
set_opvar_region(ov, VA_NEXT(la, long) );
set_opvar_region(ov, VA_NEXT(la, long));
add_opcode(sp, SPO_PUSH, ov);
break;
}
case 'm': /* mapchar */
{
struct opvar *ov = New(struct opvar);
set_opvar_mapchar(ov, VA_NEXT(la, long) );
set_opvar_mapchar(ov, VA_NEXT(la, long));
add_opcode(sp, SPO_PUSH, ov);
break;
}
case 'M': /* monster */
{
struct opvar *ov = New(struct opvar);
set_opvar_monst(ov, VA_NEXT(la, long) );
set_opvar_monst(ov, VA_NEXT(la, long));
add_opcode(sp, SPO_PUSH, ov);
break;
}
case 'O': /* object */
{
struct opvar *ov = New(struct opvar);
set_opvar_obj(ov, VA_NEXT(la, long) );
set_opvar_obj(ov, VA_NEXT(la, long));
add_opcode(sp, SPO_PUSH, ov);
break;
}
case 's': /* string */
{
struct opvar *ov = New(struct opvar);
set_opvar_str(ov, VA_NEXT(lp, const char *) );
set_opvar_str(ov, VA_NEXT(lp, const char *));
add_opcode(sp, SPO_PUSH, ov);
break;
}
case 'v': /* variable */
{
struct opvar *ov = New(struct opvar);
set_opvar_var(ov, VA_NEXT(lp, const char *) );
set_opvar_var(ov, VA_NEXT(lp, const char *));
add_opcode(sp, SPO_PUSH, ov);
break;
}
@@ -701,16 +701,21 @@ VA_DECL2(sp_lev *, sp, const char *, fmt)
{
long i = VA_NEXT(la, int);
if (i < 0 || i >= MAX_SP_OPCODES)
lc_pline("add_opvars: unknown opcode '%ld'.", i);
lc_pline("add_opvars: unknown opcode '%ld'.", VA_PASS1(i));
add_opcode(sp, i, NULL);
break;
}
default:
lc_pline("add_opvars: illegal format character '%c'.", *p);
lc_pline("add_opvars: illegal format character '%ld'.",
VA_PASS1((long) *p));
break;
}
}
return;
#if !(defined(USE_STDARG) || defined(USE_VARARGS))
/* provide closing brace for USE_OLDARGS nested block from VA_DECL2() */
VA_END();
#endif
}
void
@@ -770,7 +775,8 @@ char *name;
struct lc_funcdefs *f = New(struct lc_funcdefs);
if (!f) {
lc_error("Could not alloc function definition for '%s'.", name);
lc_error("Could not alloc function definition for '%s'.",
VA_PASS1(name));
return NULL;
}
f->next = NULL;
@@ -851,7 +857,8 @@ char *name;
struct lc_vardefs *f = New(struct lc_vardefs);
if (!f) {
lc_error("Could not alloc variable definition for '%s'.", name);
lc_error("Could not alloc variable definition for '%s'.",
VA_PASS1(name));
return NULL;
}
f->next = NULL;
@@ -870,7 +877,7 @@ struct lc_vardefs *fchain;
while (tmp) {
if (be_verbose && (tmp->n_used == 0))
lc_warning("Unused variable '%s'", tmp->name);
lc_warning("Unused variable '%s'", VA_PASS1(tmp->name));
nxt = tmp->next;
Free(tmp->name);
Free(tmp);
@@ -909,7 +916,7 @@ long spovar;
spovar &= ~SPOVAR_ARRAY;
switch (spovar) {
default:
lc_error("spovar2str(%ld)", spovar);
lc_error("spovar2str(%ld)", VA_PASS1(spovar));
break;
case SPOVAR_INT:
n = "integer";
@@ -965,9 +972,11 @@ long vartype;
if ((tmp = vardef_defined(vd, varname, 1)) != 0) {
if (tmp->var_type != vartype)
lc_error("Trying to use variable '%s' as %s, when it is %s.",
varname, spovar2str(vartype), spovar2str(tmp->var_type));
VA_PASS3(varname,
spovar2str(vartype),
spovar2str(tmp->var_type)));
} else
lc_error("Variable '%s' not defined.", varname);
lc_error("Variable '%s' not defined.", VA_PASS1(varname));
}
struct lc_vardefs *
@@ -981,7 +990,9 @@ long vartype;
if ((tmp = vardef_defined(vd, varname, 1)) != 0) {
if (tmp->var_type != vartype)
lc_error("Trying to redefine variable '%s' as %s, when it is %s.",
varname, spovar2str(vartype), spovar2str(tmp->var_type));
VA_PASS3(varname,
spovar2str(vartype),
spovar2str(tmp->var_type)));
} else {
tmp = vardef_new(vartype, varname);
tmp->next = vd;
@@ -1008,7 +1019,8 @@ int opcode;
case SPO_JGE:
return SPO_JL;
default:
lc_error("Cannot reverse comparison jmp opcode %d.", opcode);
lc_error("Cannot reverse comparison jmp opcode %ld.",
VA_PASS1((long) opcode));
return SPO_NULL;
}
}
@@ -1050,7 +1062,8 @@ struct opvar *ov;
tmpov->vardata.str[len] = '\0';
} break;
default: {
lc_error("Unknown opvar_clone value type (%d)!", ov->spovartyp);
lc_error("Unknown opvar_clone value type (%ld)!",
VA_PASS1((long) ov->spovartyp));
} /* default */
} /* switch */
return tmpov;
@@ -1079,9 +1092,10 @@ char *ldfname;
struct lc_funcdefs *f;
if (index(ldfname, '.'))
lc_error("Invalid dot ('.') in level name '%s'.", ldfname);
lc_error("Invalid dot ('.') in level name '%s'.", VA_PASS1(ldfname));
if ((int) strlen(ldfname) > 14)
lc_error("Level names limited to 14 characters ('%s').", ldfname);
lc_error("Level names limited to 14 characters ('%s').",
VA_PASS1(ldfname));
f = function_definitions;
while (f) {
f->n_called = 0;
@@ -1169,8 +1183,8 @@ char c;
if (!class || class == mons[i].mlet)
if (!case_insensitive_comp(s, mons[i].mname)) {
if (be_verbose)
lc_warning("Monster type \"%s\" matches \"%s\".", s,
mons[i].mname);
lc_warning("Monster type \"%s\" matches \"%s\".",
VA_PASS2(s, mons[i].mname));
return i;
}
return ERR;
@@ -1205,7 +1219,8 @@ char c; /* class */
objname = obj_descr[i].oc_name;
if (objname && !case_insensitive_comp(s, objname)) {
if (be_verbose)
lc_warning("Object type \"%s\" matches \"%s\".", s, objname);
lc_warning("Object type \"%s\" matches \"%s\".",
VA_PASS2(s, objname));
return i;
}
}
@@ -1314,14 +1329,14 @@ genericptr_t dat;
_opcode *tmp;
if ((opc < 0) || (opc >= MAX_SP_OPCODES))
lc_error("Unknown opcode '%d'", opc);
lc_error("Unknown opcode '%ld'", VA_PASS1((long) opc));
tmp = (_opcode *) alloc(sizeof(_opcode) * (nop + 1));
if (!tmp) { /* lint suppression */
/*NOTREACHED*/
#if 0
/* not possible; alloc() never returns Null */
lc_error("Could not alloc opcode space");
lc_error("%s", VA_PASS1("Could not alloc opcode space"));
#endif
return;
}
@@ -1392,9 +1407,9 @@ sp_lev *sp;
for (i = 0; i < len; i++)
if ((tmpmap[max_hig][i] = what_map_char(map[i]))
== INVALID_TYPE) {
lc_warning("Invalid character '%c' @ (%d, %d) - replacing "
"with stone",
map[i], max_hig, i);
lc_warning(
"Invalid character '%ld' @ (%ld, %ld) - replacing with stone",
VA_PASS3((long) map[i], (long) max_hig, (long) i));
tmpmap[max_hig][i] = STONE;
}
while (i < max_len)
@@ -1409,8 +1424,9 @@ sp_lev *sp;
max_y_map = max_hig - 1;
if (max_len > MAP_X_LIM || max_hig > MAP_Y_LIM) {
lc_error("Map too large at (%d x %d), max is (%d x %d)", max_len,
max_hig, MAP_X_LIM, MAP_Y_LIM);
lc_error("Map too large at (%ld x %ld), max is (%ld x %ld)",
VA_PASS4((long) max_len, (long) max_hig,
(long) MAP_X_LIM, (long) MAP_Y_LIM));
}
mbuf = (char *) alloc(((max_hig - 1) * max_len) + (max_len - 1) + 2);
@@ -1420,7 +1436,8 @@ sp_lev *sp;
mbuf[((max_hig - 1) * max_len) + (max_len - 1) + 1] = '\0';
add_opvars(sp, "siio", VA_PASS4(mbuf, max_hig, max_len, SPO_MAP));
add_opvars(sp, "siio", VA_PASS4(mbuf, (long) max_hig, (long) max_len,
SPO_MAP));
for (dy = 0; dy < max_hig; dy++)
Free(tmpmap[dy]);

3
util/makedefs.c
View File

@@ -2238,9 +2238,6 @@ do_permonst()
Fprintf(ofp, "%s", Dont_Edit_Code);
Fprintf(ofp, "#ifndef PM_H\n#define PM_H\n");
if (strcmp(mons[0].mname, "playermon") != 0)
Fprintf(ofp, "\n#define\tPM_PLAYERMON\t(-1)");
for (i = 0; mons[i].mlet; i++) {
SpinCursor(3);

50
util/recover.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 recover.c $NHDT-Date: 1432512785 2015/05/25 00:13:05 $ $NHDT-Branch: master $:$NHDT-Revision: 1.15 $ */
/* NetHack 3.6 recover.c $NHDT-Date: 1501461282 2017/07/31 00:34:42 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.16 $ */
/* Copyright (c) Janet Walz, 1992. */
/* NetHack may be freely redistributed. See license for details. */
@@ -245,7 +245,7 @@ char *basename;
errno);
#endif
Fprintf(stderr, "Cannot open level 0 for %s.\n", basename);
return (-1);
return -1;
}
if (read(gfd, (genericptr_t) &hpid, sizeof hpid) != sizeof hpid) {
Fprintf(
@@ -253,7 +253,7 @@ char *basename;
"Checkpoint data incompletely written or subsequently clobbered;",
"recovery for \"", basename, "\" impossible.");
Close(gfd);
return (-1);
return -1;
}
if (read(gfd, (genericptr_t) &savelev, sizeof(savelev))
!= sizeof(savelev)) {
@@ -261,7 +261,7 @@ char *basename;
"impossible.\n",
basename);
Close(gfd);
return (-1);
return -1;
}
if ((read(gfd, (genericptr_t) savename, sizeof savename)
!= sizeof savename)
@@ -273,7 +273,7 @@ char *basename;
|| (read(gfd, (genericptr_t) &plbuf, pltmpsiz) != pltmpsiz)) {
Fprintf(stderr, "Error reading %s -- can't recover.\n", lock);
Close(gfd);
return (-1);
return -1;
}
/* save file should contain:
@@ -288,7 +288,7 @@ char *basename;
if (sfd < 0) {
Fprintf(stderr, "Cannot create savefile %s.\n", savename);
Close(gfd);
return (-1);
return -1;
}
lfd = open_levelfile(savelev);
@@ -296,7 +296,7 @@ char *basename;
Fprintf(stderr, "Cannot open level of save for %s.\n", basename);
Close(gfd);
Close(sfd);
return (-1);
return -1;
}
if (write(sfd, (genericptr_t) &version_data, sizeof version_data)
@@ -304,7 +304,8 @@ char *basename;
Fprintf(stderr, "Error writing %s; recovery failed.\n", savename);
Close(gfd);
Close(sfd);
return (-1);
Close(lfd);
return -1;
}
if (write(sfd, (genericptr_t) &sfi, sizeof sfi) != sizeof sfi) {
@@ -313,7 +314,8 @@ char *basename;
savename);
Close(gfd);
Close(sfd);
return (-1);
Close(lfd);
return -1;
}
if (write(sfd, (genericptr_t) &pltmpsiz, sizeof pltmpsiz)
@@ -323,7 +325,8 @@ char *basename;
savename);
Close(gfd);
Close(sfd);
return (-1);
Close(lfd);
return -1;
}
if (write(sfd, (genericptr_t) &plbuf, pltmpsiz) != pltmpsiz) {
@@ -331,7 +334,8 @@ char *basename;
savename);
Close(gfd);
Close(sfd);
return (-1);
Close(lfd);
return -1;
}
copy_bytes(lfd, sfd);
@@ -364,25 +368,27 @@ char *basename;
#if 0 /* OBSOLETE, HackWB is no longer in use */
#ifdef AMIGA
/* we need to create an icon for the saved game
* or HackWB won't notice the file.
*/
{
{
/* we need to create an icon for the saved game
* or HackWB won't notice the file.
*/
char iconfile[FILENAME];
int in, out;
(void) sprintf(iconfile, "%s.info", savename);
in = open("NetHack:default.icon", O_RDONLY);
out = open(iconfile, O_WRONLY | O_TRUNC | O_CREAT);
if(in > -1 && out > -1){
copy_bytes(in,out);
}
if(in > -1)close(in);
if(out > -1)close(out);
if (in > -1 && out > -1) {
copy_bytes(in, out);
}
if (in > -1)
close(in);
if (out > -1)
close(out);
}
#endif /*AMIGA*/
#endif
#endif
return (0);
return 0;
}
#ifdef EXEPATH