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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-05-17 16:19:17 -04:00
parent c5fbae0a4c f172c6fd94
commit b2dccb21a4
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/shk.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 shk.c $NHDT-Date: 1557508281 2019/05/10 17:11:21 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.161 $ */ /* NetHack 3.6 shk.c $NHDT-Date: 1558124088 2019/05/17 20:14:48 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.163 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -4789,8 +4789,8 @@ sasc_bug(struct obj *op, unsigned x)
/* /*
* When one glob is absorbed by another glob, the two become * When one glob is absorbed by another glob, the two become
* become indistinguishable and the remaining glob grows in * indistinguishable and the remaining glob grows in mass,
* mass, the product of both. * the product of both.
* *
* The original billed item is lost to the absorption and the * The original billed item is lost to the absorption and the
* original billed amount for the object being absorbed gets * original billed amount for the object being absorbed gets
@@ -4862,7 +4862,6 @@ struct obj *obj_absorber, *obj_absorbed;
if (obj_absorber->where == OBJ_FLOOR if (obj_absorber->where == OBJ_FLOOR
&& costly_spot(obj_absorber->ox, obj_absorber->oy)) { && costly_spot(obj_absorber->ox, obj_absorber->oy)) {
int x = obj_absorber->ox, y = obj_absorber->oy; int x = obj_absorber->ox, y = obj_absorber->oy;
char *o_shop = in_rooms(x, y, SHOPBASE);
struct monst *shkp = shop_keeper(*in_rooms(x, y, SHOPBASE)); struct monst *shkp = shop_keeper(*in_rooms(x, y, SHOPBASE));
struct eshk *eshkp = ESHK(shkp); struct eshk *eshkp = ESHK(shkp);
long amount, per_unit_cost = get_cost(obj_absorbed, shkp); long amount, per_unit_cost = get_cost(obj_absorbed, shkp);

8
sys/winnt/Makefile.msc
View File

@@ -379,7 +379,7 @@ MAKEVERSION=$(MAKEVERSION: =)
#!MESSAGE $(_NMAKE_VER) #!MESSAGE $(_NMAKE_VER)
#!MESSAGE $(MAKEVERSION) #!MESSAGE $(MAKEVERSION)
VSNEWEST=2017 VSNEWEST=2019
!IF ($(MAKEVERSION) < 1000000000) !IF ($(MAKEVERSION) < 1000000000)
VSVER=0000 #untested ancient version VSVER=0000 #untested ancient version
!ELSEIF ($(MAKEVERSION) > 1000000000) && ($(MAKEVERSION) < 1100000000) !ELSEIF ($(MAKEVERSION) > 1000000000) && ($(MAKEVERSION) < 1100000000)
@@ -390,9 +390,11 @@ VSVER=2012
VSVER=2013 VSVER=2013
!ELSEIF ($(MAKEVERSION) > 1400000000) && ($(MAKEVERSION) < 1411000000) !ELSEIF ($(MAKEVERSION) > 1400000000) && ($(MAKEVERSION) < 1411000000)
VSVER=2015 VSVER=2015
!ELSEIF ($(MAKEVERSION) > 1411000000) && ($(MAKEVERSION) < 1414264331) !ELSEIF ($(MAKEVERSION) > 1411000000) && ($(MAKEVERSION) < 1416270312)
VSVER=2017
!ELSEIF ($(MAKEVERSION) > 1416270311) && ($(MAKEVERSION) < 1420275082)
VSVER=$(VSNEWEST) VSVER=$(VSNEWEST)
!ELSEIF ($(MAKEVERSION) > 1414264330) !ELSEIF ($(MAKEVERSION) > 1420275081)
VSVER=2999 #untested future version VSVER=2999 #untested future version
!ENDIF !ENDIF