Merge branch 'For2.2.2-Refactoring' of git.osdn.net:/gitroot/hengband/hengband into...

# Conflicts:
#	src/bldg.c

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++)