OSDN Git Service
(root)
/
hengbandforosx
/
hengbandosx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
158a5a4
02933b3
)
Merge pull request #917 from Hourier/feature/Separate-Player-Type-Definition
author
Hourier
<66951241+Hourier@users.noreply.github.com>
Mon, 26 Apr 2021 11:27:20 +0000
(20:27 +0900)
committer
GitHub
<noreply@github.com>
Mon, 26 Apr 2021 11:27:20 +0000
(20:27 +0900)
確認ありがとうございました
インクルード関係の掃除はまだまだ足りない部分もありますが、それは今後の課題にしていきたいと思います
1
2
src/cmd-action/cmd-spell.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/cmd-action/cmd-spell.h
patch
|
diff1
|
diff2
|
blob
|
history
src/io/input-key-processor.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/monster-floor/special-death-switcher.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/mspell/mspell-summon.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/mspell/specified-summon.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/mspell/specified-summon.h
patch
|
diff1
|
diff2
|
blob
|
history
src/racial/racial-switcher.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/cmd-action/cmd-spell.cpp
Simple merge
diff --cc
src/cmd-action/cmd-spell.h
index
9caacd3
,
b84fb2c
..
ad4dd2d
---
1
/
src/cmd-action/cmd-spell.h
---
2
/
src/cmd-action/cmd-spell.h
+++ b/
src/cmd-action/cmd-spell.h
@@@
-26,6
-26,7
+26,7
@@@
concptr info_power_dice(DICE_NUMBER dic
concptr info_radius(POSITION rad);
concptr info_weight(WEIGHT weight);
+ typedef struct player_type player_type;
void do_cmd_browse(player_type *caster_ptr);
void do_cmd_study(player_type *caster_ptr);
-
void
do_cmd_cast(player_type *caster_ptr);
+
bool
do_cmd_cast(player_type *caster_ptr);
diff --cc
src/io/input-key-processor.cpp
Simple merge
diff --cc
src/monster-floor/special-death-switcher.cpp
Simple merge
diff --cc
src/mspell/mspell-summon.cpp
Simple merge
diff --cc
src/mspell/specified-summon.cpp
Simple merge
diff --cc
src/mspell/specified-summon.h
Simple merge
diff --cc
src/racial/racial-switcher.cpp
Simple merge