<ClCompile Include="..\..\src\cmd\cmd-activate.c" />\r
<ClCompile Include="..\..\src\cmd\cmd-basic.c" />\r
<ClCompile Include="..\..\src\cmd\cmd-diary.c" />\r
+ <ClCompile Include="..\..\src\cmd\cmd-draw.c" />\r
<ClCompile Include="..\..\src\cmd\cmd-dump.c" />\r
<ClCompile Include="..\..\src\cmd\cmd-eat.c" />\r
<ClCompile Include="..\..\src\cmd\cmd-gameoption.c" />\r
<ClInclude Include="..\..\src\cmd\cmd-activate.h" />\r
<ClInclude Include="..\..\src\cmd\cmd-basic.h" />\r
<ClInclude Include="..\..\src\cmd\cmd-diary.h" />\r
+ <ClInclude Include="..\..\src\cmd\cmd-draw.h" />\r
<ClInclude Include="..\..\src\cmd\cmd-dump.h" />\r
<ClInclude Include="..\..\src\cmd\cmd-eat.h" />\r
<ClInclude Include="..\..\src\cmd\cmd-gameoption.h" />\r
<ClCompile Include="..\..\src\cmd\cmd-diary.c">
<Filter>cmd</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\cmd\cmd-draw.c">
+ <Filter>cmd</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\gamevalue.h" />
<ClInclude Include="..\..\src\cmd\cmd-diary.h">
<Filter>cmd</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\cmd\cmd-draw.h">
+ <Filter>cmd</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\wall.bmp" />
cmd/diary-subtitle-table.c cmd/diary-subtitle-table.h \
cmd/object-group-table.c cmd/object-group-table.h \
cmd/cmd-activate.c cmd/cmd-activate.h cmd/cmd-basic.c cmd/cmd-basic.h \
- cmd/cmd-dump.c cmd/cmd-dump.h cmd/cmd-diary.c cmd/cmd-diary.h \
- cmd/cmd-eat.c cmd/cmd-eat.h cmd/cmd-gameoption.c cmd/cmd-gameoption.h \
- cmd/cmd-help.c cmd/cmd-help.h cmd/cmd-hissatsu.c cmd/cmd-hissatsu.h \
- cmd/cmd-item.c cmd/cmd-item.h cmd/cmd-magiceat.c cmd/cmd-magiceat.h \
- cmd/cmd-mane.c cmd/cmd-mane.h cmd/cmd-macro.c cmd/cmd-macro.h \
- cmd/cmd-pet.c cmd/cmd-pet.h cmd/cmd-quaff.c cmd/cmd-quaff.h \
- cmd/cmd-read.c cmd/cmd-read.h cmd/cmd-save.c cmd/cmd-save.h \
- cmd/cmd-smith.c cmd/cmd-smith.h cmd/cmd-spell.c cmd/cmd-spell.h \
- cmd/cmd-usestaff.c cmd/cmd-usestaff.h cmd/cmd-zaprod.c cmd/cmd-zaprod.h \
- cmd/cmd-zapwand.c cmd/cmd-zapwand.h \
+ cmd/cmd-diary.c cmd/cmd-diary.h cmd/cmd-dump.c cmd/cmd-dump.h \
+ cmd/cmd-draw.c cmd/cmd-draw.h cmd/cmd-eat.c cmd/cmd-eat.h \
+ cmd/cmd-gameoption.c cmd/cmd-gameoption.h cmd/cmd-help.c cmd/cmd-help.h \
+ cmd/cmd-hissatsu.c cmd/cmd-hissatsu.h cmd/cmd-item.c cmd/cmd-item.h \
+ cmd/cmd-magiceat.c cmd/cmd-magiceat.h cmd/cmd-mane.c cmd/cmd-mane.h \
+ cmd/cmd-macro.c cmd/cmd-macro.h cmd/cmd-pet.c cmd/cmd-pet.h \
+ cmd/cmd-quaff.c cmd/cmd-quaff.h cmd/cmd-read.c cmd/cmd-read.h \
+ cmd/cmd-save.c cmd/cmd-save.h cmd/cmd-smith.c cmd/cmd-smith.h \
+ cmd/cmd-spell.c cmd/cmd-spell.h cmd/cmd-usestaff.c cmd/cmd-usestaff.h \
+ cmd/cmd-zaprod.c cmd/cmd-zaprod.h cmd/cmd-zapwand.c cmd/cmd-zapwand.h \
\
combat/melee.h combat/melee1.c combat/shoot.c combat/shoot.h
--- /dev/null
+#include "angband.h"
+#include "core.h" // 暫定。後で消す.
+#include "cmd/cmd-draw.h"
+#include "files.h"
+#include "term.h"
+#include "view-mainwindow.h" // 暫定。後で消す.
+
+/*!
+ * @brief 画面を再描画するコマンドのメインルーチン
+ * Hack -- redraw the screen
+ * @param creature_ptr プレーヤーへの参照ポインタ
+ * @return なし
+ * @details
+ * <pre>
+ * This command performs various low level updates, clears all the "extra"
+ * windows, does a total redraw of the main window, and requests all of the
+ * interesting updates and redraws that I can think of.
+ *
+ * This command is also used to "instantiate" the results of the user
+ * selecting various things, such as graphics mode, so it must call
+ * the "TERM_XTRA_REACT" hook before redrawing the windows.
+ * </pre>
+ */
+void do_cmd_redraw(player_type *creature_ptr)
+{
+ Term_xtra(TERM_XTRA_REACT, 0);
+
+ creature_ptr->update |= (PU_COMBINE | PU_REORDER);
+ creature_ptr->update |= (PU_TORCH);
+ creature_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
+ creature_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
+ creature_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE);
+ creature_ptr->update |= (PU_MONSTERS);
+
+ creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
+
+ creature_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
+ creature_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT);
+
+ update_playtime();
+ handle_stuff(creature_ptr);
+ if (creature_ptr->prace == RACE_ANDROID) calc_android_exp(creature_ptr);
+
+ term *old = Term;
+ for (int j = 0; j < 8; j++)
+ {
+ if (!angband_term[j]) continue;
+
+ Term_activate(angband_term[j]);
+ Term_redraw();
+ Term_fresh();
+ Term_activate(old);
+ }
+}
+
+
+/*!
+ * @brief プレイヤーのステータス表示
+ * @return なし
+ */
+void do_cmd_player_status(player_type *creature_ptr)
+{
+ int mode = 0;
+ char tmp[160];
+ screen_save();
+ while (TRUE)
+ {
+ update_playtime();
+ display_player(creature_ptr, mode, map_name);
+
+ if (mode == 4)
+ {
+ mode = 0;
+ display_player(creature_ptr, mode, map_name);
+ }
+
+ Term_putstr(2, 23, -1, TERM_WHITE,
+ _("['c'で名前変更, 'f'でファイルへ書出, 'h'でモード変更, ESCで終了]", "['c' to change name, 'f' to file, 'h' to change mode, or ESC]"));
+ char c = inkey();
+ if (c == ESCAPE) break;
+
+ if (c == 'c')
+ {
+ get_name(creature_ptr);
+ process_player_name(creature_ptr, FALSE);
+ }
+ else if (c == 'f')
+ {
+ sprintf(tmp, "%s.txt", creature_ptr->base_name);
+ if (get_string(_("ファイル名: ", "File name: "), tmp, 80))
+ {
+ if (tmp[0] && (tmp[0] != ' '))
+ {
+ file_character(creature_ptr, tmp, update_playtime, display_player, map_name);
+ }
+ }
+ }
+ else if (c == 'h')
+ {
+ mode++;
+ }
+ else
+ {
+ bell();
+ }
+
+ msg_erase();
+ }
+
+ screen_load();
+ creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
+ handle_stuff(creature_ptr);
+}
+
+
+/*!
+ * @brief 最近表示されたメッセージを再表示するコマンドのメインルーチン
+ * Recall the most recent message
+ * @return なし
+ */
+void do_cmd_message_one(void)
+{
+ prt(format("> %s", message_str(0)), 0, 0);
+}
+
+
+/*!
+ * @brief メッセージのログを表示するコマンドのメインルーチン
+ * Recall the most recent message
+ * @return なし
+ * @details
+ * <pre>
+ * Show previous messages to the user -BEN-
+ *
+ * The screen format uses line 0 and 23 for headers and prompts,
+ * skips line 1 and 22, and uses line 2 thru 21 for old messages.
+ *
+ * This command shows you which commands you are viewing, and allows
+ * you to "search" for strings in the recall.
+ *
+ * Note that messages may be longer than 80 characters, but they are
+ * displayed using "infinite" length, with a special sub-command to
+ * "slide" the virtual display to the left or right.
+ *
+ * Attempt to only hilite the matching portions of the string.
+ * </pre>
+ */
+void do_cmd_messages(int num_now)
+{
+ char shower_str[81];
+ char finder_str[81];
+ char back_str[81];
+ concptr shower = NULL;
+ int wid, hgt;
+ Term_get_size(&wid, &hgt);
+ int num_lines = hgt - 4;
+ strcpy(finder_str, "");
+ strcpy(shower_str, "");
+ int n = message_num();
+ int i = 0;
+ screen_save();
+ Term_clear();
+ while (TRUE)
+ {
+ int j;
+ int skey;
+ for (j = 0; (j < num_lines) && (i + j < n); j++)
+ {
+ concptr msg = message_str(i + j);
+ c_prt((i + j < num_now ? TERM_WHITE : TERM_SLATE), msg, num_lines + 1 - j, 0);
+ if (!shower || !shower[0]) continue;
+
+ concptr str = msg;
+ while ((str = my_strstr(str, shower)) != NULL)
+ {
+ int len = strlen(shower);
+ Term_putstr(str - msg, num_lines + 1 - j, len, TERM_YELLOW, shower);
+ str += len;
+ }
+ }
+
+ for (; j < num_lines; j++)
+ Term_erase(0, num_lines + 1 - j, 255);
+
+ prt(format(_("以前のメッセージ %d-%d 全部で(%d)", "Message Recall (%d-%d of %d)"),
+ i, i + j - 1, n), 0, 0);
+ prt(_("[ 'p' で更に古いもの, 'n' で更に新しいもの, '/' で検索, ESC で中断 ]",
+ "[Press 'p' for older, 'n' for newer, ..., or ESCAPE]"), hgt - 1, 0);
+ skey = inkey_special(TRUE);
+ if (skey == ESCAPE) break;
+
+ j = i;
+ switch (skey)
+ {
+ case '=':
+ prt(_("強調: ", "Show: "), hgt - 1, 0);
+ strcpy(back_str, shower_str);
+ if (askfor(shower_str, 80))
+ shower = shower_str[0] ? shower_str : NULL;
+ else
+ strcpy(shower_str, back_str);
+
+ continue;
+ case '/':
+ case KTRL('s'):
+ {
+ prt(_("検索: ", "Find: "), hgt - 1, 0);
+ strcpy(back_str, finder_str);
+ if (!askfor(finder_str, 80))
+ {
+ strcpy(finder_str, back_str);
+ continue;
+ }
+ else if (!finder_str[0])
+ {
+ shower = NULL;
+ continue;
+ }
+
+ shower = finder_str;
+ for (int z = i + 1; z < n; z++)
+ {
+ concptr msg = message_str(z);
+ if (my_strstr(msg, finder_str))
+ {
+ i = z;
+ break;
+ }
+ }
+ }
+
+ break;
+
+ case SKEY_TOP:
+ i = n - num_lines;
+ break;
+ case SKEY_BOTTOM:
+ i = 0;
+ break;
+ case '8':
+ case SKEY_UP:
+ case '\n':
+ case '\r':
+ i = MIN(i + 1, n - num_lines);
+ break;
+ case '+':
+ i = MIN(i + 10, n - num_lines);
+ break;
+ case 'p':
+ case KTRL('P'):
+ case ' ':
+ case SKEY_PGUP:
+ i = MIN(i + num_lines, n - num_lines);
+ break;
+ case 'n':
+ case KTRL('N'):
+ case SKEY_PGDOWN:
+ i = MAX(0, i - num_lines);
+ break;
+ case '-':
+ i = MAX(0, i - 10);
+ break;
+ case '2':
+ case SKEY_DOWN:
+ i = MAX(0, i - 1);
+ break;
+ }
+
+ if (i == j) bell();
+ }
+
+ screen_load();
+}
--- /dev/null
+#pragma once
+
+void do_cmd_redraw(player_type *creature_ptr);
+void do_cmd_player_status(player_type *creature_ptr);
+void do_cmd_message_one(void);
+void do_cmd_messages(int num_now);
*/
#include "angband.h"
+#include "cmd/cmd-draw.h"
#include "cmd/cmd-dump.h"
#include "term.h"
#include "core.h" // 暫定。後で消す.
static char hack[17] = "dwsorgbuDWvyRGBU";
/*!
- * @brief 画面を再描画するコマンドのメインルーチン
- * Hack -- redraw the screen
- * @param creature_ptr プレーヤーへの参照ポインタ
- * @return なし
- * @details
- * <pre>
- * This command performs various low level updates, clears all the "extra"
- * windows, does a total redraw of the main window, and requests all of the
- * interesting updates and redraws that I can think of.
- *
- * This command is also used to "instantiate" the results of the user
- * selecting various things, such as graphics mode, so it must call
- * the "TERM_XTRA_REACT" hook before redrawing the windows.
- * </pre>
- */
-void do_cmd_redraw(player_type *creature_ptr)
-{
- Term_xtra(TERM_XTRA_REACT, 0);
-
- creature_ptr->update |= (PU_COMBINE | PU_REORDER);
- creature_ptr->update |= (PU_TORCH);
- creature_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
- creature_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
- creature_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE);
- creature_ptr->update |= (PU_MONSTERS);
-
- creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
-
- creature_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
- creature_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT);
-
- update_playtime();
- handle_stuff(creature_ptr);
- if (creature_ptr->prace == RACE_ANDROID) calc_android_exp(creature_ptr);
-
- term *old = Term;
- for (int j = 0; j < 8; j++)
- {
- if (!angband_term[j]) continue;
-
- Term_activate(angband_term[j]);
- Term_redraw();
- Term_fresh();
- Term_activate(old);
- }
-}
-
-
-/*!
- * @brief プレイヤーのステータス表示
- * @return なし
- */
-void do_cmd_player_status(player_type *creature_ptr)
-{
- int mode = 0;
- char tmp[160];
- screen_save();
- while (TRUE)
- {
- update_playtime();
- display_player(creature_ptr, mode, map_name);
-
- if (mode == 4)
- {
- mode = 0;
- display_player(creature_ptr, mode, map_name);
- }
-
- Term_putstr(2, 23, -1, TERM_WHITE,
- _("['c'で名前変更, 'f'でファイルへ書出, 'h'でモード変更, ESCで終了]", "['c' to change name, 'f' to file, 'h' to change mode, or ESC]"));
- char c = inkey();
- if (c == ESCAPE) break;
-
- if (c == 'c')
- {
- get_name(creature_ptr);
- process_player_name(creature_ptr, FALSE);
- }
- else if (c == 'f')
- {
- sprintf(tmp, "%s.txt", creature_ptr->base_name);
- if (get_string(_("ファイル名: ", "File name: "), tmp, 80))
- {
- if (tmp[0] && (tmp[0] != ' '))
- {
- file_character(creature_ptr, tmp, update_playtime, display_player, map_name);
- }
- }
- }
- else if (c == 'h')
- {
- mode++;
- }
- else
- {
- bell();
- }
-
- msg_erase();
- }
-
- screen_load();
- creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
- handle_stuff(creature_ptr);
-}
-
-
-/*!
- * @brief 最近表示されたメッセージを再表示するコマンドのメインルーチン
- * Recall the most recent message
- * @return なし
- */
-void do_cmd_message_one(void)
-{
- prt(format("> %s", message_str(0)), 0, 0);
-}
-
-
-/*!
- * @brief メッセージのログを表示するコマンドのメインルーチン
- * Recall the most recent message
- * @return なし
- * @details
- * <pre>
- * Show previous messages to the user -BEN-
- *
- * The screen format uses line 0 and 23 for headers and prompts,
- * skips line 1 and 22, and uses line 2 thru 21 for old messages.
- *
- * This command shows you which commands you are viewing, and allows
- * you to "search" for strings in the recall.
- *
- * Note that messages may be longer than 80 characters, but they are
- * displayed using "infinite" length, with a special sub-command to
- * "slide" the virtual display to the left or right.
- *
- * Attempt to only hilite the matching portions of the string.
- * </pre>
- */
-void do_cmd_messages(int num_now)
-{
- char shower_str[81];
- char finder_str[81];
- char back_str[81];
- concptr shower = NULL;
- int wid, hgt;
- Term_get_size(&wid, &hgt);
- int num_lines = hgt - 4;
- strcpy(finder_str, "");
- strcpy(shower_str, "");
- int n = message_num();
- int i = 0;
- screen_save();
- Term_clear();
- while (TRUE)
- {
- int j;
- int skey;
- for (j = 0; (j < num_lines) && (i + j < n); j++)
- {
- concptr msg = message_str(i + j);
- c_prt((i + j < num_now ? TERM_WHITE : TERM_SLATE), msg, num_lines + 1 - j, 0);
- if (!shower || !shower[0]) continue;
-
- concptr str = msg;
- while ((str = my_strstr(str, shower)) != NULL)
- {
- int len = strlen(shower);
- Term_putstr(str - msg, num_lines + 1 - j, len, TERM_YELLOW, shower);
- str += len;
- }
- }
-
- for (; j < num_lines; j++)
- Term_erase(0, num_lines + 1 - j, 255);
-
- prt(format(_("以前のメッセージ %d-%d 全部で(%d)", "Message Recall (%d-%d of %d)"),
- i, i + j - 1, n), 0, 0);
- prt(_("[ 'p' で更に古いもの, 'n' で更に新しいもの, '/' で検索, ESC で中断 ]",
- "[Press 'p' for older, 'n' for newer, ..., or ESCAPE]"), hgt - 1, 0);
- skey = inkey_special(TRUE);
- if (skey == ESCAPE) break;
-
- j = i;
- switch (skey)
- {
- case '=':
- prt(_("強調: ", "Show: "), hgt - 1, 0);
- strcpy(back_str, shower_str);
- if (askfor(shower_str, 80))
- shower = shower_str[0] ? shower_str : NULL;
- else
- strcpy(shower_str, back_str);
-
- continue;
- case '/':
- case KTRL('s'):
- {
- prt(_("検索: ", "Find: "), hgt - 1, 0);
- strcpy(back_str, finder_str);
- if (!askfor(finder_str, 80))
- {
- strcpy(finder_str, back_str);
- continue;
- }
- else if (!finder_str[0])
- {
- shower = NULL;
- continue;
- }
-
- shower = finder_str;
- for (int z = i + 1; z < n; z++)
- {
- concptr msg = message_str(z);
- if (my_strstr(msg, finder_str))
- {
- i = z;
- break;
- }
- }
- }
-
- break;
-
- case SKEY_TOP:
- i = n - num_lines;
- break;
- case SKEY_BOTTOM:
- i = 0;
- break;
- case '8':
- case SKEY_UP:
- case '\n':
- case '\r':
- i = MIN(i + 1, n - num_lines);
- break;
- case '+':
- i = MIN(i + 10, n - num_lines);
- break;
- case 'p':
- case KTRL('P'):
- case ' ':
- case SKEY_PGUP:
- i = MIN(i + num_lines, n - num_lines);
- break;
- case 'n':
- case KTRL('N'):
- case SKEY_PGDOWN:
- i = MAX(0, i - num_lines);
- break;
- case '-':
- i = MAX(0, i - 10);
- break;
- case '2':
- case SKEY_DOWN:
- i = MAX(0, i - 1);
- break;
- }
-
- if (i == j) bell();
- }
-
- screen_load();
-}
-
-
-/*!
* @brief prefファイルを選択して処理する /
* Ask for a "user pref line" and process it
* @param creature_ptr プレーヤーへの参照ポインタ
#pragma once
-extern void do_cmd_redraw(player_type *creature_ptr);
-extern void do_cmd_player_status(player_type *creature_ptr);
-extern void do_cmd_message_one(void);
-extern void do_cmd_messages(int num_now);
extern void do_cmd_pref(player_type *creature_ptr);
extern void do_cmd_reload_autopick(player_type *creature_ptr);
extern void do_cmd_visuals(player_type *creature_ptr);
#include "io/write-diary.h"
#include "cmd/cmd-activate.h"
#include "cmd/cmd-diary.h"
+#include "cmd/cmd-draw.h"
#include "cmd/cmd-dump.h"
#include "cmd/cmd-eat.h"
#include "cmd/cmd-help.h"
#include "io/write-diary.h"
#include "cmd/cmd-basic.h"
#include "cmd/cmd-diary.h"
+#include "cmd/cmd-draw.h"
#include "cmd/cmd-dump.h"
#include "cmd/cmd-help.h"
#include "cmd/cmd-item.h"
OSDN Git Service
