arogue5: fix some more drawing to the wrong window.

The spell-choosing and prayer-choosing routines, when the one-line
inventory option is set, displayed to cw instead of msgw.  This caused
permanent corruption of the message line.
This commit is contained in:
John "Elwin" Edwards 2012-09-09 15:55:51 -07:00
parent cd74a20cc9
commit ad5245c5f8

View file

@ -168,20 +168,20 @@ cast()
else if (slow_invent) { else if (slow_invent) {
register char c; register char c;
char *spellp;
for (i=0; i<num_spells; i++) { for (i=0; i<num_spells; i++) {
msg(""); msg("");
mvwaddch(cw, 0, 0, '[');
waddch(cw, (char) ((int) 'a' + i));
waddstr(cw, "] A spell of ");
if (magic_spells[i].s_type == TYP_POTION) if (magic_spells[i].s_type == TYP_POTION)
waddstr(cw, p_magic[magic_spells[i].s_which].mi_name); spellp = p_magic[magic_spells[i].s_which].mi_name;
else if (magic_spells[i].s_type == TYP_SCROLL) else if (magic_spells[i].s_type == TYP_SCROLL)
waddstr(cw, s_magic[magic_spells[i].s_which].mi_name); spellp = s_magic[magic_spells[i].s_which].mi_name;
else if (magic_spells[i].s_type == TYP_STICK) else if (magic_spells[i].s_type == TYP_STICK)
waddstr(cw, ws_magic[magic_spells[i].s_which].mi_name); spellp = ws_magic[magic_spells[i].s_which].mi_name;
waddstr(cw, morestr); mvwprintw(msgw, 0, 0, "[%c] A spell of %s", (char) ((int) 'a' + i),
draw(cw); spellp);
waddstr(msgw, morestr);
draw(msgw);
do { do {
c = readchar(); c = readchar();
} while (c != ' ' && c != ESCAPE); } while (c != ' ' && c != ESCAPE);
@ -189,8 +189,8 @@ cast()
break; break;
} }
msg(""); msg("");
mvwaddstr(cw, 0, 0, "Which spell are you casting? "); mvwaddstr(msgw, 0, 0, "Which spell are you casting? ");
draw(cw); draw(msgw);
} }
else { else {
/* Set up for redraw */ /* Set up for redraw */
@ -375,20 +375,20 @@ pray()
else if (slow_invent) { else if (slow_invent) {
register char c; register char c;
char *prayerp;
for (i=0; i<num_prayers; i++) { for (i=0; i<num_prayers; i++) {
msg(""); msg("");
mvwaddch(cw, 0, 0, '[');
waddch(cw, (char) ((int) 'a' + i));
waddstr(cw, "] A prayer for ");
if (cleric_spells[i].s_type == TYP_POTION) if (cleric_spells[i].s_type == TYP_POTION)
waddstr(cw, p_magic[cleric_spells[i].s_which].mi_name); prayerp = p_magic[cleric_spells[i].s_which].mi_name;
else if (cleric_spells[i].s_type == TYP_SCROLL) else if (cleric_spells[i].s_type == TYP_SCROLL)
waddstr(cw, s_magic[cleric_spells[i].s_which].mi_name); prayerp = s_magic[cleric_spells[i].s_which].mi_name;
else if (cleric_spells[i].s_type == TYP_STICK) else if (cleric_spells[i].s_type == TYP_STICK)
waddstr(cw, ws_magic[cleric_spells[i].s_which].mi_name); prayerp = ws_magic[cleric_spells[i].s_which].mi_name;
waddstr(cw, morestr); mvwprintw(msgw, 0, 0, "[%c] A prayer for %s",
draw(cw); (char) ((int) 'a' + i), prayerp);
waddstr(msgw, morestr);
draw(msgw);
do { do {
c = readchar(); c = readchar();
} while (c != ' ' && c != ESCAPE); } while (c != ' ' && c != ESCAPE);
@ -396,8 +396,8 @@ pray()
break; break;
} }
msg(""); msg("");
mvwaddstr(cw, 0, 0, "Which prayer are you offering? "); mvwaddstr(msgw, 0, 0, "Which prayer are you offering? ");
draw(cw); draw(msgw);
} }
else { else {
/* Set up for redraw */ /* Set up for redraw */