enc_stat[], hu_stat[]

The definition of enc_stat[] got changed by a pull request nearly a
year ago ('const char *enc_stat[]' -> 'const char *const enc_stat[]')
but the separate declarations for it weren't changed to match.

Make the same change for hu_stat[].  Not sure why the pull request
didn't include it since the old declaration and the usage are same.

The curses one is in code that isn't used.
This commit is contained in:
PatR
2022-09-10 19:30:36 -07:00
parent 1df88e4c65
commit f4210542f0
6 changed files with 18 additions and 14 deletions

View File

@@ -8,10 +8,12 @@
#include <limits.h>
#endif
extern const char *hu_stat[]; /* defined in eat.c */
extern const char *const hu_stat[]; /* defined in eat.c */
const char *const enc_stat[] = { "", "Burdened", "Stressed",
"Strained", "Overtaxed", "Overloaded" };
const char *const enc_stat[] = {
"", "Burdened", "Stressed",
"Strained", "Overtaxed", "Overloaded"
};
static const char *rank(void);
static void bot_via_windowport(void);

View File

@@ -66,8 +66,10 @@ static int tin_ok(struct obj *);
((otyp) == LEMBAS_WAFER || (otyp) == CRAM_RATION)
/* see hunger states in hack.h - texts used on bottom line */
const char *hu_stat[] = { "Satiated", " ", "Hungry ", "Weak ",
"Fainting", "Fainted ", "Starved " };
const char *const hu_stat[] = {
"Satiated", " ", "Hungry ", "Weak ",
"Fainting", "Fainted ", "Starved "
};
/* used by getobj() callback routines eat_ok()/offer_ok()/tin_ok() to
indicate whether player was given an opportunity to eat or offer or

View File

@@ -35,8 +35,8 @@ static int QSORTCALLBACK vanqsort_cmp(const genericptr, const genericptr);
static int set_vanq_order(void);
static int num_extinct(void);
extern const char *hu_stat[]; /* hunger status from eat.c */
extern const char *enc_stat[]; /* encumbrance status from botl.c */
extern const char *const hu_stat[]; /* hunger status from eat.c */
extern const char *const enc_stat[]; /* encumbrance status from botl.c */
static const char You_[] = "You ", are[] = "are ", were[] = "were ",
have[] = "have ", had[] = "had ", can[] = "can ",

View File

@@ -76,6 +76,9 @@
extern "C" {
#include "hack.h"
extern const char *const enc_stat[]; /* from botl.c */
extern const char *const hu_stat[]; /* from eat.c */
}
#include "qt_pre.h"
@@ -90,9 +93,6 @@ extern "C" {
#include "qt_str.h"
#include "qt_xpms.h"
extern const char *enc_stat[]; /* from botl.c */
extern const char *hu_stat[]; /* from eat.c */
extern int qt_compact_mode;
namespace nethack_qt_ {

View File

@@ -1225,8 +1225,8 @@ adjust_status_fancy(struct xwindow *wp, const char *str)
}
/* Fancy ================================================================== */
extern const char *hu_stat[]; /* from eat.c */
extern const char *enc_stat[]; /* from botl.c */
extern const char *const hu_stat[]; /* from eat.c */
extern const char *const enc_stat[]; /* from botl.c */
struct X_status_value {
/* we have to cast away 'const' when assigning new names */

View File

@@ -1398,8 +1398,8 @@ static nhstat prevtime;
static nhstat prevscore;
#endif
extern const char *hu_stat[]; /* from eat.c */
extern const char *enc_stat[]; /* from botl.c */
extern const char *const hu_stat[]; /* from eat.c */
extern const char *const enc_stat[]; /* from botl.c */
/* If the statuscolors patch isn't enabled, have some default colors for status problems
anyway */