OSDN Git Service
(root)
/
hengband
/
hengband.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Refactor] #37353 PROJECT_* 定義を新規ファイル projection.h へ移動。 / Move PROJECT_* definition...
[hengband/hengband.git]
/
src
/
cmd2.c
diff --git
a/src/cmd2.c
b/src/cmd2.c
index
d906d5b
..
cd434a8
100644
(file)
--- a/
src/cmd2.c
+++ b/
src/cmd2.c
@@
-12,8
+12,10
@@
#include "angband.h"
#include "chest.h"
#include "angband.h"
#include "chest.h"
+#include "floor.h"
#include "melee.h"
#include "object-hook.h"
#include "melee.h"
#include "object-hook.h"
+#include "projection.h"
/*!
* @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理
/*!
* @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理
@@
-1014,7
+1016,7
@@
static bool do_cmd_tunnel_aux(POSITION y, POSITION x)
cave_type *c_ptr;
feature_type *f_ptr, *mimic_f_ptr;
int power;
cave_type *c_ptr;
feature_type *f_ptr, *mimic_f_ptr;
int power;
- cptr name;
+ c
onc
ptr name;
bool more = FALSE;
/* Verify legality */
bool more = FALSE;
/* Verify legality */
@@
-1406,7
+1408,7
@@
bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir)
feature_type *f_ptr = &f_info[c_ptr->feat];
/* Access trap name */
feature_type *f_ptr = &f_info[c_ptr->feat];
/* Access trap name */
- cptr name = (f_name + f_ptr->name);
+ c
onc
ptr name = (f_name + f_ptr->name);
/* Extract trap "power" */
int power = f_ptr->power;
/* Extract trap "power" */
int power = f_ptr->power;
@@
-1597,7
+1599,7
@@
static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir)
bool more = FALSE;
bool more = FALSE;
- cptr name = f_name + f_info[get_feat_mimic(c_ptr)].name;
+ c
onc
ptr name = f_name + f_info[get_feat_mimic(c_ptr)].name;
p_ptr->energy_use = 100;
p_ptr->energy_use = 100;
@@
-2117,7
+2119,7
@@
void do_cmd_rest(void)
/* Prompt for time if needed */
if (command_arg <= 0)
{
/* Prompt for time if needed */
if (command_arg <= 0)
{
- cptr p = _("休憩 (0-9999, '*' で HP/MP全快, '&' で必要なだけ): ",
+ c
onc
ptr p = _("休憩 (0-9999, '*' で HP/MP全快, '&' で必要なだけ): ",
"Rest (0-9999, '*' for HP/SP, '&' as needed): ");
"Rest (0-9999, '*' for HP/SP, '&' as needed): ");
@@
-2258,8
+2260,6
@@
static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
monster_race *r_ptr = &r_info[m_ptr->r_idx];
BIT_FLAGS flgs[TR_FLAG_SIZE];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
BIT_FLAGS flgs[TR_FLAG_SIZE];
-
- /* Extract the flags */
object_flags(o_ptr, flgs);
/* Some "weapons" and "ammo" do extra damage */
object_flags(o_ptr, flgs);
/* Some "weapons" and "ammo" do extra damage */
@@
-2919,10
+2919,7
@@
void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
if (m_ptr->ml)
{
if (m_ptr->ml)
{
- /* Hack -- Track this monster race */
if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
-
- /* Hack -- Track this monster */
health_track(c_mon_ptr->m_idx);
}
}
health_track(c_mon_ptr->m_idx);
}
}
@@
-3137,7
+3134,7
@@
void do_cmd_fire(void)
{
OBJECT_IDX item;
object_type *j_ptr, *ammo_ptr;
{
OBJECT_IDX item;
object_type *j_ptr, *ammo_ptr;
- cptr q, s;
+ c
onc
ptr q, s;
if(p_ptr->wild_mode) return;
if(p_ptr->wild_mode) return;
@@
-3249,7
+3246,7
@@
bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
int msec = delay_factor * delay_factor * delay_factor;
BIT_FLAGS flgs[TR_FLAG_SIZE];
int msec = delay_factor * delay_factor * delay_factor;
BIT_FLAGS flgs[TR_FLAG_SIZE];
- cptr q, s;
+ c
onc
ptr q, s;
bool come_back = FALSE;
bool do_drop = TRUE;
bool come_back = FALSE;
bool do_drop = TRUE;
@@
-3263,6
+3260,7
@@
bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
if (shuriken >= 0)
{
item = shuriken;
if (shuriken >= 0)
{
item = shuriken;
+ o_ptr = &inventory[item];
}
else if (boomerang)
{
}
else if (boomerang)
{
@@
-3278,8
+3276,16
@@
bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
return FALSE;
}
}
return FALSE;
}
}
- else if (buki_motteruka(INVEN_LARM)) item = INVEN_LARM;
- else item = INVEN_RARM;
+ else if (buki_motteruka(INVEN_LARM))
+ {
+ item = INVEN_LARM;
+ o_ptr = &inventory[item];
+ }
+ else
+ {
+ item = INVEN_RARM;
+ o_ptr = &inventory[item];
+ }
}
else
{
}
else
{
@@
-3443,8
+3449,8
@@
bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
/* The player can see the (on screen) missile */
if (panel_contains(ny[cur_dis], nx[cur_dis]) && player_can_see_bold(ny[cur_dis], nx[cur_dis]))
{
/* The player can see the (on screen) missile */
if (panel_contains(ny[cur_dis], nx[cur_dis]) && player_can_see_bold(ny[cur_dis], nx[cur_dis]))
{
-
char
c = object_char(q_ptr);
-
byte
a = object_attr(q_ptr);
+
SYMBOL_CODE
c = object_char(q_ptr);
+
TERM_COLOR
a = object_attr(q_ptr);
/* Draw, Hilite, Fresh, Pause, Erase */
print_rel(c, a, ny[cur_dis], nx[cur_dis]);
/* Draw, Hilite, Fresh, Pause, Erase */
print_rel(c, a, ny[cur_dis], nx[cur_dis]);
@@
-3506,10
+3512,7
@@
bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
if (m_ptr->ml)
{
if (m_ptr->ml)
{
- /* Hack -- Track this monster race */
if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
-
- /* Hack -- Track this monster */
health_track(c_ptr->m_idx);
}
}
health_track(c_ptr->m_idx);
}
}
@@
-3703,7
+3706,6
@@
bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
/* Wear the new stuff */
object_copy(o_ptr, q_ptr);
/* Wear the new stuff */
object_copy(o_ptr, q_ptr);
- /* Increase the weight */
p_ptr->total_weight += q_ptr->weight;
/* Increment the equip counter by hand */
p_ptr->total_weight += q_ptr->weight;
/* Increment the equip counter by hand */