Move triplicate defines into single place
This commit is contained in:
@@ -44,6 +44,15 @@
|
||||
#define EXT_ENCUMBER 4 /* Overtaxed */
|
||||
#define OVERLOADED 5 /* Overloaded */
|
||||
|
||||
/* hunger states - see hu_stat in eat.c */
|
||||
#define SATIATED 0
|
||||
#define NOT_HUNGRY 1
|
||||
#define HUNGRY 2
|
||||
#define WEAK 3
|
||||
#define FAINTING 4
|
||||
#define FAINTED 5
|
||||
#define STARVED 6
|
||||
|
||||
/* Macros for how a rumor was delivered in outrumor() */
|
||||
#define BY_ORACLE 0
|
||||
#define BY_COOKIE 1
|
||||
|
||||
@@ -372,15 +372,6 @@ boolean inc_or_dec;
|
||||
if (moves > 0 && (i == A_STR || i == A_CON)) (void)encumber_msg();
|
||||
}
|
||||
|
||||
/* hunger values - from eat.c */
|
||||
#define SATIATED 0
|
||||
#define NOT_HUNGRY 1
|
||||
#define HUNGRY 2
|
||||
#define WEAK 3
|
||||
#define FAINTING 4
|
||||
#define FAINTED 5
|
||||
#define STARVED 6
|
||||
|
||||
STATIC_OVL void
|
||||
exerper()
|
||||
{
|
||||
|
||||
10
src/eat.c
10
src/eat.c
@@ -40,15 +40,6 @@ STATIC_DCL boolean FDECL(maybe_cannibal, (int,BOOLEAN_P));
|
||||
|
||||
char msgbuf[BUFSZ];
|
||||
|
||||
/* hunger texts used on bottom line (each 8 chars long) */
|
||||
#define SATIATED 0
|
||||
#define NOT_HUNGRY 1
|
||||
#define HUNGRY 2
|
||||
#define WEAK 3
|
||||
#define FAINTING 4
|
||||
#define FAINTED 5
|
||||
#define STARVED 6
|
||||
|
||||
/* also used to see if you're allowed to eat cats and dogs */
|
||||
#define CANNIBAL_ALLOWED() (Role_if(PM_CAVEMAN) || Race_if(PM_ORC))
|
||||
|
||||
@@ -76,6 +67,7 @@ STATIC_OVL NEARDATA const char allobj[] = {
|
||||
|
||||
STATIC_OVL boolean force_save_hs = FALSE;
|
||||
|
||||
/* see hunger states in hack.h - texts used on bottom line */
|
||||
const char *hu_stat[] = {
|
||||
"Satiated",
|
||||
" ",
|
||||
|
||||
10
src/pray.c
10
src/pray.c
@@ -149,16 +149,6 @@ in_trouble()
|
||||
struct obj *otmp;
|
||||
int i, j, count=0;
|
||||
|
||||
/* Borrowed from eat.c */
|
||||
|
||||
#define SATIATED 0
|
||||
#define NOT_HUNGRY 1
|
||||
#define HUNGRY 2
|
||||
#define WEAK 3
|
||||
#define FAINTING 4
|
||||
#define FAINTED 5
|
||||
#define STARVED 6
|
||||
|
||||
/*
|
||||
* major troubles
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user