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

Merge branch 'master' into win32-x64-working

Browse Source 
Conflicts:
	src/sp_lev.c
This commit is contained in:
nhmall
2015-04-22 22:33:22 -04:00
parent 03dc59b763 51a70d0277
commit 67e7565ee2
5 changed files with 108 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/extern.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 extern.h $NHDT-Date: 1429666893 2015/04/22 01:41:33 $ $NHDT-Branch: master $:$NHDT-Revision: 1.467 $ */
/* NetHack 3.5 extern.h $NHDT-Date: 1429755449 2015/04/23 02:17:29 $ $NHDT-Branch: master $:$NHDT-Revision: 1.477 $ */
/* Copyright (c) Steve Creps, 1988. */
/* NetHack may be freely redistributed. See license for details. */
@@ -119,7 +119,7 @@ E void FDECL(uchangealign, (int,int));
/* ### ball.c ### */
E void FDECL(ballrelease, (boolean));
E void FDECL(ballrelease, (BOOLEAN_P));
E void NDECL(ballfall);
E void NDECL(placebc);
E void NDECL(unplacebc);
@@ -1870,6 +1870,7 @@ E void FDECL(forget_levels, (int));
E void NDECL(forget_traps);
E void FDECL(forget_map, (int));
E int FDECL(seffects, (struct obj *));
E void FDECL(drop_boulder_on_player, (BOOLEAN_P, BOOLEAN_P, BOOLEAN_P, BOOLEAN_P));
E boolean FDECL(drop_boulder_on_monster, (int, int, BOOLEAN_P, BOOLEAN_P));
E void FDECL(wand_explode, (struct obj *,int));
#ifdef USE_TRAMPOLI