• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revisiondfc774894f80def974a40bd280016483a772bebd (tree)
Time2019-05-15 00:01:13
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 target_who, target_col, target_row を targeting.c/h へ移動.

Change Summary

Incremental Difference

--- a/src/externs.h
+++ b/src/externs.h
@@ -78,9 +78,6 @@ extern bool reset_concent;
7878 extern POSITION panel_row_min, panel_row_max;
7979 extern POSITION panel_col_min, panel_col_max;
8080 extern POSITION panel_col_prt, panel_row_prt;
81-extern MONSTER_IDX target_who;
82-extern POSITION target_col;
83-extern POSITION target_row;
8481 extern int player_uid;
8582 extern int player_euid;
8683 extern int player_egid;
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -36,6 +36,7 @@
3636 #include "world.h"
3737 #include "monsterrace.h"
3838 #include "creature.h"
39+#include "targeting.h"
3940
4041 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する? */
4142 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する? */
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -232,7 +232,12 @@ bool target_able(MONSTER_IDX m_idx)
232232 }
233233
234234
235-
235+/*
236+ * Targetting variables
237+ */
238+MONSTER_IDX target_who;
239+POSITION target_col;
240+POSITION target_row;
236241
237242 /*
238243 * Update (if necessary) and verify (if possible) the target.
--- a/src/targeting.h
+++ b/src/targeting.h
@@ -1,5 +1,9 @@
11 #pragma once
22
3+extern MONSTER_IDX target_who;
4+extern POSITION target_col;
5+extern POSITION target_row;
6+
37 /* xtra2.c */
48 extern void panel_bounds_center(void);
59 extern void verify_panel(void);
--- a/src/variable.c
+++ b/src/variable.c
@@ -58,14 +58,6 @@ POSITION panel_col_prt, panel_row_prt;
5858
5959
6060 /*
61- * Targetting variables
62- */
63-MONSTER_IDX target_who;
64-POSITION target_col;
65-POSITION target_row;
66-
67-
68-/*
6961 * User info
7062 */
7163 int player_uid;
Show on old repository browser