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

build fix for ck_server_admin_msg()

Browse Source 
ck_server_admin_msg() is only available for '#if (UNIX && MAIL)' but
moveloop() tried to call it unconditionally.  Call if from the UNIX
edition of ckmailstatus() instead.
This commit is contained in:
PatR
2016-01-04 16:51:24 -08:00
parent 1e0b16c99d
commit e8e1673df7
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/extern.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 extern.h $NHDT-Date: 1451174855 2015/12/27 00:07:35 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.526 $ */ /* NetHack 3.6 extern.h $NHDT-Date: 1451955077 2016/01/05 00:51:17 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.530 $ */
/* Copyright (c) Steve Creps, 1988. */ /* Copyright (c) Steve Creps, 1988. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1061,8 +1061,8 @@ E void FDECL(nocmov, (int x, int y));
#ifdef MAIL #ifdef MAIL
#ifdef UNIX #ifdef UNIX
E void NDECL(getmailstatus); E void NDECL(getmailstatus);
#endif
E void NDECL(ck_server_admin_msg); E void NDECL(ck_server_admin_msg);
#endif
E void NDECL(ckmailstatus); E void NDECL(ckmailstatus);
E void FDECL(readmail, (struct obj *)); E void FDECL(readmail, (struct obj *));
#endif /* MAIL */ #endif /* MAIL */

3
src/allmain.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 allmain.c $NHDT-Date: 1451344214 2015/12/28 23:10:14 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.68 $ */ /* NetHack 3.6 allmain.c $NHDT-Date: 1451955079 2016/01/05 00:51:19 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.70 $ */
/* 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. */
@@ -455,7 +455,6 @@ boolean resuming;
rhack(save_cm); rhack(save_cm);
} }
} else if (multi == 0) { } else if (multi == 0) {
ck_server_admin_msg();
#ifdef MAIL #ifdef MAIL
ckmailstatus(); ckmailstatus();
#endif #endif

4
src/mail.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 mail.c $NHDT-Date: 1450261364 2015/12/16 10:22:44 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.22 $ */ /* NetHack 3.6 mail.c $NHDT-Date: 1451955080 2016/01/05 00:51:20 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.25 $ */
/* 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. */
@@ -470,6 +470,8 @@ struct obj *otmp UNUSED;
void void
ckmailstatus() ckmailstatus()
{ {
ck_server_admin_msg();
if (!mailbox || u.uswallow || !flags.biff if (!mailbox || u.uswallow || !flags.biff
#ifdef MAILCKFREQ #ifdef MAILCKFREQ
|| moves < laststattime + MAILCKFREQ || moves < laststattime + MAILCKFREQ