diff --git a/src/game.c b/src/game.c index 22e258c..bb9e24b 100644 --- a/src/game.c +++ b/src/game.c @@ -136,7 +136,7 @@ void init_game (void) } else { // Ask which game to load - newtxwin(5, 50, LINE_OFFSET + 6, COL_CENTER(50)); + newtxwin(5, 54, LINE_OFFSET + 6, COL_CENTER(54)); wbkgd(curwin, ATTR_NORMAL_WINDOW); box(curwin, 0, 0); @@ -147,7 +147,7 @@ void init_game (void) attrpr(curwin, ATTR_KEYCODE_STR, "9"); waddstr(curwin, "]"); waddstr(curwin, " or "); - attrpr(curwin, ATTR_KEYCODE_STR, ""); + attrpr(curwin, ATTR_KEYCODE_STR, ""); waddstr(curwin, " to cancel: "); curs_set(CURS_ON); @@ -164,7 +164,7 @@ void init_game (void) case KEY_CTRL('C'): case KEY_CTRL('G'): case KEY_CTRL('\\'): - key = KEY_ESC; + key = KEY_CANCEL; done = true; break; @@ -180,7 +180,7 @@ void init_game (void) curs_set(CURS_OFF); - if (key != KEY_ESC) { + if (key != KEY_CANCEL) { game_num = key - '0'; wechochar(curwin, key | A_BOLD); diff --git a/src/help.c b/src/help.c index e679e22..deb4cb1 100644 --- a/src/help.c +++ b/src/help.c @@ -131,10 +131,10 @@ const char *help_text[] = { "you own a larger proportion of the company.\n" "\n" "The game usually ends after ^B~t^N turns. However, you can end the game sooner\n" - "by pressing ^K^N when asked to select a move. As well, individual players\n" - "can declare themselves bankrupt at any time. If your debt is large enough,\n" - "the Bank may do this for you! If you do not complete your game in the time\n" - "you have available, you may save the game and continue it later.\n" + "by pressing ^K^N when asked to select a move. As well, individual\n" + "players can declare themselves bankrupt at any time. If your debt is large\n" + "enough, the Bank may do this for you! If you do not complete your game in\n" + "the time you have available, you may save the game and continue it later.\n" "\n" "\n" "The ^Bwinner of the game^N is the person with the greatest net worth (total\n" diff --git a/src/move.c b/src/move.c index 5392225..19a08d0 100644 --- a/src/move.c +++ b/src/move.c @@ -179,15 +179,15 @@ selection_t get_move (void) attrpr(curwin, ATTR_KEYCODE_STR, "<2>"); waddstr(curwin, " Declare bankruptcy"); - wmove(curwin, 2, 41); + wmove(curwin, 2, 42); attrpr(curwin, ATTR_KEYCODE_STR, "<3>"); - waddstr(curwin, " Save and end the game"); + waddstr(curwin, " Save and end the game"); - wmove(curwin, 3, 40); - attrpr(curwin, ATTR_KEYCODE_STR, ""); + wmove(curwin, 3, 42); + attrpr(curwin, ATTR_KEYCODE_STR, ""); waddstr(curwin, " Quit the game"); - mvwaddstr(curwin, 1, 2, " Select move "); + mvwaddstr(curwin, 1, 8, " Select move "); waddstr(curwin, "["); attrpr(curwin, ATTR_MAP_CHOICE, "%c", MOVE_TO_KEY(0)); waddstr(curwin, "-"); @@ -197,7 +197,7 @@ selection_t get_move (void) waddstr(curwin, "-"); attrpr(curwin, ATTR_KEYCODE_STR, "3"); waddstr(curwin, "/"); - attrpr(curwin, ATTR_KEYCODE_STR, ""); + attrpr(curwin, ATTR_KEYCODE_STR, ""); waddstr(curwin, "]: "); curs_set(CURS_ON); @@ -251,7 +251,7 @@ selection_t get_move (void) curs_set(CURS_OFF); wattron(curwin, A_BOLD); - waddstr(curwin, ""); + waddstr(curwin, ""); wattroff(curwin, A_BOLD); waddstr(curwin, " (Quit the game)"); break; @@ -274,7 +274,7 @@ selection_t get_move (void) wrefresh(curwin); // Ask the player to confirm their choice - mvwaddstr(curwin, 2, 2, " Are you sure? "); + mvwaddstr(curwin, 2, 22, "Are you sure? "); waddstr(curwin, "["); attrpr(curwin, ATTR_KEYCODE_STR, "Y"); waddstr(curwin, "/"); @@ -309,7 +309,7 @@ selection_t get_move (void) bool done; // Ask which game to save - newtxwin(6, 50, LINE_OFFSET + 8, COL_CENTER(50)); + newtxwin(6, 54, LINE_OFFSET + 8, COL_CENTER(54)); wbkgd(curwin, ATTR_NORMAL_WINDOW); box(curwin, 0, 0); @@ -321,7 +321,7 @@ selection_t get_move (void) attrpr(curwin, ATTR_KEYCODE_STR, "9"); waddstr(curwin, "]"); waddstr(curwin, " or "); - attrpr(curwin, ATTR_KEYCODE_STR, ""); + attrpr(curwin, ATTR_KEYCODE_STR, ""); waddstr(curwin, " to cancel: "); curs_set(CURS_ON); @@ -338,7 +338,7 @@ selection_t get_move (void) case KEY_CTRL('C'): case KEY_CTRL('G'): case KEY_CTRL('\\'): - key = KEY_ESC; + key = KEY_CANCEL; done = true; break; @@ -354,7 +354,7 @@ selection_t get_move (void) curs_set(CURS_OFF); - if (key != KEY_ESC) { + if (key != KEY_CANCEL) { game_num = key - '0'; wechochar(curwin, key | A_BOLD);