some reformatting (2 of 4)

This commit is contained in:
PatR
2024-09-05 14:51:21 -07:00
parent 50412ba53b
commit aa043f0ddf
17 changed files with 253 additions and 179 deletions

View File

@@ -1201,7 +1201,8 @@ dodown(void)
return ECMD_TIME;
} else if (!trap || !is_hole(trap->ttyp)
|| !Can_fall_thru(&u.uz) || !trap->tseen) {
if (flags.autodig && !svc.context.nopick && uwep && is_pick(uwep)) {
if (flags.autodig && !svc.context.nopick
&& uwep && is_pick(uwep)) {
return use_pick_axe2(uwep);
} else {
You_cant("go down here%s.",
@@ -1532,7 +1533,7 @@ goto_level(
that drops faster, on average, when being sent down farther so
while the impact is reduced for everybody compared to earlier
versions, it is reduced least for chaotics, most for lawfuls */
svc.context.mysteryforce += rn2(diff + 2); /* L:0-4, N:0-3, C:0-2 */
svc.context.mysteryforce += rn2(diff + 2); /* L:0-4,N:0-3,C:0-2 */
if (on_level(newlevel, &u.uz)) {
(void) safe_teleds(TELEDS_NO_FLAGS);
@@ -1989,7 +1990,8 @@ temperature_change_msg(schar prev_temperature)
void
maybe_lvltport_feedback(void)
{
if (gd.dfr_post_msg && !strncmpi(gd.dfr_post_msg, "You materialize", 15)) {
if (gd.dfr_post_msg
&& !strncmpi(gd.dfr_post_msg, "You materialize", 15)) {
/* "You materialize on a different level." */
pline("%s", gd.dfr_post_msg);
free((genericptr_t) gd.dfr_post_msg), gd.dfr_post_msg = 0;
@@ -2011,8 +2013,10 @@ final_level(void)
/* change levels at the end of this turn, after monsters finish moving */
void
schedule_goto(d_level *tolev, int utotype_flags,
const char *pre_msg, const char *post_msg)
schedule_goto(
d_level *tolev,
int utotype_flags,
const char *pre_msg, const char *post_msg)
{
/* UTOTYPE_DEFERRED is used, so UTOTYPE_NONE can trigger deferred_goto() */
u.utotype = utotype_flags | UTOTYPE_DEFERRED;
@@ -2096,9 +2100,9 @@ revive_corpse(struct obj *corpse)
struct monst *mtmp2;
container = corpse->ocontainer;
mtmp2 = get_container_location(container, &container_where, (int *) 0);
/* container_where is the outermost container's location even if
* nested */
mtmp2 = get_container_location(container, &container_where,
(int *) 0);
/* container_where is outermost container's location even if nested */
if (container_where == OBJ_MINVENT && mtmp2)
mcarry = mtmp2;
}