The master and develop branches track hengband.
OS X development happens on the macos-1-6-2, macos-2-2-1, and macos-develop branches.
| Revision | 5527fcd5af093047b6fe0fefc7b96f80a9633976 (tree) |
|---|---|
| Time | 2021-01-22 01:44:23 |
| Author | Eric Branlund <ebranlund@fast...> |
| Commiter | Eric Branlund |
Merge branch 'develop' into develop-cocoa
src/player/player-status-flags.c (diff) src/spell-kind/earthquake.c (diff)| @@ -1352,7 +1352,7 @@ BIT_FLAGS has_resist_shard(player_type *creature_ptr) | ||
| 1352 | 1352 | { |
| 1353 | 1353 | BIT_FLAGS result = 0L; |
| 1354 | 1354 | |
| 1355 | - if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_HALF_TITAN || creature_ptr->prace == RACE_SKELETON)) | |
| 1355 | + if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_HALF_GIANT || creature_ptr->prace == RACE_SKELETON)) | |
| 1356 | 1356 | result |= 0x01 << FLAG_CAUSE_RACE; |
| 1357 | 1357 | |
| 1358 | 1358 | if (creature_ptr->special_defense & KATA_MUSOU) { |
| @@ -1729,4 +1729,3 @@ BIT_FLAGS player_aggravate_state(player_type *creature_ptr) | ||
| 1729 | 1729 | } |
| 1730 | 1730 | |
| 1731 | 1731 | bool has_aggravate(player_type *creature_ptr) { return player_aggravate_state(creature_ptr) == AGGRAVATE_NORMAL; } |
| 1732 | - |
| @@ -265,7 +265,7 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M | ||
| 265 | 265 | floor_ptr->grid_array[sy][sx].m_idx = m_idx_aux; |
| 266 | 266 | m_ptr->fy = sy; |
| 267 | 267 | m_ptr->fx = sx; |
| 268 | - update_monster(caster_ptr, m_idx, TRUE); | |
| 268 | + update_monster(caster_ptr, m_idx_aux, TRUE); | |
| 269 | 269 | lite_spot(caster_ptr, yy, xx); |
| 270 | 270 | lite_spot(caster_ptr, sy, sx); |
| 271 | 271 | } |
Fork