pull in the recent unconditionals merge from master
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 mhstatus.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 mhstatus.c $NHDT-Date: 1425083082 2015/02/28 00:24:42 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.8 $ */
|
||||
/* NetHack 3.5 mhstatus.c $Date: 2009/05/06 10:52:28 $ $Revision: 1.7 $ */
|
||||
/* SCCS Id: @(#)mhstatus.c 3.5 2005/01/23 */
|
||||
/* Copyright (C) 2001 by Alex Kompel */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
@@ -232,19 +233,13 @@ void FormatStatusString(char* text, int format)
|
||||
(void) describe_level(nb=eos(nb));
|
||||
Sprintf(nb = eos(nb),
|
||||
"%c:%-2ld HP:%d(%d) Pw:%d(%d) AC:%-2d", showsyms[COIN_CLASS + SYM_OFF_O],
|
||||
#ifndef GOLDOBJ
|
||||
u.ugold,
|
||||
#else
|
||||
money_cnt(invent),
|
||||
#endif
|
||||
hp, hpmax, u.uen, u.uenmax, u.uac);
|
||||
|
||||
if (Upolyd)
|
||||
Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel);
|
||||
#ifdef EXP_ON_BOTL
|
||||
else if(flags.showexp)
|
||||
Sprintf(nb = eos(nb), " Xp:%u/%-1ld", u.ulevel,u.uexp);
|
||||
#endif
|
||||
else
|
||||
Sprintf(nb = eos(nb), " Exp:%u", u.ulevel);
|
||||
if( format==NHSTAT_LINES_4 ) strcat(text, "\r\n");
|
||||
|
||||
Reference in New Issue
Block a user