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

Merge branch 'master' into win32-x64-working

Browse Source 
Conflicts:
	src/options.c
This commit is contained in:
nhmall
2015-06-11 22:24:42 -04:00
parent b2a1d142ab af54125c22
commit 017e826837
9 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 cmd.c $NHDT-Date: 1433291955 2015/06/03 00:39:15 $ $NHDT-Branch: master $:$NHDT-Revision: 1.194 $ */
/* NetHack 3.6 cmd.c $NHDT-Date: 1434071945 2015/06/12 01:19:05 $ $NHDT-Branch: master $:$NHDT-Revision: 1.195 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1570,7 +1570,7 @@ int mode, final, attrindx;
alimit = ATTRMAX(attrindx);
/* criterium for whether the limit is interesting varies */
interesting_alimit =
final ? (abase != alimit)
final ? TRUE /* was originally `(abase != alimit)' */
: (alimit != (attrindx != A_STR ? 18 : STR18(100)));
paren_pfx = final ? " (" : " (current; ";
if (acurrent != abase) {
@@ -1584,7 +1584,9 @@ int mode, final, attrindx;
paren_pfx = ", ";
}
if (interesting_alimit) {
Sprintf(eos(valubuf), "%slimit:%s", paren_pfx,
Sprintf(eos(valubuf), "%s%slimit:%s", paren_pfx,
/* more verbose if exceeding 'limit' due to magic bonus */
(acurrent > alimit) ? "innate " : "",
attrval(attrindx, alimit, valstring));
/* paren_pfx = ", "; */
}

12
src/end.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 end.c $NHDT-Date: 1432512762 2015/05/25 00:12:42 $ $NHDT-Branch: master $:$NHDT-Revision: 1.98 $ */
/* NetHack 3.6 end.c $NHDT-Date: 1434071495 2015/06/12 01:11:35 $ $NHDT-Branch: master $:$NHDT-Revision: 1.99 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -539,21 +539,21 @@ VA_DECL(const char *, str)
#else
if (!wizard) {
if (sysopt.support)
raw_printf("To report this error, %s%s.", sysopt.support,
raw_printf("To report this error, %s%s", sysopt.support,
!program_state.something_worth_saving
? ""
? "."
: " and it may be possible to rebuild.");
else if (sysopt.wizards) {
char *tmp = build_english_list(sysopt.wizards);
raw_printf("To report this error, contact %s%s", tmp,
!program_state.something_worth_saving
? ""
? "."
: " and it may be possible to rebuild.");
free(tmp);
} else
raw_printf("Report error to \"%s\"%s.", WIZARD_NAME,
raw_printf("Report error to \"%s\"%s", WIZARD_NAME,
!program_state.something_worth_saving
? ""
? "."
: " and it may be possible to rebuild.");
}
#endif

4
src/objnam.c
View File

@@ -2360,7 +2360,7 @@ rnd_otyp_by_wpnskill(skill)
schar skill;
{
int i, n = 0;
short otyp;
short otyp = STRANGE_OBJECT;
for (i = bases[WEAPON_CLASS];
i < NUM_OBJECTS && objects[i].oc_class == WEAPON_CLASS; i++)
if (objects[i].oc_skill == skill) {
@@ -2375,7 +2375,7 @@ schar skill;
if (--n < 0)
return i;
}
return STRANGE_OBJECT;
return otyp;
}
/*

8
src/options.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 options.c $NHDT-Date: 1434024839 2015/06/11 12:13:59 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.218 $ */
/* NetHack 3.6 options.c $NHDT-Date: 1434056951 2015/06/11 21:09:11 $ $NHDT-Branch: master $:$NHDT-Revision: 1.219 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -3072,7 +3072,7 @@ boolean tinitial, tfrom_file;
return;
}
/* menustyle:traditional or combo or full or partial */
/* menustyle:traditional or combination or full or partial */
if (match_optname(opts, "menustyle", 4, TRUE)) {
int tmp;
boolean val_required = (strlen(opts) > 5 && !negated);
@@ -3366,7 +3366,7 @@ boolean tinitial, tfrom_file;
}
static NEARDATA const char *menutype[] = { "traditional", "combination",
"partial", "full" };
"full", "partial" };
static NEARDATA const char *burdentype[] = { "unencumbered", "burdened",
"stressed", "strained",
@@ -4810,7 +4810,6 @@ const char *mapping;
{
struct autopickup_exception *ape, **apehead;
char text[256], *text2;
int textsize = 0;
boolean grab = FALSE;
if (sscanf(mapping, "\"%255[^\"]\"", text) == 1) {
@@ -4822,7 +4821,6 @@ const char *mapping;
grab = FALSE;
++text2;
}
textsize = strlen(text2);
apehead = (grab) ? &iflags.autopickup_exceptions[AP_GRAB]
: &iflags.autopickup_exceptions[AP_LEAVE];
ape = (struct autopickup_exception *) alloc(

4
src/version.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 version.c $NHDT-Date: 1432339708 2015/05/23 00:08:28 $ $NHDT-Branch: master $:$NHDT-Revision: 1.30 $ */
/* NetHack 3.6 version.c $NHDT-Date: 1434025553 2015/06/11 12:25:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.31 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -15,7 +15,7 @@
#include "patchlevel.h"
#endif
#define BETA_INFO "Beta1"
#define BETA_INFO "Beta2"
/* fill buffer with short version (so caller can avoid including date.h) */
char *