OSDN Git Service
(root)
/
hengbandforosx
/
hengbandosx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
88459a3
610be37
)
Merge branch 'For2.2.2-Refactoring' of git.osdn.net:/gitroot/hengband/hengband into...
author
deskull
<deskull@users.sourceforge.jp>
Tue, 5 Nov 2019 16:07:16 +0000
(
01:07
+0900)
committer
deskull
<deskull@users.sourceforge.jp>
Tue, 5 Nov 2019 16:07:16 +0000
(
01:07
+0900)
# Conflicts:
# src/bldg.c
1
2
src/bldg.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/bldg.c
index
1d44aa2
,
69fb849
..
b2e4cb7
---
1
/
src/bldg.c
---
2
/
src/bldg.c
+++ b/
src/bldg.c
@@@
-1530,7
-1530,8
+1530,6
@@@
void update_gambling_monsters(void
power[i] = power[i] * 9 / 10;
if (r_ptr->flagsr & RFR_RES_ALL) power[i] *= 100000;
if (r_ptr->arena_ratio) power[i] = power[i] * r_ptr->arena_ratio / 100;
--
- if (power[i] <= 0) break;
total += power[i];
}
for (i = 0; i < 4; i++)