follow-up, program_state

win/curses/cursdial.c

@@ -789,7 +789,7 @@ curses_display_nhmenu(
     menu_determine_pages(current_menu);
 
     /* Display pre and post-game menus centered */
-    if ((svm.moves <= 1 && !gi.invent) || svp.program_state.gameover) {
+    if ((svm.moves <= 1 && !gi.invent) || program_state.gameover) {
         win = curses_create_window(wid, current_menu->width,
                                    current_menu->height, CENTER);
     } else { /* Display during-game menus on the right out of the way */
@@ -1033,7 +1033,7 @@ menu_win_size(nhmenu *menu)
     int maxheaderwidth = menu->prompt ? (int) strlen(menu->prompt) : 0;
     nhmenu_item *menu_item_ptr, *last_item_ptr = NULL;
 
-    if (svp.program_state.gameover) {
+    if (program_state.gameover) {
         /* for final inventory disclosure, use full width */
         maxwidth = term_cols - 2; /* +2: borders assumed */
     } else {

win/curses/cursmain.c

@@ -782,7 +782,7 @@ curses_update_inventory(int arg)
     }
 
     /* skip inventory updating during character initialization */
-    if (!svp.program_state.in_moveloop && !svp.program_state.gameover)
+    if (!program_state.in_moveloop && !program_state.gameover)
         return;
 
     if (!arg) {

win/curses/cursmisc.c

@@ -776,7 +776,7 @@ Currently this is limited to arrow keys, but this may be expanded. */
 int
 curses_convert_keys(int key)
 {
-    boolean reject = (svp.program_state.input_state == otherInp),
+    boolean reject = (program_state.input_state == otherInp),
             as_is = FALSE, numpad_esc = FALSE;
     int ret = key;