変愚蛮怒のメインリポジトリです
Revision | e19f999432e3f2a8d9eab778d60dad6fcdd5846c (tree) |
---|---|
Time | 2004-03-11 20:57:57 |
Author | mogami <mogami@0568...> |
Commiter | mogami |
inkey_special()自体のバグを直すので、その前に取り敢えず
前回の変更点を戻す。
@@ -1917,7 +1917,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll) | ||
1917 | 1917 | |
1918 | 1918 | (void)screen_object(o_ptr, TRUE); |
1919 | 1919 | |
1920 | - if (!get_string(ask_msg, dummy_name, sizeof dummy_name, FALSE) | |
1920 | + if (!get_string(ask_msg, dummy_name, sizeof dummy_name) | |
1921 | 1921 | || !dummy_name[0]) |
1922 | 1922 | { |
1923 | 1923 | /* Cancelled */ |
@@ -3447,7 +3447,7 @@ static byte get_string_for_search(object_type **o_handle, cptr *search_strp) | ||
3447 | 3447 | Term_gotoxy(col + pos, 0); |
3448 | 3448 | |
3449 | 3449 | /* Get a special key code */ |
3450 | - skey = inkey_special(TRUE, FALSE); | |
3450 | + skey = inkey_special(TRUE); | |
3451 | 3451 | |
3452 | 3452 | /* Analyze the key */ |
3453 | 3453 | switch (skey) |
@@ -6254,7 +6254,7 @@ void do_cmd_edit_autopick(void) | ||
6254 | 6254 | tb->old_hgt = tb->hgt; |
6255 | 6255 | |
6256 | 6256 | /* Get a command */ |
6257 | - key = inkey_special(TRUE, FALSE); | |
6257 | + key = inkey_special(TRUE); | |
6258 | 6258 | |
6259 | 6259 | /* Special keys */ |
6260 | 6260 | if (key & SKEY_MASK) |
@@ -5387,7 +5387,7 @@ static void edit_history(void) | ||
5387 | 5387 | Term_gotoxy(x + 10, y + 12); |
5388 | 5388 | |
5389 | 5389 | /* Get special key code */ |
5390 | - skey = inkey_special(TRUE, FALSE); | |
5390 | + skey = inkey_special(TRUE); | |
5391 | 5391 | |
5392 | 5392 | /* Get a character code */ |
5393 | 5393 | if (!(skey & SKEY_MASK)) c = (char)skey; |
@@ -1280,7 +1280,7 @@ sprintf(tmp_str," | ||
1280 | 1280 | * Use get_string() because we may need more than |
1281 | 1281 | * the s16b value returned by get_quantity(). |
1282 | 1282 | */ |
1283 | - if (get_string(tmp_str, out_val, 32, TRUE)) | |
1283 | + if (get_string(tmp_str, out_val, 32)) | |
1284 | 1284 | { |
1285 | 1285 | /* Strip spaces */ |
1286 | 1286 | for (p = out_val; *p == ' '; p++); |
@@ -1453,9 +1453,9 @@ c_put_str(TERM_GREEN, " | ||
1453 | 1453 | prt("--------------------------------", 8, 3); |
1454 | 1454 | strcpy(out_val, ""); |
1455 | 1455 | #ifdef JP |
1456 | - get_string("何番? (0-9): ", out_val, 32, TRUE); | |
1456 | +get_string("何番? (0-9): ", out_val, 32); | |
1457 | 1457 | #else |
1458 | - get_string("Pick a number (0-9): ", out_val, 32, TRUE); | |
1458 | + get_string("Pick a number (0-9): ", out_val, 32); | |
1459 | 1459 | #endif |
1460 | 1460 | |
1461 | 1461 | for (p = out_val; isspace(*p); p++); |
@@ -2012,7 +2012,7 @@ sprintf(tmp_str," | ||
2012 | 2012 | * Use get_string() because we may need more than |
2013 | 2013 | * the s16b value returned by get_quantity(). |
2014 | 2014 | */ |
2015 | - if (get_string(tmp_str, out_val, 32, TRUE)) | |
2015 | + if (get_string(tmp_str, out_val, 32)) | |
2016 | 2016 | { |
2017 | 2017 | /* Strip spaces */ |
2018 | 2018 | for (p = out_val; *p == ' '; p++); |
@@ -3967,10 +3967,11 @@ if (get_check(format(" | ||
3967 | 3967 | |
3968 | 3968 | /* Get the quantity for staves and wands */ |
3969 | 3969 | #ifdef JP |
3970 | - charges = get_quantity(format("一回分$%d で何回分充填しますか?", | |
3970 | +charges = get_quantity(format("一回分$%d で何回分充填しますか?", | |
3971 | 3971 | #else |
3972 | 3972 | charges = get_quantity(format("Add how many charges for %d gold? ", |
3973 | 3973 | #endif |
3974 | + | |
3974 | 3975 | price), MIN(p_ptr->au / price, max_charges)); |
3975 | 3976 | |
3976 | 3977 | /* Do nothing */ |
@@ -4352,12 +4353,12 @@ if (!get_com(" | ||
4352 | 4353 | { |
4353 | 4354 | all = TRUE; |
4354 | 4355 | #ifdef JP |
4355 | - if (!get_string("名前(英語の場合小文字で可)", temp, 70, TRUE)) | |
4356 | + if (!get_string("名前(英語の場合小文字で可)",temp, 70)) | |
4356 | 4357 | #else |
4357 | - if (!get_string("Enter name:",temp, 70, TRUE)) | |
4358 | + if (!get_string("Enter name:",temp, 70)) | |
4358 | 4359 | #endif |
4359 | 4360 | { |
4360 | - temp[0] = 0; | |
4361 | + temp[0]=0; | |
4361 | 4362 | |
4362 | 4363 | /* Restore */ |
4363 | 4364 | screen_load(); |
@@ -2845,7 +2845,7 @@ void do_cmd_rest(void) | ||
2845 | 2845 | strcpy(out_val, "&"); |
2846 | 2846 | |
2847 | 2847 | /* Ask for duration */ |
2848 | - if (!get_string(p, out_val, 4, TRUE)) return; | |
2848 | + if (!get_string(p, out_val, 4)) return; | |
2849 | 2849 | |
2850 | 2850 | /* Rest until done */ |
2851 | 2851 | if (out_val[0] == '&') |
@@ -1378,9 +1378,9 @@ void do_cmd_inscribe(void) | ||
1378 | 1378 | |
1379 | 1379 | /* Get a new inscription (possibly empty) */ |
1380 | 1380 | #ifdef JP |
1381 | - if (get_string("銘: ", out_val, 80, FALSE)) | |
1381 | + if (get_string("銘: ", out_val, 80)) | |
1382 | 1382 | #else |
1383 | - if (get_string("Inscription: ", out_val, 80, FALSE)) | |
1383 | + if (get_string("Inscription: ", out_val, 80)) | |
1384 | 1384 | #endif |
1385 | 1385 | { |
1386 | 1386 | /* Save the inscription */ |
@@ -2045,12 +2045,12 @@ void do_cmd_query_symbol(void) | ||
2045 | 2045 | { |
2046 | 2046 | all = TRUE; |
2047 | 2047 | #ifdef JP |
2048 | - if (!get_string("名前(英語の場合小文字で可)", temp, 70, FALSE)) | |
2048 | + if (!get_string("名前(英語の場合小文字で可)",temp, 70)) | |
2049 | 2049 | #else |
2050 | - if (!get_string("Enter name:", temp, 70, FALSE)) | |
2050 | + if (!get_string("Enter name:",temp, 70)) | |
2051 | 2051 | #endif |
2052 | 2052 | { |
2053 | - temp[0] = 0; | |
2053 | + temp[0]=0; | |
2054 | 2054 | return; |
2055 | 2055 | } |
2056 | 2056 | #ifdef JP |
@@ -930,9 +930,9 @@ static void do_cmd_bunshou(void) | ||
930 | 930 | char bunshou[80] = "\0"; |
931 | 931 | |
932 | 932 | #ifdef JP |
933 | - if (get_string("内容: ", tmp, 79, FALSE)) | |
933 | + if (get_string("内容: ", tmp, 79)) | |
934 | 934 | #else |
935 | - if (get_string("diary note: ", tmp, 79, FALSE)) | |
935 | + if (get_string("diary note: ", tmp, 79)) | |
936 | 936 | #endif |
937 | 937 | { |
938 | 938 | strcpy(bunshou, tmp); |
@@ -1225,9 +1225,9 @@ void do_cmd_change_name(void) | ||
1225 | 1225 | { |
1226 | 1226 | sprintf(tmp, "%s.txt", player_base); |
1227 | 1227 | #ifdef JP |
1228 | - if (get_string("ファイル名: ", tmp, 80, FALSE)) | |
1228 | + if (get_string("ファイル名: ", tmp, 80)) | |
1229 | 1229 | #else |
1230 | - if (get_string("File name: ", tmp, 80, FALSE)) | |
1230 | + if (get_string("File name: ", tmp, 80)) | |
1231 | 1231 | #endif |
1232 | 1232 | |
1233 | 1233 | { |
@@ -1382,7 +1382,7 @@ void do_cmd_messages(int num_now) | ||
1382 | 1382 | |
1383 | 1383 | |
1384 | 1384 | /* Get a command */ |
1385 | - skey = inkey_special(TRUE, FALSE); | |
1385 | + skey = inkey_special(TRUE); | |
1386 | 1386 | |
1387 | 1387 | /* Exit on Escape */ |
1388 | 1388 | if (skey == ESCAPE) break; |
@@ -2712,9 +2712,9 @@ void do_cmd_pref(void) | ||
2712 | 2712 | |
2713 | 2713 | /* Ask for a "user pref command" */ |
2714 | 2714 | #ifdef JP |
2715 | - if (!get_string("設定変更コマンド: ", buf, 80, FALSE)) return; | |
2715 | + if (!get_string("設定変更コマンド: ", buf, 80)) return; | |
2716 | 2716 | #else |
2717 | - if (!get_string("Pref: ", buf, 80, FALSE)) return; | |
2717 | + if (!get_string("Pref: ", buf, 80)) return; | |
2718 | 2718 | #endif |
2719 | 2719 | |
2720 | 2720 |
@@ -3597,7 +3597,7 @@ static bool cmd_visuals_aux(int i, int *num, int max) | ||
3597 | 3597 | |
3598 | 3598 | sprintf(str, "%d", *num); |
3599 | 3599 | |
3600 | - if (!get_string(format("Input new number(0-%d): ", max-1), str, 4, TRUE)) | |
3600 | + if (!get_string(format("Input new number(0-%d): ", max-1), str, 4)) | |
3601 | 3601 | return FALSE; |
3602 | 3602 | |
3603 | 3603 | tmp = strtol(str, NULL, 0); |
@@ -4703,9 +4703,9 @@ void do_cmd_note(void) | ||
4703 | 4703 | |
4704 | 4704 | /* Input */ |
4705 | 4705 | #ifdef JP |
4706 | - if (!get_string("メモ: ", buf, 60, FALSE)) return; | |
4706 | + if (!get_string("メモ: ", buf, 60)) return; | |
4707 | 4707 | #else |
4708 | - if (!get_string("Note: ", buf, 60, FALSE)) return; | |
4708 | + if (!get_string("Note: ", buf, 60)) return; | |
4709 | 4709 | #endif |
4710 | 4710 | |
4711 | 4711 |
@@ -6097,9 +6097,9 @@ static void do_cmd_save_screen_html(void) | ||
6097 | 6097 | char buf[1024], tmp[256] = "screen.html"; |
6098 | 6098 | |
6099 | 6099 | #ifdef JP |
6100 | - if (!get_string("ファイル名: ", tmp, 80, FALSE)) | |
6100 | + if (!get_string("ファイル名: ", tmp, 80)) | |
6101 | 6101 | #else |
6102 | - if (!get_string("File name: ", tmp, 80, FALSE)) | |
6102 | + if (!get_string("File name: ", tmp, 80)) | |
6103 | 6103 | #endif |
6104 | 6104 | return; |
6105 | 6105 |
@@ -2247,10 +2247,11 @@ static void do_name_pet(void) | ||
2247 | 2247 | |
2248 | 2248 | /* Get a new inscription (possibly empty) */ |
2249 | 2249 | #ifdef JP |
2250 | - if (get_string("名前: ", out_val, 15, FALSE)) | |
2250 | + if (get_string("名前: ", out_val, 15)) | |
2251 | 2251 | #else |
2252 | - if (get_string("Name: ", out_val, 15, FALSE)) | |
2252 | + if (get_string("Name: ", out_val, 15)) | |
2253 | 2253 | #endif |
2254 | + | |
2254 | 2255 | { |
2255 | 2256 | if (out_val[0]) |
2256 | 2257 | { |
@@ -629,7 +629,7 @@ static void pattern_teleport(void) | ||
629 | 629 | sprintf(tmp_val, "%d", dun_level); |
630 | 630 | |
631 | 631 | /* Ask for a level */ |
632 | - if (!get_string(ppp, tmp_val, 10, TRUE)) return; | |
632 | + if (!get_string(ppp, tmp_val, 10)) return; | |
633 | 633 | |
634 | 634 | /* Extract request */ |
635 | 635 | command_arg = atoi(tmp_val); |
@@ -5246,9 +5246,9 @@ get_rnd_line("death_j.txt", 0, death_message); | ||
5246 | 5246 | #endif |
5247 | 5247 | } |
5248 | 5248 | #ifdef JP |
5249 | - while (!get_string(streq(p_ptr->died_from, "Seppuku") ? "辞世の句: " : "断末魔の叫び: ", death_message, 1024, FALSE)) ; | |
5249 | + while (!get_string(streq(p_ptr->died_from, "Seppuku") ? "辞世の句: " : "断末魔の叫び: ", death_message, 1024)) ; | |
5250 | 5250 | #else |
5251 | - while (!get_string("Last word: ", death_message, 1024, FALSE)) ; | |
5251 | + while (!get_string("Last word: ", death_message, 1024)) ; | |
5252 | 5252 | #endif |
5253 | 5253 | if (death_message[0] == '\0') |
5254 | 5254 | { |
@@ -1274,9 +1274,9 @@ extern void prt(cptr str, int row, int col); | ||
1274 | 1274 | extern void c_roff(byte attr, cptr str); |
1275 | 1275 | extern void roff(cptr str); |
1276 | 1276 | extern void clear_from(int row); |
1277 | -extern bool askfor_aux(char *buf, int len, bool numpad_cursor, bool allow_ascii_macro_trigger); | |
1277 | +extern bool askfor_aux(char *buf, int len, bool numpad_cursor); | |
1278 | 1278 | extern bool askfor(char *buf, int len); |
1279 | -extern bool get_string(cptr prompt, char *buf, int len, bool allow_ascii_macro_trigger); | |
1279 | +extern bool get_string(cptr prompt, char *buf, int len); | |
1280 | 1280 | extern bool get_check(cptr prompt); |
1281 | 1281 | extern bool get_check_strict(cptr prompt, int mode); |
1282 | 1282 | extern bool get_com(cptr prompt, char *command, bool z_escape); |
@@ -1302,7 +1302,7 @@ extern size_t my_strcat(char *buf, const char *src, size_t bufsize); | ||
1302 | 1302 | extern char *my_strstr(const char *haystack, const char *needle); |
1303 | 1303 | extern char *my_strchr(const char *ptr, char ch); |
1304 | 1304 | extern void str_tolower(char *str); |
1305 | -extern int inkey_special(bool numpad_cursor, bool allow_ascii_macro_trigger); | |
1305 | +extern int inkey_special(bool numpad_cursor); | |
1306 | 1306 | |
1307 | 1307 | |
1308 | 1308 | /* xtra1.c */ |
@@ -5553,7 +5553,7 @@ prt("[ | ||
5553 | 5553 | } |
5554 | 5554 | |
5555 | 5555 | /* Get a special key code */ |
5556 | - skey = inkey_special(TRUE, FALSE); | |
5556 | + skey = inkey_special(TRUE); | |
5557 | 5557 | |
5558 | 5558 | /* Show the help for the help */ |
5559 | 5559 | if (skey == '?') |
@@ -5729,17 +5729,17 @@ strcpy(tmp, "jhelp.hlp"); | ||
5729 | 5729 | char buff[1024]; |
5730 | 5730 | char xtmp[82]; |
5731 | 5731 | |
5732 | - strcpy(xtmp, ""); | |
5732 | + strcpy (xtmp, ""); | |
5733 | 5733 | |
5734 | 5734 | #ifdef JP |
5735 | - if (!get_string("ファイル名: ", xtmp, 80, FALSE)) | |
5735 | + if (!get_string("ファイル名: ", xtmp, 80)) | |
5736 | 5736 | #else |
5737 | - if (!get_string("File name: ", xtmp, 80, FALSE)) | |
5737 | + if (!get_string("File name: ", xtmp, 80)) | |
5738 | 5738 | #endif |
5739 | 5739 | { |
5740 | 5740 | continue; |
5741 | 5741 | } |
5742 | - | |
5742 | + | |
5743 | 5743 | /* Close it */ |
5744 | 5744 | my_fclose(fff); |
5745 | 5745 |
@@ -6022,9 +6022,9 @@ void get_name(void) | ||
6022 | 6022 | |
6023 | 6023 | /* Prompt for a new name */ |
6024 | 6024 | #ifdef JP |
6025 | - if (get_string("キャラクターの名前を入力して下さい: ", tmp, 15, FALSE)) | |
6025 | + if (get_string("キャラクターの名前を入力して下さい: ", tmp, 15)) | |
6026 | 6026 | #else |
6027 | - if (get_string("Enter a name for your character: ", tmp, 15, FALSE)) | |
6027 | + if (get_string("Enter a name for your character: ", tmp, 15)) | |
6028 | 6028 | #endif |
6029 | 6029 | { |
6030 | 6030 | /* Use the name */ |
@@ -6114,9 +6114,9 @@ prt(" | ||
6114 | 6114 | char buf[1024] = ""; |
6115 | 6115 | |
6116 | 6116 | #ifdef JP |
6117 | - while (!get_string("*勝利*メッセージ: ", buf, sizeof buf, FALSE)) ; | |
6117 | + while (!get_string("*勝利*メッセージ: ", buf, sizeof buf)) ; | |
6118 | 6118 | #else |
6119 | - while (!get_string("*Winning* message: ", buf, sizeof buf, FALSE)) ; | |
6119 | + while (!get_string("*Winning* message: ", buf, sizeof buf)) ; | |
6120 | 6120 | #endif |
6121 | 6121 | |
6122 | 6122 | if (buf[0]) |
@@ -8058,7 +8058,7 @@ static void add_essence(int mode) | ||
8058 | 8058 | #endif |
8059 | 8059 | strcpy(tmp_val, "1"); |
8060 | 8060 | |
8061 | - if (!get_string(tmp, tmp_val, 1, TRUE)) return; | |
8061 | + if (!get_string(tmp, tmp_val, 1)) return; | |
8062 | 8062 | pval = atoi(tmp_val); |
8063 | 8063 | if (pval > limit) pval = limit; |
8064 | 8064 | else if (pval < 1) pval = 1; |
@@ -8089,9 +8089,9 @@ static void add_essence(int mode) | ||
8089 | 8089 | |
8090 | 8090 | strcpy(tmp_val, "1"); |
8091 | 8091 | #ifdef JP |
8092 | - if (!get_string(format("いくつ付加しますか? (1-%d):", p_ptr->lev/7+3), tmp_val, 2, TRUE)) return; | |
8092 | + if (!get_string(format("いくつ付加しますか? (1-%d):", p_ptr->lev/7+3), tmp_val, 2)) return; | |
8093 | 8093 | #else |
8094 | - if (!get_string(format("Enchant how many? (1-%d):", p_ptr->lev/7+3), tmp_val, 2, TRUE)) return; | |
8094 | + if (!get_string(format("Enchant how many? (1-%d):", p_ptr->lev/7+3), tmp_val, 2)) return; | |
8095 | 8095 | #endif |
8096 | 8096 | val = atoi(tmp_val); |
8097 | 8097 | if (val > p_ptr->lev/7+3) val = p_ptr->lev/7+3; |
@@ -1012,7 +1012,7 @@ sprintf(ppp, " | ||
1012 | 1012 | sprintf(tmp_val, "%d", MAX(dun_level, 1)); |
1013 | 1013 | |
1014 | 1014 | /* Ask for a level */ |
1015 | - if (get_string(ppp, tmp_val, 10, TRUE)) | |
1015 | + if (get_string(ppp, tmp_val, 10)) | |
1016 | 1016 | { |
1017 | 1017 | /* Extract request */ |
1018 | 1018 | dummy = atoi(tmp_val); |
@@ -1032,12 +1032,13 @@ sprintf(ppp, " | ||
1032 | 1032 | #else |
1033 | 1033 | do_cmd_write_nikki(NIKKI_TRUMP, select_dungeon, "using a scroll of reset recall"); |
1034 | 1034 | #endif |
1035 | - /* Accept request */ | |
1035 | + /* Accept request */ | |
1036 | 1036 | #ifdef JP |
1037 | - msg_format("%sの帰還レベルを %d 階にセット。", d_name+d_info[select_dungeon].name, dummy, dummy * 50); | |
1037 | +msg_format("%sの帰還レベルを %d 階にセット。", d_name+d_info[select_dungeon].name, dummy, dummy * 50); | |
1038 | 1038 | #else |
1039 | 1039 | msg_format("Recall depth set to level %d (%d').", dummy, dummy * 50); |
1040 | 1040 | #endif |
1041 | + | |
1041 | 1042 | } |
1042 | 1043 | else |
1043 | 1044 | { |
@@ -2605,7 +2605,7 @@ static int get_haggle(cptr pmt, s32b *poffer, s32b price, int final) | ||
2605 | 2605 | * Ask the user for a response. |
2606 | 2606 | * Don't allow to use numpad as cursor key. |
2607 | 2607 | */ |
2608 | - res = askfor_aux(out_val, 32, FALSE, FALSE); | |
2608 | + res = askfor_aux(out_val, 32, FALSE); | |
2609 | 2609 | |
2610 | 2610 | /* Clear prompt */ |
2611 | 2611 | prt("", 0, 0); |
@@ -3196,7 +3196,7 @@ void clear_from(int row) | ||
3196 | 3196 | * ESCAPE clears the buffer and the window and returns FALSE. |
3197 | 3197 | * RETURN accepts the current buffer contents and returns TRUE. |
3198 | 3198 | */ |
3199 | -bool askfor_aux(char *buf, int len, bool numpad_cursor, bool allow_ascii_macro_trigger) | |
3199 | +bool askfor_aux(char *buf, int len, bool numpad_cursor) | |
3200 | 3200 | { |
3201 | 3201 | int y, x; |
3202 | 3202 | int pos = 0; |
@@ -3237,7 +3237,7 @@ bool askfor_aux(char *buf, int len, bool numpad_cursor, bool allow_ascii_macro_t | ||
3237 | 3237 | Term_gotoxy(x + pos, y); |
3238 | 3238 | |
3239 | 3239 | /* Get a special key code */ |
3240 | - skey = inkey_special(numpad_cursor, allow_ascii_macro_trigger); | |
3240 | + skey = inkey_special(numpad_cursor); | |
3241 | 3241 | |
3242 | 3242 | /* Analyze the key */ |
3243 | 3243 | switch (skey) |
@@ -3445,7 +3445,7 @@ bool askfor_aux(char *buf, int len, bool numpad_cursor, bool allow_ascii_macro_t | ||
3445 | 3445 | */ |
3446 | 3446 | bool askfor(char *buf, int len) |
3447 | 3447 | { |
3448 | - return askfor_aux(buf, len, TRUE, FALSE); | |
3448 | + return askfor_aux(buf, len, TRUE); | |
3449 | 3449 | } |
3450 | 3450 | |
3451 | 3451 |
@@ -3459,7 +3459,7 @@ bool askfor(char *buf, int len) | ||
3459 | 3459 | * |
3460 | 3460 | * We clear the input, and return FALSE, on "ESCAPE". |
3461 | 3461 | */ |
3462 | -bool get_string(cptr prompt, char *buf, int len, bool allow_ascii_macro_trigger) | |
3462 | +bool get_string(cptr prompt, char *buf, int len) | |
3463 | 3463 | { |
3464 | 3464 | bool res; |
3465 | 3465 |
@@ -3470,7 +3470,7 @@ bool get_string(cptr prompt, char *buf, int len, bool allow_ascii_macro_trigger) | ||
3470 | 3470 | prt(prompt, 0, 0); |
3471 | 3471 | |
3472 | 3472 | /* Ask the user for a string */ |
3473 | - res = askfor_aux(buf, len, TRUE, allow_ascii_macro_trigger); | |
3473 | + res = askfor(buf, len); | |
3474 | 3474 | |
3475 | 3475 | /* Clear prompt */ |
3476 | 3476 | prt("", 0, 0); |
@@ -3713,7 +3713,7 @@ s16b get_quantity(cptr prompt, int max) | ||
3713 | 3713 | * Ask for a quantity |
3714 | 3714 | * Don't allow to use numpad as cursor key. |
3715 | 3715 | */ |
3716 | - res = askfor_aux(buf, 6, FALSE, TRUE); | |
3716 | + res = askfor_aux(buf, 6, FALSE); | |
3717 | 3717 | |
3718 | 3718 | /* Clear prompt */ |
3719 | 3719 | prt("", 0, 0); |
@@ -5356,7 +5356,7 @@ void str_tolower(char *str) | ||
5356 | 5356 | * This function is a Mega-Hack and depend on pref-xxx.prf's. |
5357 | 5357 | * Currently works on Linux(UNIX), Windows, and Macintosh only. |
5358 | 5358 | */ |
5359 | -int inkey_special(bool numpad_cursor, bool allow_ascii_macro_trigger) | |
5359 | +int inkey_special(bool numpad_cursor) | |
5360 | 5360 | { |
5361 | 5361 | static const struct { |
5362 | 5362 | cptr keyname; |
@@ -5418,7 +5418,7 @@ int inkey_special(bool numpad_cursor, bool allow_ascii_macro_trigger) | ||
5418 | 5418 | /* |
5419 | 5419 | * Hack -- Ignore macro defined on ASCII characters. |
5420 | 5420 | */ |
5421 | - if ((trig_len == 1) && parse_macro && !allow_ascii_macro_trigger) | |
5421 | + if (trig_len == 1 && parse_macro) | |
5422 | 5422 | { |
5423 | 5423 | char c = inkey_macro_trigger_string[0]; |
5424 | 5424 |
@@ -366,7 +366,7 @@ static void do_cmd_wiz_change_aux(void) | ||
366 | 366 | sprintf(tmp_val, "%d", p_ptr->stat_max[i]); |
367 | 367 | |
368 | 368 | /* Query */ |
369 | - if (!get_string(ppp, tmp_val, 3, TRUE)) return; | |
369 | + if (!get_string(ppp, tmp_val, 3)) return; | |
370 | 370 | |
371 | 371 | /* Extract */ |
372 | 372 | tmp_int = atoi(tmp_val); |
@@ -385,9 +385,9 @@ static void do_cmd_wiz_change_aux(void) | ||
385 | 385 | |
386 | 386 | /* Query */ |
387 | 387 | #ifdef JP |
388 | - if (!get_string("熟練度: ", tmp_val, 9, TRUE)) return; | |
388 | + if (!get_string("熟練度: ", tmp_val, 9)) return; | |
389 | 389 | #else |
390 | - if (!get_string("Proficiency: ", tmp_val, 9, TRUE)) return; | |
390 | + if (!get_string("Proficiency: ", tmp_val, 9)) return; | |
391 | 391 | #endif |
392 | 392 | |
393 | 393 | /* Extract */ |
@@ -421,7 +421,7 @@ static void do_cmd_wiz_change_aux(void) | ||
421 | 421 | sprintf(tmp_val, "%ld", (long)(p_ptr->au)); |
422 | 422 | |
423 | 423 | /* Query */ |
424 | - if (!get_string("Gold: ", tmp_val, 9, TRUE)) return; | |
424 | + if (!get_string("Gold: ", tmp_val, 9)) return; | |
425 | 425 | |
426 | 426 | /* Extract */ |
427 | 427 | tmp_long = atol(tmp_val); |
@@ -437,7 +437,7 @@ static void do_cmd_wiz_change_aux(void) | ||
437 | 437 | sprintf(tmp_val, "%ld", (long)(p_ptr->max_exp)); |
438 | 438 | |
439 | 439 | /* Query */ |
440 | - if (!get_string("Experience: ", tmp_val, 9, TRUE)) return; | |
440 | + if (!get_string("Experience: ", tmp_val, 9)) return; | |
441 | 441 | |
442 | 442 | /* Extract */ |
443 | 443 | tmp_long = atol(tmp_val); |
@@ -819,25 +819,25 @@ static void wiz_tweak_item(object_type *o_ptr) | ||
819 | 819 | |
820 | 820 | p = "Enter new 'pval' setting: "; |
821 | 821 | sprintf(tmp_val, "%d", o_ptr->pval); |
822 | - if (!get_string(p, tmp_val, 5, TRUE)) return; | |
822 | + if (!get_string(p, tmp_val, 5)) return; | |
823 | 823 | o_ptr->pval = atoi(tmp_val); |
824 | 824 | wiz_display_item(o_ptr); |
825 | 825 | |
826 | 826 | p = "Enter new 'to_a' setting: "; |
827 | 827 | sprintf(tmp_val, "%d", o_ptr->to_a); |
828 | - if (!get_string(p, tmp_val, 5, TRUE)) return; | |
828 | + if (!get_string(p, tmp_val, 5)) return; | |
829 | 829 | o_ptr->to_a = atoi(tmp_val); |
830 | 830 | wiz_display_item(o_ptr); |
831 | 831 | |
832 | 832 | p = "Enter new 'to_h' setting: "; |
833 | 833 | sprintf(tmp_val, "%d", o_ptr->to_h); |
834 | - if (!get_string(p, tmp_val, 5, TRUE)) return; | |
834 | + if (!get_string(p, tmp_val, 5)) return; | |
835 | 835 | o_ptr->to_h = atoi(tmp_val); |
836 | 836 | wiz_display_item(o_ptr); |
837 | 837 | |
838 | 838 | p = "Enter new 'to_d' setting: "; |
839 | 839 | sprintf(tmp_val, "%d", o_ptr->to_d); |
840 | - if (!get_string(p, tmp_val, 5, TRUE)) return; | |
840 | + if (!get_string(p, tmp_val, 5)) return; | |
841 | 841 | o_ptr->to_d = atoi(tmp_val); |
842 | 842 | wiz_display_item(o_ptr); |
843 | 843 | } |
@@ -1040,7 +1040,7 @@ static void wiz_statistics(object_type *o_ptr) | ||
1040 | 1040 | } |
1041 | 1041 | |
1042 | 1042 | sprintf(tmp_val, "%ld", test_roll); |
1043 | - if (get_string(p, tmp_val, 10, TRUE)) test_roll = atol(tmp_val); | |
1043 | + if (get_string(p, tmp_val, 10)) test_roll = atol(tmp_val); | |
1044 | 1044 | test_roll = MAX(1, test_roll); |
1045 | 1045 | |
1046 | 1046 | /* Let us know what we are doing */ |
@@ -1163,7 +1163,7 @@ static void wiz_quantity_item(object_type *o_ptr) | ||
1163 | 1163 | sprintf(tmp_val, "%d", o_ptr->number); |
1164 | 1164 | |
1165 | 1165 | /* Query */ |
1166 | - if (get_string("Quantity: ", tmp_val, 2, TRUE)) | |
1166 | + if (get_string("Quantity: ", tmp_val, 2)) | |
1167 | 1167 | { |
1168 | 1168 | /* Extract */ |
1169 | 1169 | tmp_int = atoi(tmp_val); |
@@ -1492,7 +1492,7 @@ static void do_cmd_wiz_jump(void) | ||
1492 | 1492 | sprintf(tmp_val, "%d", dungeon_type); |
1493 | 1493 | |
1494 | 1494 | /* Ask for a level */ |
1495 | - if (!get_string(ppp, tmp_val, 2, TRUE)) return; | |
1495 | + if (!get_string(ppp, tmp_val, 2)) return; | |
1496 | 1496 | |
1497 | 1497 | tmp_dungeon_type = atoi(tmp_val); |
1498 | 1498 | if (!d_info[tmp_dungeon_type].maxdepth || (tmp_dungeon_type > max_d_idx)) tmp_dungeon_type = DUNGEON_ANGBAND; |
@@ -1504,7 +1504,7 @@ static void do_cmd_wiz_jump(void) | ||
1504 | 1504 | sprintf(tmp_val, "%d", dun_level); |
1505 | 1505 | |
1506 | 1506 | /* Ask for a level */ |
1507 | - if (!get_string(ppp, tmp_val, 10, TRUE)) return; | |
1507 | + if (!get_string(ppp, tmp_val, 10)) return; | |
1508 | 1508 | |
1509 | 1509 | /* Extract request */ |
1510 | 1510 | command_arg = atoi(tmp_val); |
@@ -1695,9 +1695,9 @@ static void do_cmd_wiz_create_feature(void) | ||
1695 | 1695 | |
1696 | 1696 | /* Query */ |
1697 | 1697 | #ifdef JP |
1698 | - if (!get_string("地形: ", tmp_val, 3, TRUE)) return; | |
1698 | + if (!get_string("地形: ", tmp_val, 3)) return; | |
1699 | 1699 | #else |
1700 | - if (!get_string("Feature: ", tmp_val, 3, TRUE)) return; | |
1700 | + if (!get_string("Feature: ", tmp_val, 3)) return; | |
1701 | 1701 | #endif |
1702 | 1702 | |
1703 | 1703 | /* Extract */ |
@@ -1710,9 +1710,9 @@ static void do_cmd_wiz_create_feature(void) | ||
1710 | 1710 | |
1711 | 1711 | /* Query */ |
1712 | 1712 | #ifdef JP |
1713 | - if (!get_string("地形 (mimic): ", tmp_val, 3, TRUE)) return; | |
1713 | + if (!get_string("地形 (mimic): ", tmp_val, 3)) return; | |
1714 | 1714 | #else |
1715 | - if (!get_string("Feature (mimic): ", tmp_val, 3, TRUE)) return; | |
1715 | + if (!get_string("Feature (mimic): ", tmp_val, 3)) return; | |
1716 | 1716 | #endif |
1717 | 1717 | |
1718 | 1718 | /* Extract */ |