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

'O' feedback when toggling 'accessiblemsg'

Browse Source 
When accessiblemsg is Off, coordiates supplied for various messages
stayed put after becoming stale.  If you used 'mO' to toggle that
option On, you could see things like
 (2east):'accessiblemsg' option toggled on.
After that, accessibility message coordinates behaved as intended.

Clear a11y.msg_loc.x,y for every pline instead of just when they
are used to augment the current message.

Most players who use accessiblemsg are bound to set it in their
config file rather than toggle it interactively so never noticed.

Misc 1:  option.c doesn't need '#include <ctype.h>' because
cstd.h includes it unconditionally.  Several other src/*.c are in
the same situation but I didn't touch them.

Misc 2:  move set_msg_dir() and set_msg_xy() out of a warning
suppression block that isn't relevant to them.
This commit is contained in:
PatR
2024-11-26 19:28:30 -08:00
parent 1c5b295097
commit 3615b17b62
2 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/options.c
View File

@@ -3,17 +3,17 @@
/*-Copyright (c) Michael Allison, 2008. */
/* NetHack may be freely redistributed. See license for details. */
#ifdef OPTION_LISTS_ONLY /* (AMIGA) external program for opt lists */
#ifndef OPTION_LISTS_ONLY
#include "hack.h"
#include "tcap.h"
#else /* OPTION_LISTS_ONLY: (AMIGA) external program for opt lists */
#include "config.h"
#include "objclass.h"
#include "flag.h"
NEARDATA struct flag flags; /* provide linkage */
NEARDATA struct instance_flags iflags; /* provide linkage */
NEARDATA struct accessibility_data a11y;
#define static
#else
#include "hack.h"
#include "tcap.h"
#include <ctype.h>
#endif
#define BACKWARD_COMPAT
@@ -5297,6 +5297,9 @@ optfn_boolean(
case opt_rest_on_space:
update_rest_on_space();
break;
case opt_accessiblemsg:
a11y.msg_loc.x = a11y.msg_loc.y = 0;
break;
default:
break;
}

56
src/pline.c
View File

@@ -76,6 +76,23 @@ putmesg(const char *line)
SoundSpeak(line);
}
/* set the direction where next message happens */
void
set_msg_dir(int dir)
{
dtoxy(&a11y.msg_loc, dir);
a11y.msg_loc.x += u.ux;
a11y.msg_loc.y += u.uy;
}
/* set the coordinate where next message happens */
void
set_msg_xy(coordxy x, coordxy y)
{
a11y.msg_loc.x = x;
a11y.msg_loc.y = y;
}
staticfn void vpline(const char *, va_list);
DISABLE_WARNING_FORMAT_NONLITERAL
@@ -126,23 +143,6 @@ pline_mon(struct monst *mtmp, const char *line, ...)
va_end(the_args);
}
/* set the direction where next message happens */
void
set_msg_dir(int dir)
{
dtoxy(&a11y.msg_loc, dir);
a11y.msg_loc.x += u.ux;
a11y.msg_loc.y += u.uy;
}
/* set the coordinate where next message happens */
void
set_msg_xy(coordxy x, coordxy y)
{
a11y.msg_loc.x = x;
a11y.msg_loc.y = y;
}
staticfn void
vpline(const char *line, va_list the_args)
{
@@ -151,6 +151,11 @@ vpline(const char *line, va_list the_args)
int ln;
int msgtyp;
boolean no_repeat;
coord a11y_mesgxy;
a11y_mesgxy = a11y.msg_loc; /* save a11y.msg_loc before reseting it */
/* always reset a11y.msg_loc whether we end up using it or not */
a11y.msg_loc.x = a11y.msg_loc.y = 0;
if (!line || !*line)
return;
@@ -161,16 +166,15 @@ vpline(const char *line, va_list the_args)
if (program_state.wizkit_wishing)
return;
if (a11y.accessiblemsg && isok(a11y.msg_loc.x,a11y.msg_loc.y)) {
char *tmp;
char *dirstr;
static char dirstrbuf[BUFSZ];
int g = (iflags.getpos_coords == GPCOORDS_NONE)
? GPCOORDS_COMFULL : iflags.getpos_coords;
/* when accessiblemsg is set and a11y.msg_loc is nonzero, use the latter
to insert a location prefix in front of current message */
if (a11y.accessiblemsg && isok(a11y_mesgxy.x, a11y_mesgxy.y)) {
char *tmp, *dirstr, dirstrbuf[QBUFSZ];
dirstr = coord_desc(a11y.msg_loc.x, a11y.msg_loc.y, dirstrbuf, g);
a11y.msg_loc.x = a11y.msg_loc.y = 0;
tmp = (char *)alloc(strlen(line) + sizeof ": " + strlen(dirstr));
dirstr = coord_desc(a11y_mesgxy.x, a11y_mesgxy.y, dirstrbuf,
((iflags.getpos_coords == GPCOORDS_NONE)
? GPCOORDS_COMFULL : iflags.getpos_coords));
tmp = (char *) alloc(strlen(line) + sizeof ": " + strlen(dirstr));
Strcpy(tmp, dirstr);
Strcat(tmp, ": ");
Strcat(tmp, line);