More globals moved to instance_globals.

This commit is contained in:
Bart House
2018-12-19 21:26:35 -08:00
parent b7a0e69998
commit 576eece500
65 changed files with 498 additions and 505 deletions

View File

@@ -1601,7 +1601,7 @@ register const char *let, *word;
cnt = 0;
cntgiven = FALSE;
Sprintf(qbuf, "What do you want to %s?", word);
if (in_doagain)
if (g.in_doagain)
ilet = readchar();
else if (iflags.force_invmenu) {
/* don't overwrite a possible quitchars */
@@ -1746,12 +1746,12 @@ redo_menu:
/* verify the chosen object */
if (!otmp) {
You("don't have that object.");
if (in_doagain)
if (g.in_doagain)
return (struct obj *) 0;
continue;
} else if (cnt < 0 || otmp->quan < cnt) {
You("don't have that many! You have only %ld.", otmp->quan);
if (in_doagain)
if (g.in_doagain)
return (struct obj *) 0;
continue;
}