OSDN Git Service
(root)
/
hengbandforosx
/
hengbandosx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e714b5b
2952638
)
Merge remote-tracking branch 'remotes/origin/feature/Refactoring-Hourier' into For2...
author
deskull
<deskull@users.sourceforge.jp>
Sun, 12 Jan 2020 11:53:01 +0000
(20:53 +0900)
committer
deskull
<deskull@users.sourceforge.jp>
Sun, 12 Jan 2020 11:53:01 +0000
(20:53 +0900)
19 files changed:
1
2
src/cmd/cmd-basic.c
patch
|
diff1
|
diff2
|
blob
|
history
src/cmd/cmd-dump.c
patch
|
diff1
|
diff2
|
blob
|
history
src/cmd/cmd-gameoption.c
patch
|
diff1
|
diff2
|
blob
|
history
src/combat/melee1.c
patch
|
diff1
|
diff2
|
blob
|
history
src/combat/shoot.c
patch
|
diff1
|
diff2
|
blob
|
history
src/core.c
patch
|
diff1
|
diff2
|
blob
|
history
src/floor-generate.c
patch
|
diff1
|
diff2
|
blob
|
history
src/floor-save.c
patch
|
diff1
|
diff2
|
blob
|
history
src/load.c
patch
|
diff1
|
diff2
|
blob
|
history
src/mind.c
patch
|
diff1
|
diff2
|
blob
|
history
src/monster-process.c
patch
|
diff1
|
diff2
|
blob
|
history
src/player-damage.c
patch
|
diff1
|
diff2
|
blob
|
history
src/save.c
patch
|
diff1
|
diff2
|
blob
|
history
src/spells-object.c
patch
|
diff1
|
diff2
|
blob
|
history
src/spells-summon.c
patch
|
diff1
|
diff2
|
blob
|
history
src/spells1.c
patch
|
diff1
|
diff2
|
blob
|
history
src/spells2.c
patch
|
diff1
|
diff2
|
blob
|
history
src/targeting.c
patch
|
diff1
|
diff2
|
blob
|
history
src/util.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/cmd/cmd-basic.c
Simple merge
diff --cc
src/cmd/cmd-dump.c
Simple merge
diff --cc
src/cmd/cmd-gameoption.c
Simple merge
diff --cc
src/combat/melee1.c
Simple merge
diff --cc
src/combat/shoot.c
Simple merge
diff --cc
src/core.c
Simple merge
diff --cc
src/floor-generate.c
Simple merge
diff --cc
src/floor-save.c
Simple merge
diff --cc
src/load.c
Simple merge
diff --cc
src/mind.c
Simple merge
diff --cc
src/monster-process.c
Simple merge
diff --cc
src/player-damage.c
index
8a28853
,
a896c29
..
ef0fc8a
---
1
/
src/player-damage.c
---
2
/
src/player-damage.c
+++ b/
src/player-damage.c
@@@
-149,8
-149,8
+149,8
@@@
static bool acid_minus_ac(player_type *
/* No damage left to be done */
if (o_ptr->ac + o_ptr->to_a <= 0)
{
- msg_format(_("%sは既にボロボロだ!", "
Your %s is already crumble
!"), o_name);
+ msg_format(_("%sは既にボロボロだ!", "
is already fully corroded
!"), o_name);
- return
(FALSE)
;
+ return
FALSE
;
}
/* Object resists */
diff --cc
src/save.c
Simple merge
diff --cc
src/spells-object.c
Simple merge
diff --cc
src/spells-summon.c
Simple merge
diff --cc
src/spells1.c
Simple merge
diff --cc
src/spells2.c
Simple merge
diff --cc
src/targeting.c
Simple merge
diff --cc
src/util.c
Simple merge