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] #38862 Moved object*.c/h to object/
[hengband/hengband.git]
/
src
/
spells-object.c
diff --git
a/src/spells-object.c
b/src/spells-object.c
index
e318961
..
68dbaf3
100644
(file)
--- a/
src/spells-object.c
+++ b/
src/spells-object.c
@@
-4,24
+4,24
@@
#include "cmd-basic.h"
#include "artifact.h"
#include "cmd-basic.h"
#include "artifact.h"
-#include "floor.h"
+#include "floor
/floor
.h"
#include "grid.h"
#include "grid.h"
-#include "spell
s
.h"
+#include "spell
/spells3
.h"
#include "spells-object.h"
#include "spells-object.h"
-#include "object-boost.h"
-#include "object-hook.h"
-#include "object-flavor.h"
-#include "object-ego.h"
+#include "object
/object
-boost.h"
+#include "object
/object
-hook.h"
+#include "object
/object
-flavor.h"
+#include "object
/object
-ego.h"
#include "player-damage.h"
#include "player-status.h"
#include "avatar.h"
#include "player-effects.h"
#include "player-class.h"
#include "player-inventory.h"
#include "player-damage.h"
#include "player-status.h"
#include "avatar.h"
#include "player-effects.h"
#include "player-class.h"
#include "player-inventory.h"
-#include "objectkind.h"
-#include "autopick.h"
+#include "object
/object-
kind.h"
+#include "autopick
/autopick
.h"
#include "targeting.h"
#include "targeting.h"
-#include "view
-main
window.h"
+#include "view
/display-main-
window.h"
typedef struct
typedef struct
@@
-74,7
+74,7
@@
static amuse_type amuse_info[] =
{ TV_SWORD, SV_BROKEN_SWORD, 5, AMS_NOTHING },
{ TV_SCROLL, SV_SCROLL_AMUSEMENT, 10, AMS_NOTHING },
{ TV_SWORD, SV_BROKEN_SWORD, 5, AMS_NOTHING },
{ TV_SCROLL, SV_SCROLL_AMUSEMENT, 10, AMS_NOTHING },
- { 0, 0, 0 }
+ { 0, 0, 0
, 0
}
};
/*!
};
/*!
@@
-135,14
+135,14
@@
bool create_ammo(player_type *creature_ptr)
DIRECTION dir;
grid_type *g_ptr;
DIRECTION dir;
grid_type *g_ptr;
- if (!get_rep_dir(&dir, FALSE)) return FALSE;
+ if (!get_rep_dir(
creature_ptr,
&dir, FALSE)) return FALSE;
y = creature_ptr->y + ddy[dir];
x = creature_ptr->x + ddx[dir];
g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x];
if (!have_flag(f_info[get_feat_mimic(g_ptr)].flags, FF_CAN_DIG))
{
y = creature_ptr->y + ddy[dir];
x = creature_ptr->x + ddx[dir];
g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x];
if (!have_flag(f_info[get_feat_mimic(g_ptr)].flags, FF_CAN_DIG))
{
- msg_print(_("そこには岩石がない。", "You need pile of rubble."));
+ msg_print(_("そこには岩石がない。", "You need
a
pile of rubble."));
return FALSE;
}
return FALSE;
}
@@
-165,7
+165,7
@@
bool create_ammo(player_type *creature_ptr)
slot = inven_carry(creature_ptr, q_ptr);
slot = inven_carry(creature_ptr, q_ptr);
- object_desc(o_name, q_ptr, 0);
+ object_desc(
creature_ptr,
o_name, q_ptr, 0);
msg_format(_("%sを作った。", "You make some ammo."), o_name);
/* Auto-inscription */
msg_format(_("%sを作った。", "You make some ammo."), o_name);
/* Auto-inscription */
@@
-203,7
+203,7
@@
bool create_ammo(player_type *creature_ptr)
q_ptr->discount = 99;
q_ptr->discount = 99;
- object_desc(o_name, q_ptr, 0);
+ object_desc(
creature_ptr,
o_name, q_ptr, 0);
msg_format(_("%sを作った。", "You make some ammo."), o_name);
vary_item(creature_ptr, item, -1);
msg_format(_("%sを作った。", "You make some ammo."), o_name);
vary_item(creature_ptr, item, -1);
@@
-240,7
+240,7
@@
bool create_ammo(player_type *creature_ptr)
q_ptr->discount = 99;
q_ptr->discount = 99;
- object_desc(o_name, q_ptr, 0);
+ object_desc(
creature_ptr,
o_name, q_ptr, 0);
msg_format(_("%sを作った。", "You make some ammo."), o_name);
vary_item(creature_ptr, item, -1);
msg_format(_("%sを作った。", "You make some ammo."), o_name);
vary_item(creature_ptr, item, -1);
@@
-326,7
+326,7
@@
bool import_magic_device(player_type *user_ptr)
}
GAME_TEXT o_name[MAX_NLEN];
}
GAME_TEXT o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, 0);
+ object_desc(
user_ptr,
o_name, o_ptr, 0);
msg_format(_("%sの魔力を取り込んだ。", "You absorb magic of %s."), o_name);
vary_item(user_ptr, item, -999);
msg_format(_("%sの魔力を取り込んだ。", "You absorb magic of %s."), o_name);
vary_item(user_ptr, item, -999);
@@
-577,7
+577,7
@@
bool curse_armor(player_type *owner_ptr)
if (!o_ptr->k_idx) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
if (!o_ptr->k_idx) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
+ object_desc(o
wner_ptr, o
_name, o_ptr, OD_OMIT_PREFIX);
/* Attempt a saving throw for artifacts */
if (object_is_artifact(o_ptr) && (randint0(100) < 50))
/* Attempt a saving throw for artifacts */
if (object_is_artifact(o_ptr) && (randint0(100) < 50))
@@
-635,7
+635,7
@@
bool curse_weapon_object(player_type *owner_ptr, bool force, object_type *o_ptr)
if (!o_ptr->k_idx) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
if (!o_ptr->k_idx) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
+ object_desc(o
wner_ptr, o
_name, o_ptr, OD_OMIT_PREFIX);
/* Attempt a saving throw */
if (object_is_artifact(o_ptr) && (randint0(100) < 50) && !force)
/* Attempt a saving throw */
if (object_is_artifact(o_ptr) && (randint0(100) < 50) && !force)
@@
-697,7
+697,7
@@
bool rustproof(player_type *caster_ptr)
if (!o_ptr) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
if (!o_ptr) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+ object_desc(
caster_ptr,
o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
add_flag(o_ptr->art_flags, TR_IGNORE_ACID);
add_flag(o_ptr->art_flags, TR_IGNORE_ACID);
@@
-764,7
+764,7
@@
void brand_bolts(player_type *caster_ptr)
bool perilous_secrets(player_type *user_ptr)
{
bool perilous_secrets(player_type *user_ptr)
{
- if (!ident_spell(user_ptr, FALSE)) return FALSE;
+ if (!ident_spell(user_ptr, FALSE
, 0
)) return FALSE;
if (mp_ptr->spell_book)
{
if (mp_ptr->spell_book)
{
@@
-906,7
+906,7
@@
bool bless_weapon(player_type *caster_ptr)
if (!o_ptr) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
if (!o_ptr) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+ object_desc(
caster_ptr,
o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
BIT_FLAGS flgs[TR_FLAG_SIZE];
object_flags(o_ptr, flgs);
BIT_FLAGS flgs[TR_FLAG_SIZE];
object_flags(o_ptr, flgs);
@@
-1038,19
+1038,16
@@
bool bless_weapon(player_type *caster_ptr)
*/
bool pulish_shield(player_type *caster_ptr)
{
*/
bool pulish_shield(player_type *caster_ptr)
{
- /* Assume enchant weapon */
- item_tester_tval = TV_SHIELD;
-
concptr q = _("どの盾を磨きますか?", "Pulish which weapon? ");
concptr s = _("磨く盾がありません。", "You have weapon to pulish.");
OBJECT_IDX item;
object_type *o_ptr;
concptr q = _("どの盾を磨きますか?", "Pulish which weapon? ");
concptr s = _("磨く盾がありません。", "You have weapon to pulish.");
OBJECT_IDX item;
object_type *o_ptr;
- o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT),
0
);
+ o_ptr = choose_object(caster_ptr, &item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR | IGNORE_BOTHHAND_SLOT),
TV_SHIELD
);
if (!o_ptr) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
if (!o_ptr) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+ object_desc(
caster_ptr,
o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
BIT_FLAGS flgs[TR_FLAG_SIZE];
object_flags(o_ptr, flgs);
BIT_FLAGS flgs[TR_FLAG_SIZE];
object_flags(o_ptr, flgs);
@@
-1251,7
+1248,7
@@
bool enchant_spell(player_type *caster_ptr, HIT_PROB num_hit, HIT_POINT num_dam,
if (!o_ptr) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
if (!o_ptr) return FALSE;
GAME_TEXT o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+ object_desc(
caster_ptr,
o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
msg_format("%s は明るく輝いた!", o_name);
#else
#ifdef JP
msg_format("%s は明るく輝いた!", o_name);
#else
@@
-1317,7
+1314,7
@@
void brand_weapon(player_type *caster_ptr, int brand_type)
/* Let's get the name before it is changed... */
GAME_TEXT o_name[MAX_NLEN];
/* Let's get the name before it is changed... */
GAME_TEXT o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+ object_desc(
caster_ptr,
o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
concptr act = NULL;
switch (brand_type)
concptr act = NULL;
switch (brand_type)