diff options
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/acr.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/invent.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/misc.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/stuff.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/travel.cc | 4 |
7 files changed, 17 insertions, 14 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 11512ecb80..b9596abd09 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -426,7 +426,7 @@ static void handle_wizard_command( void ) mpr( "If you continue, your game will not be scored!", MSGCH_WARN ); #endif - if (!yesno( "Do you really want to enter wizard mode? ", false, 'n' )) + if (!yesno( "Do you really want to enter wizard mode?", false, 'n' )) return; you.wizard = true; @@ -987,7 +987,7 @@ static void handle_wizard_command( void ) if (testbits(env.level_flags, LFLAG_NOT_MAPPABLE) || testbits(get_branch_flags(), BFLAG_NOT_MAPPABLE)) { - if (!yesno("Force level to be mappable? ", true, 'n')) + if (!yesno("Force level to be mappable?", true, 'n')) { canned_msg( MSG_OK ); return; @@ -2269,7 +2269,7 @@ void process_command( command_type cmd ) #endif case CMD_SAVE_GAME: - if (yesno("Save game and exit? ", true, 'n')) + if (yesno("Save game and exit?", true, 'n')) save_game(true); break; @@ -3956,7 +3956,7 @@ static void move_player(int move_x, int move_y) || is_sanctuary(mon->x, mon->y)) { snprintf(info, INFO_SIZE, - "Really attack %s, despite your sanctuary? ", + "Really attack %s, despite your sanctuary?", mon->name(DESC_NOCAP_THE).c_str()); if (!yesno(info, true, 'n')) diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index ad67762d7e..f8c932dc69 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -1183,7 +1183,7 @@ bool check_warning_inscriptions( const item_def& item, std::string prompt = "Really " + operation_verb(oper) + " "; prompt += item.name(DESC_INVENTORY); - prompt += "? "; + prompt += "?"; return (yesno(prompt.c_str(), false, 'n') && check_old_item_warning(item, oper)); } diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index f42d0fec0b..f4f6881ed1 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2934,10 +2934,10 @@ bool safe_to_remove_or_wear(const item_def &item, bool remove) if (remove) { std::string prompt = - item.base_type == OBJ_WEAPONS ? "Unwield" : "Remov"; - prompt += "ing this item could be fatal. "; + item.base_type == OBJ_WEAPONS ? "Unwielding" : "Removing"; + prompt += " this item could be fatal. "; prompt += item.base_type == OBJ_WEAPONS ? "Unwield" : "Remove"; - prompt += " anyway? "; + prompt += " anyway?"; if ((prop_str >= you.strength || prop_int >= you.intel || prop_dex >= you.dex) @@ -2952,7 +2952,7 @@ bool safe_to_remove_or_wear(const item_def &item, bool remove) item.base_type == OBJ_WEAPONS ? "Wield" : "Wear"; prompt += "ing this item could be fatal. "; prompt += item.base_type == OBJ_WEAPONS ? "Wield" : "Put on"; - prompt += " anyway? "; + prompt += " anyway?"; if ((-prop_str >= you.strength || -prop_int >= you.intel || -prop_dex >= you.dex) diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 856f91ded9..b2240e4774 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1145,7 +1145,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair, mpr("Warning: level annotation for next level is:", MSGCH_PROMPT); mpr(get_level_annotation(next_level_id).c_str(), MSGCH_PLAIN, YELLOW); - if (!yesno("Enter next level anyways?", true, 0, true, false)) + if (!yesno("Enter next level anyway?", true, 0, true, false)) { interrupt_activity( AI_FORCE_INTERRUPT ); return; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index f0b52fa668..e2c5191ee8 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3735,7 +3735,7 @@ void offer_items() return; } - if (!yesno("Do you wish to part with all of your money? ", true, 'n')) + if (!yesno("Do you wish to part with all of your money?", true, 'n')) return; int donation_value = (int) (you.gold/200 * log((double)you.gold)); diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index caca339a08..550ae9ac0c 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -793,10 +793,13 @@ bool yesno( const char *str, bool safe, int safeanswer, bool clear_after, if (interrupt_delays && !crawl_state.is_repeating_cmd()) interrupt_activity( AI_FORCE_INTERRUPT ); + std::string prompt = make_stringf("%s ", str ? str : "Buggy prompt?"); + // std::string prompt = make_stringf("%s (y/n) ", str); + for (;;) { if ( !noprompt ) - mpr(str, MSGCH_PROMPT); + mpr(prompt.c_str(), MSGCH_PROMPT); int tmp = getchm(KC_CONFIRM); diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 4aa8ae8d32..d308d9cdf3 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -1043,7 +1043,7 @@ void explore_pickup_event(int did_pickup, int tried_pickup) { const std::string prompt = make_stringf( - "Could not pick up %s here, shall I ignore %s? ", + "Could not pick up %s here; shall I ignore %s?", tried_pickup == 1? "an item" : "some items", tried_pickup == 1? "it" : "them"); // Make Escape => 'n' and stop run. @@ -2175,7 +2175,7 @@ static int prompt_travel_branch(int prompt_flags) if (msg != "") { - msg += "Go there anyways?"; + msg += "Go there anyway?"; if(!yesno(msg.c_str())) return (ID_CANCEL); } |