OSDN Git Service
(root)
/
hengbandforosx
/
hengbandosx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Refactor] enum spells-typeをenum class AttributeTypeに置換
[hengbandforosx/hengbandosx.git]
/
src
/
cmd-action
/
cmd-attack.cpp
diff --git
a/src/cmd-action/cmd-attack.cpp
b/src/cmd-action/cmd-attack.cpp
index
db5525c
..
45cc627
100644
(file)
--- a/
src/cmd-action/cmd-attack.cpp
+++ b/
src/cmd-action/cmd-attack.cpp
@@
-44,7
+44,7
@@
#include "player/player-status-flags.h"
#include "player/player-status.h"
#include "player/special-defense-types.h"
#include "player/player-status-flags.h"
#include "player/player-status.h"
#include "player/special-defense-types.h"
-#include "
spell/spell
-types.h"
+#include "
effect/attribute
-types.h"
#include "status/action-setter.h"
#include "system/floor-type-definition.h"
#include "system/grid-type-definition.h"
#include "status/action-setter.h"
#include "system/floor-type-definition.h"
#include "system/grid-type-definition.h"
@@
-141,7
+141,7
@@
static void natural_attack(player_type *player_ptr, MONSTER_IDX m_idx, MUTA atta
switch (attack) {
case MUTA::SCOR_TAIL:
switch (attack) {
case MUTA::SCOR_TAIL:
- project(player_ptr, 0, 0, m_ptr->fy, m_ptr->fx, k,
GF_
POIS, PROJECT_KILL);
+ project(player_ptr, 0, 0, m_ptr->fy, m_ptr->fx, k,
AttributeType::
POIS, PROJECT_KILL);
*mdeath = (m_ptr->r_idx == 0);
break;
case MUTA::HORNS:
*mdeath = (m_ptr->r_idx == 0);
break;
case MUTA::HORNS:
@@
-149,7
+149,7
@@
static void natural_attack(player_type *player_ptr, MONSTER_IDX m_idx, MUTA atta
case MUTA::TRUNK:
case MUTA::TENTACLES:
default: {
case MUTA::TRUNK:
case MUTA::TENTACLES:
default: {
- MonsterDamageProcessor mdp(player_ptr, m_idx, k, fear,
GF_
ATTACK);
+ MonsterDamageProcessor mdp(player_ptr, m_idx, k, fear,
AttributeType::
ATTACK);
*mdeath = mdp.mon_take_hit(nullptr);
break;
}
*mdeath = mdp.mon_take_hit(nullptr);
break;
}