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

Merge branch 'master' into win32-x64-working

Browse Source
This commit is contained in:
nhmall
2015-05-04 17:56:35 -04:00
parent 636edf2b08 766d874a47
commit f692db8581
5 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/config.h
+4 -2
View File
@@ -173,8 +173,10 @@
# define WIZARD_NAME "wizard" # define WIZARD_NAME "wizard"
#endif #endif
/* #define SYSCF */ /* use a global configuration */ #ifndef SYSCF
/* #define SYSCF_FILE "sysconf" */ /* global configuration is in a file */ #define SYSCF /* use a global configuration */
#define SYSCF_FILE "sysconf" /* global configuration is in a file */
#endif
#ifndef GDBPATH #ifndef GDBPATH
# define GDBPATH "/usr/bin/gdb" # define GDBPATH "/usr/bin/gdb"
src/do.c
+1 -1
View File
@@ -217,7 +217,7 @@ const char *verb;
/* Globby things like puddings might stick together */ /* Globby things like puddings might stick together */
while (obj && (otmp = obj_nexto_xy(obj->otyp, x, y, obj->o_id)) != (struct obj*)0) { while (obj && (otmp = obj_nexto_xy(obj->otyp, x, y, obj->o_id)) != (struct obj*)0) {
pudding_merge_message(obj, otmp); pudding_merge_message(obj, otmp);
obj_meld(&obj, &otmp); obj = obj_meld(&obj, &otmp);
} }
return (obj == NULL); return (obj == NULL);
} }
src/timeout.c
+10 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.5 timeout.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */ /* NetHack 3.5 timeout.c $NHDT-Date: 1430754548 2015/05/04 15:49:08 $ $NHDT-Branch: master $:$NHDT-Revision: 1.55 $ */
/* NetHack 3.5 timeout.c $Date: 2012/04/16 00:57:37 $ $Revision: 1.48 $ */ /* NetHack 3.5 timeout.c $Date: 2012/04/16 00:57:37 $ $Revision: 1.48 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -817,7 +817,8 @@ long timeout;
obj->spe = 0; /* no more candles */ obj->spe = 0; /* no more candles */
} else if (Is_candle(obj) || obj->otyp == POT_OIL) { } else if (Is_candle(obj) || obj->otyp == POT_OIL) {
/* get rid of candles and burning oil potions; /* get rid of candles and burning oil potions;
we know this object isn't carried by hero */ we know this object isn't carried by hero,
nor is it migrating */
obj_extract_self(obj); obj_extract_self(obj);
obfree(obj, (struct obj *)0); obfree(obj, (struct obj *)0);
obj = (struct obj *) 0; obj = (struct obj *) 0;
@@ -861,6 +862,9 @@ long timeout;
if (carried(obj)) { if (carried(obj)) {
useupall(obj); useupall(obj);
} else { } else {
/* clear migrating obj's destination code before obfree
to avoid false complaint of deleting worn item */
if (obj->where == OBJ_MIGRATING) obj->owornmask = 0L;
obj_extract_self(obj); obj_extract_self(obj);
obfree(obj, (struct obj *)0); obfree(obj, (struct obj *)0);
} }
@@ -1037,6 +1041,10 @@ long timeout;
if (carried(obj)) { if (carried(obj)) {
useupall(obj); useupall(obj);
} else { } else {
/* clear migrating obj's destination code
so obfree won't think this item is worn */
if (obj->where == OBJ_MIGRATING)
obj->owornmask = 0L;
obj_extract_self(obj); obj_extract_self(obj);
obfree(obj, (struct obj *)0); obfree(obj, (struct obj *)0);
} }
sys/unix/hints/linux
+4
View File
@@ -15,6 +15,10 @@ PREFIX=$(wildcard ~)/nh/install
HACKDIR=$(PREFIX)/games/lib/$(GAME)dir HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
SHELLDIR = $(PREFIX)/games SHELLDIR = $(PREFIX)/games
POSTINSTALL=cp -n sys/unix/sysconf $(HACKDIR)/sysconf; $(CHOWN) $(GAMEUID) $(HACKDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(HACKDIR)/sysconf; chmod $(VARFILEPERM) $(HACKDIR)/sysconf;
CFLAGS=-g -O -I../include -DNOTPARMDECL $(CFLAGS1) -DDLB CFLAGS=-g -O -I../include -DNOTPARMDECL $(CFLAGS1) -DDLB
CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
sys/unix/hints/linux-x11
+4
View File
@@ -15,6 +15,10 @@ PREFIX=$(wildcard ~)/nh/install
HACKDIR=$(PREFIX)/games/lib/$(GAME)dir HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
SHELLDIR = $(PREFIX)/games SHELLDIR = $(PREFIX)/games
POSTINSTALL= cp -n sys/unix/sysconf $(HACKDIR)/sysconf; $(CHOWN) $(GAMEUID) $(HACKDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(HACKDIR)/sysconf; chmod $(VARFILEPERM) $(HACKDIR)/sysconf;
POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir);
CFLAGS=-O -I../include -DNOTPARMDECL $(CFLAGS1) $(CFLAGS3) CFLAGS=-O -I../include -DNOTPARMDECL $(CFLAGS1) $(CFLAGS3)
CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\"
CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"