Merge branch 'NetHack-3.6.2'
This commit is contained in:
@@ -390,7 +390,7 @@ E void FDECL(revive_mon, (ANY_P *, long));
|
||||
E int NDECL(donull);
|
||||
E int NDECL(dowipe);
|
||||
E void FDECL(set_wounded_legs, (long, int));
|
||||
E void NDECL(heal_legs);
|
||||
E void FDECL(heal_legs, (int));
|
||||
|
||||
/* ### do_name.c ### */
|
||||
|
||||
|
||||
@@ -249,13 +249,13 @@ extern int FDECL(alternative_palette, (char *));
|
||||
#endif
|
||||
|
||||
#ifdef NDEBUG
|
||||
#define ntassert(expression) ((void)0)
|
||||
#define nhassert(expression) ((void)0)
|
||||
#else
|
||||
extern void FDECL(ntassert_failed, (const char * exp, const char * file,
|
||||
extern void FDECL(nhassert_failed, (const char * exp, const char * file,
|
||||
int line));
|
||||
|
||||
#define ntassert(expression) (void)((!!(expression)) || \
|
||||
(ntassert_failed(#expression, __FILE__, __LINE__), 0))
|
||||
#define nhassert(expression) (void)((!!(expression)) || \
|
||||
(nhassert_failed(#expression, __FILE__, __LINE__), 0))
|
||||
#endif
|
||||
|
||||
#define nethack_enter(argc, argv) nethack_enter_winnt()
|
||||
|
||||
Reference in New Issue
Block a user