From: nhmall Date: Mon, 30 May 2022 16:09:35 +0000 (-0400) Subject: replace leading tabs in several files X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8f0e91ddfed2a80a45f4d6b236937a6e7948c55;p=nethack replace leading tabs in several files --- diff --git a/src/cmd.c b/src/cmd.c index b74e3a348..068bcba55 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1245,7 +1245,7 @@ wiz_load_lua(void) { if (wizard) { char buf[BUFSZ]; - nhl_sandbox_info sbi = {NHL_SB_SAFE, 0, 0, 0}; + nhl_sandbox_info sbi = {NHL_SB_SAFE, 0, 0, 0}; buf[0] = '\0'; getlin("Load which lua file?", buf); diff --git a/src/end.c b/src/end.c index a79dfa674..124451d82 100644 --- a/src/end.c +++ b/src/end.c @@ -1871,7 +1871,7 @@ save_killers(NHFILE *nhfp) if (perform_bwrite(nhfp)) { for (kptr = &g.killer; kptr != (struct kinfo *) 0; kptr = kptr->next) { if (nhfp->structlevel) - bwrite(nhfp->fd, (genericptr_t)kptr, sizeof(struct kinfo)); + bwrite(nhfp->fd, (genericptr_t)kptr, sizeof(struct kinfo)); } } if (release_data(nhfp)) { @@ -1890,7 +1890,7 @@ restore_killers(NHFILE *nhfp) for (kptr = &g.killer; kptr != (struct kinfo *) 0; kptr = kptr->next) { if (nhfp->structlevel) - mread(nhfp->fd, (genericptr_t)kptr, sizeof(struct kinfo)); + mread(nhfp->fd, (genericptr_t)kptr, sizeof(struct kinfo)); if (kptr->next) { kptr->next = (struct kinfo *) alloc(sizeof (struct kinfo)); } diff --git a/src/explode.c b/src/explode.c index de8bb3f90..a2443706f 100644 --- a/src/explode.c +++ b/src/explode.c @@ -560,9 +560,9 @@ explode( g.context.botl = 1; } - /* You resisted the damage, lets not keep that to ourselves */ - if (uhurt == 1) - monstseesu_ad(adtyp); + /* You resisted the damage, lets not keep that to ourselves */ + if (uhurt == 1) + monstseesu_ad(adtyp); if (u.uhp <= 0 || (Upolyd && u.mh <= 0)) { if (Upolyd) { diff --git a/src/isaac64.c b/src/isaac64.c index 4d19335a3..76cb769fc 100644 --- a/src/isaac64.c +++ b/src/isaac64.c @@ -34,13 +34,13 @@ /* Extract ISAAC64_SZ_LOG bits (starting at bit 3). */ static inline uint32_t lower_bits(uint64_t x) { - return (x & ((ISAAC64_SZ-1) << 3)) >>3; + return (x & ((ISAAC64_SZ-1) << 3)) >>3; } /* Extract next ISAAC64_SZ_LOG bits (starting at bit ISAAC64_SZ_LOG+2). */ static inline uint32_t upper_bits(uint64_t y) { - return (y >> (ISAAC64_SZ_LOG+3)) & (ISAAC64_SZ-1); + return (y >> (ISAAC64_SZ_LOG+3)) & (ISAAC64_SZ-1); } static void isaac64_update(isaac64_ctx *_ctx){ diff --git a/src/light.c b/src/light.c index bf3791616..b57693a1f 100644 --- a/src/light.c +++ b/src/light.c @@ -69,7 +69,7 @@ new_light_core(xchar x, xchar y, int range, int type, anything *id) /* camera flash uses radius 0 and passes Null object */ || (range == 0 && (type != LS_OBJECT || id->a_obj != 0))) { impossible("new_light_source: illegal range %d", range); - return (light_source *) 0; + return (light_source *) 0; } ls = (light_source *) alloc(sizeof *ls); diff --git a/src/mail.c b/src/mail.c index d407f395c..06431ad3d 100644 --- a/src/mail.c +++ b/src/mail.c @@ -664,7 +664,7 @@ ck_server_admin_msg(void) if (!stat(SERVER_ADMIN_MSG, &nst)) { if (nst.st_mtime > ost.st_mtime) read_simplemail(nonconst(SERVER_ADMIN_MSG, adminbuf, - sizeof adminbuf), TRUE); + sizeof adminbuf), TRUE); ost.st_mtime = nst.st_mtime; } #endif /* SERVER_ADMIN_MSG */ diff --git a/src/mhitu.c b/src/mhitu.c index 79c543580..1b1822172 100644 --- a/src/mhitu.c +++ b/src/mhitu.c @@ -1916,7 +1916,7 @@ doseduce(struct monst *mon) yourgloves ? " and eleven more pairs of gloves" : ""); } - } else if (seewho) + } else if (seewho) pline("%s appears to sigh.", Monnam(mon)); /* else no regret message if can't see or hear seducer */ diff --git a/src/mklev.c b/src/mklev.c index f3eb47b0f..0736752f8 100644 --- a/src/mklev.c +++ b/src/mklev.c @@ -304,9 +304,9 @@ makerooms(void) iflags.in_lua = g.in_mk_themerooms = TRUE; g.themeroom_failed = FALSE; lua_getglobal(themes, "themerooms_generate"); - if ( nhl_pcall(themes, 0, 0)){ - impossible("Lua error: %s", lua_tostring(themes, -1)); - } + if ( nhl_pcall(themes, 0, 0)){ + impossible("Lua error: %s", lua_tostring(themes, -1)); + } iflags.in_lua = g.in_mk_themerooms = FALSE; if (g.themeroom_failed && ((themeroom_tries++ > 10) diff --git a/src/nhlsel.c b/src/nhlsel.c index 55144eacb..48bd6b2e5 100644 --- a/src/nhlsel.c +++ b/src/nhlsel.c @@ -817,11 +817,11 @@ l_selection_iterate(lua_State *L) lua_pushvalue(L, 2); lua_pushinteger(L, x - g.xstart); lua_pushinteger(L, y - g.ystart); - if (nhl_pcall(L, 2, 0)) { - impossible("Lua error: %s", lua_tostring(L, -1)); - /* abort the loops to prevent possible error cascade */ - goto out; - } + if (nhl_pcall(L, 2, 0)) { + impossible("Lua error: %s", lua_tostring(L, -1)); + /* abort the loops to prevent possible error cascade */ + goto out; + } } } else { nhl_error(L, "wrong parameters"); diff --git a/src/o_init.c b/src/o_init.c index 251bb13e4..6529404c8 100644 --- a/src/o_init.c +++ b/src/o_init.c @@ -417,7 +417,7 @@ restnames(NHFILE* nhfp) if (nhfp->structlevel) { mread(nhfp->fd, (genericptr_t)objects[i].oc_uname, len); } - } + } } #ifdef USE_TILES shuffle_tiles(); diff --git a/src/restore.c b/src/restore.c index c3e208bb0..51d068656 100644 --- a/src/restore.c +++ b/src/restore.c @@ -1453,18 +1453,18 @@ validate(NHFILE* nhfp, const char *name) if (!(reslt = uptodate(nhfp, name, utdflags))) return 1; if ((nhfp->mode & WRITING) == 0) { - if (nhfp->structlevel) + if (nhfp->structlevel) rlen = (readLenType) read(nhfp->fd, (genericptr_t) &sfi, sizeof sfi); } else { if (nhfp->structlevel) rlen = (readLenType) read(nhfp->fd, (genericptr_t) &sfi, sizeof sfi); minit(); /* ZEROCOMP */ if (rlen == 0) { - if (verbose) { - pline("File \"%s\" is empty during save file feature check?", name); - wait_synch(); - } - return -1; + if (verbose) { + pline("File \"%s\" is empty during save file feature check?", name); + wait_synch(); + } + return -1; } } return 0; diff --git a/src/sounds.c b/src/sounds.c index e0f2252f9..777090fe3 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -1441,7 +1441,7 @@ add_sound_mapping(const char* mapping) if (strlen(sounddir) + 1 + strlen(filename) >= sizeof filespec) { raw_print("sound file name too long"); return 0; - } + } Snprintf(filespec, sizeof filespec, "%s/%s", sounddir, filename); if (idx >= 0 || can_read_file(filespec)) { diff --git a/src/sp_lev.c b/src/sp_lev.c index 396451574..ac8b6bddb 100644 --- a/src/sp_lev.c +++ b/src/sp_lev.c @@ -543,46 +543,46 @@ flip_level(int flp, boolean extras) for (ttmp = g.ftrap; ttmp; ttmp = ttmp->ntrap) { if (!inFlipArea(ttmp->tx, ttmp->ty)) continue; - if (flp & 1) { - ttmp->ty = FlipY(ttmp->ty); - if (ttmp->ttyp == ROLLING_BOULDER_TRAP) { - ttmp->launch.y = FlipY(ttmp->launch.y); - ttmp->launch2.y = FlipY(ttmp->launch2.y); - } else if (is_pit(ttmp->ttyp) && ttmp->conjoined) { + if (flp & 1) { + ttmp->ty = FlipY(ttmp->ty); + if (ttmp->ttyp == ROLLING_BOULDER_TRAP) { + ttmp->launch.y = FlipY(ttmp->launch.y); + ttmp->launch2.y = FlipY(ttmp->launch2.y); + } else if (is_pit(ttmp->ttyp) && ttmp->conjoined) { ttmp->conjoined = flip_encoded_direction_bits(flp, ttmp->conjoined); } - } - if (flp & 2) { - ttmp->tx = FlipX(ttmp->tx); - if (ttmp->ttyp == ROLLING_BOULDER_TRAP) { - ttmp->launch.x = FlipX(ttmp->launch.x); - ttmp->launch2.x = FlipX(ttmp->launch2.x); - } else if (is_pit(ttmp->ttyp) && ttmp->conjoined) { + } + if (flp & 2) { + ttmp->tx = FlipX(ttmp->tx); + if (ttmp->ttyp == ROLLING_BOULDER_TRAP) { + ttmp->launch.x = FlipX(ttmp->launch.x); + ttmp->launch2.x = FlipX(ttmp->launch2.x); + } else if (is_pit(ttmp->ttyp) && ttmp->conjoined) { ttmp->conjoined = flip_encoded_direction_bits(flp, ttmp->conjoined); - } - } + } + } } /* objects */ for (otmp = fobj; otmp; otmp = otmp->nobj) { if (!inFlipArea(otmp->ox, otmp->oy)) continue; - if (flp & 1) - otmp->oy = FlipY(otmp->oy); - if (flp & 2) - otmp->ox = FlipX(otmp->ox); + if (flp & 1) + otmp->oy = FlipY(otmp->oy); + if (flp & 2) + otmp->ox = FlipX(otmp->ox); } /* buried objects */ for (otmp = g.level.buriedobjlist; otmp; otmp = otmp->nobj) { if (!inFlipArea(otmp->ox, otmp->oy)) continue; - if (flp & 1) - otmp->oy = FlipY(otmp->oy); - if (flp & 2) - otmp->ox = FlipX(otmp->ox); + if (flp & 1) + otmp->oy = FlipY(otmp->oy); + if (flp & 2) + otmp->ox = FlipX(otmp->ox); } /* monsters */ @@ -592,10 +592,10 @@ flip_level(int flp, boolean extras) /* skip the occasional earth elemental outside the flip area */ if (!inFlipArea(mtmp->mx, mtmp->my)) continue; - if (flp & 1) - mtmp->my = FlipY(mtmp->my); - if (flp & 2) - mtmp->mx = FlipX(mtmp->mx); + if (flp & 1) + mtmp->my = FlipY(mtmp->my); + if (flp & 2) + mtmp->mx = FlipX(mtmp->mx); if (mtmp->ispriest) { Flip_coord(EPRI(mtmp)->shrpos); @@ -606,8 +606,8 @@ flip_level(int flp, boolean extras) if (flp & 1) flip_worm_segs_vertical(mtmp, miny, maxy); if (flp & 2) - flip_worm_segs_horizontal(mtmp, minx, maxx); - } + flip_worm_segs_horizontal(mtmp, minx, maxx); + } #if 0 /* not useful unless tracking also gets flipped */ if (extras) { if (mtmp->tame && has_edog(mtmp)) @@ -618,48 +618,48 @@ flip_level(int flp, boolean extras) /* engravings */ for (etmp = head_engr; etmp; etmp = etmp->nxt_engr) { - if (flp & 1) - etmp->engr_y = FlipY(etmp->engr_y); - if (flp & 2) - etmp->engr_x = FlipX(etmp->engr_x); + if (flp & 1) + etmp->engr_y = FlipY(etmp->engr_y); + if (flp & 2) + etmp->engr_x = FlipX(etmp->engr_x); } /* level (teleport) regions */ for (i = 0; i < g.num_lregions; i++) { - if (flp & 1) { - g.lregions[i].inarea.y1 = FlipY(g.lregions[i].inarea.y1); - g.lregions[i].inarea.y2 = FlipY(g.lregions[i].inarea.y2); - if (g.lregions[i].inarea.y1 > g.lregions[i].inarea.y2) { - itmp = g.lregions[i].inarea.y1; - g.lregions[i].inarea.y1 = g.lregions[i].inarea.y2; - g.lregions[i].inarea.y2 = itmp; - } - - g.lregions[i].delarea.y1 = FlipY(g.lregions[i].delarea.y1); - g.lregions[i].delarea.y2 = FlipY(g.lregions[i].delarea.y2); - if (g.lregions[i].delarea.y1 > g.lregions[i].delarea.y2) { - itmp = g.lregions[i].delarea.y1; - g.lregions[i].delarea.y1 = g.lregions[i].delarea.y2; - g.lregions[i].delarea.y2 = itmp; - } - } - if (flp & 2) { - g.lregions[i].inarea.x1 = FlipX(g.lregions[i].inarea.x1); - g.lregions[i].inarea.x2 = FlipX(g.lregions[i].inarea.x2); - if (g.lregions[i].inarea.x1 > g.lregions[i].inarea.x2) { - itmp = g.lregions[i].inarea.x1; - g.lregions[i].inarea.x1 = g.lregions[i].inarea.x2; - g.lregions[i].inarea.x2 = itmp; - } - - g.lregions[i].delarea.x1 = FlipX(g.lregions[i].delarea.x1); - g.lregions[i].delarea.x2 = FlipX(g.lregions[i].delarea.x2); - if (g.lregions[i].delarea.x1 > g.lregions[i].delarea.x2) { - itmp = g.lregions[i].delarea.x1; - g.lregions[i].delarea.x1 = g.lregions[i].delarea.x2; - g.lregions[i].delarea.x2 = itmp; - } - } + if (flp & 1) { + g.lregions[i].inarea.y1 = FlipY(g.lregions[i].inarea.y1); + g.lregions[i].inarea.y2 = FlipY(g.lregions[i].inarea.y2); + if (g.lregions[i].inarea.y1 > g.lregions[i].inarea.y2) { + itmp = g.lregions[i].inarea.y1; + g.lregions[i].inarea.y1 = g.lregions[i].inarea.y2; + g.lregions[i].inarea.y2 = itmp; + } + + g.lregions[i].delarea.y1 = FlipY(g.lregions[i].delarea.y1); + g.lregions[i].delarea.y2 = FlipY(g.lregions[i].delarea.y2); + if (g.lregions[i].delarea.y1 > g.lregions[i].delarea.y2) { + itmp = g.lregions[i].delarea.y1; + g.lregions[i].delarea.y1 = g.lregions[i].delarea.y2; + g.lregions[i].delarea.y2 = itmp; + } + } + if (flp & 2) { + g.lregions[i].inarea.x1 = FlipX(g.lregions[i].inarea.x1); + g.lregions[i].inarea.x2 = FlipX(g.lregions[i].inarea.x2); + if (g.lregions[i].inarea.x1 > g.lregions[i].inarea.x2) { + itmp = g.lregions[i].inarea.x1; + g.lregions[i].inarea.x1 = g.lregions[i].inarea.x2; + g.lregions[i].inarea.x2 = itmp; + } + + g.lregions[i].delarea.x1 = FlipX(g.lregions[i].delarea.x1); + g.lregions[i].delarea.x2 = FlipX(g.lregions[i].delarea.x2); + if (g.lregions[i].delarea.x1 > g.lregions[i].delarea.x2) { + itmp = g.lregions[i].delarea.x1; + g.lregions[i].delarea.x1 = g.lregions[i].delarea.x2; + g.lregions[i].delarea.x2 = itmp; + } + } } /* regions (poison clouds, etc) */ @@ -693,100 +693,100 @@ flip_level(int flp, boolean extras) /* rooms */ for (sroom = &g.rooms[0]; ; sroom++) { - if (sroom->hx < 0) + if (sroom->hx < 0) break; - if (flp & 1) { - sroom->ly = FlipY(sroom->ly); - sroom->hy = FlipY(sroom->hy); - if (sroom->ly > sroom->hy) { - itmp = sroom->ly; - sroom->ly = sroom->hy; - sroom->hy = itmp; - } - } - if (flp & 2) { - sroom->lx = FlipX(sroom->lx); - sroom->hx = FlipX(sroom->hx); - if (sroom->lx > sroom->hx) { - itmp = sroom->lx; - sroom->lx = sroom->hx; - sroom->hx = itmp; - } - } - - if (sroom->nsubrooms) - for (i = 0; i < sroom->nsubrooms; i++) { - struct mkroom *rroom = sroom->sbrooms[i]; - - if (flp & 1) { - rroom->ly = FlipY(rroom->ly); - rroom->hy = FlipY(rroom->hy); - if (rroom->ly > rroom->hy) { - itmp = rroom->ly; - rroom->ly = rroom->hy; - rroom->hy = itmp; - } - } - if (flp & 2) { - rroom->lx = FlipX(rroom->lx); - rroom->hx = FlipX(rroom->hx); - if (rroom->lx > rroom->hx) { - itmp = rroom->lx; - rroom->lx = rroom->hx; - rroom->hx = itmp; - } - } - } + if (flp & 1) { + sroom->ly = FlipY(sroom->ly); + sroom->hy = FlipY(sroom->hy); + if (sroom->ly > sroom->hy) { + itmp = sroom->ly; + sroom->ly = sroom->hy; + sroom->hy = itmp; + } + } + if (flp & 2) { + sroom->lx = FlipX(sroom->lx); + sroom->hx = FlipX(sroom->hx); + if (sroom->lx > sroom->hx) { + itmp = sroom->lx; + sroom->lx = sroom->hx; + sroom->hx = itmp; + } + } + + if (sroom->nsubrooms) + for (i = 0; i < sroom->nsubrooms; i++) { + struct mkroom *rroom = sroom->sbrooms[i]; + + if (flp & 1) { + rroom->ly = FlipY(rroom->ly); + rroom->hy = FlipY(rroom->hy); + if (rroom->ly > rroom->hy) { + itmp = rroom->ly; + rroom->ly = rroom->hy; + rroom->hy = itmp; + } + } + if (flp & 2) { + rroom->lx = FlipX(rroom->lx); + rroom->hx = FlipX(rroom->hx); + if (rroom->lx > rroom->hx) { + itmp = rroom->lx; + rroom->lx = rroom->hx; + rroom->hx = itmp; + } + } + } } /* doors */ for (i = 0; i < g.doorindex; i++) { - Flip_coord(g.doors[i]); + Flip_coord(g.doors[i]); } /* the map */ if (flp & 1) { - for (x = minx; x <= maxx; x++) - for (y = miny; y < (miny + ((maxy - miny + 1) / 2)); y++) { + for (x = minx; x <= maxx; x++) + for (y = miny; y < (miny + ((maxy - miny + 1) / 2)); y++) { int ny = FlipY(y); - flip_drawbridge_vertical(&levl[x][y]); - flip_drawbridge_vertical(&levl[x][ny]); + flip_drawbridge_vertical(&levl[x][y]); + flip_drawbridge_vertical(&levl[x][ny]); - trm = levl[x][y]; - levl[x][y] = levl[x][ny]; - levl[x][ny] = trm; + trm = levl[x][y]; + levl[x][y] = levl[x][ny]; + levl[x][ny] = trm; - otmp = g.level.objects[x][y]; - g.level.objects[x][y] = g.level.objects[x][ny]; - g.level.objects[x][ny] = otmp; + otmp = g.level.objects[x][y]; + g.level.objects[x][y] = g.level.objects[x][ny]; + g.level.objects[x][ny] = otmp; - mtmp = g.level.monsters[x][y]; - g.level.monsters[x][y] = g.level.monsters[x][ny]; - g.level.monsters[x][ny] = mtmp; - } + mtmp = g.level.monsters[x][y]; + g.level.monsters[x][y] = g.level.monsters[x][ny]; + g.level.monsters[x][ny] = mtmp; + } } if (flp & 2) { - for (x = minx; x < (minx + ((maxx - minx + 1) / 2)); x++) - for (y = miny; y <= maxy; y++) { + for (x = minx; x < (minx + ((maxx - minx + 1) / 2)); x++) + for (y = miny; y <= maxy; y++) { int nx = FlipX(x); - flip_drawbridge_horizontal(&levl[x][y]); - flip_drawbridge_horizontal(&levl[nx][y]); + flip_drawbridge_horizontal(&levl[x][y]); + flip_drawbridge_horizontal(&levl[nx][y]); - trm = levl[x][y]; - levl[x][y] = levl[nx][y]; - levl[nx][y] = trm; + trm = levl[x][y]; + levl[x][y] = levl[nx][y]; + levl[nx][y] = trm; - otmp = g.level.objects[x][y]; - g.level.objects[x][y] = g.level.objects[nx][y]; - g.level.objects[nx][y] = otmp; + otmp = g.level.objects[x][y]; + g.level.objects[x][y] = g.level.objects[nx][y]; + g.level.objects[nx][y] = otmp; - mtmp = g.level.monsters[x][y]; - g.level.monsters[x][y] = g.level.monsters[nx][y]; - g.level.monsters[nx][y] = mtmp; - } + mtmp = g.level.monsters[x][y]; + g.level.monsters[x][y] = g.level.monsters[nx][y]; + g.level.monsters[nx][y] = mtmp; + } } /* timed effects */ @@ -3197,9 +3197,9 @@ lspo_monster(lua_State *L) if (tmpmons.has_invent && lua_type(L, -1) == LUA_TFUNCTION) { lua_remove(L, -2); - if (nhl_pcall(L, 0, 0)){ - impossible("Lua error: %s", lua_tostring(L, -1)); - } + if (nhl_pcall(L, 0, 0)){ + impossible("Lua error: %s", lua_tostring(L, -1)); + } spo_end_moninvent(); } else lua_pop(L, 1); @@ -3513,9 +3513,9 @@ lspo_object(lua_State *L) if (lua_type(L, -1) == LUA_TFUNCTION) { lua_remove(L, -2); - if (nhl_pcall(L, 0, 0)){ - impossible("Lua error: %s", lua_tostring(L, -1)); - } + if (nhl_pcall(L, 0, 0)){ + impossible("Lua error: %s", lua_tostring(L, -1)); + } } else lua_pop(L, 1); @@ -3825,9 +3825,9 @@ lspo_room(lua_State *L) if (lua_type(L, -1) == LUA_TFUNCTION) { lua_remove(L, -2); l_push_mkroom_table(L, tmpcr); - if (nhl_pcall(L, 1, 0)){ - impossible("Lua error: %s", lua_tostring(L, -1)); - } + if (nhl_pcall(L, 1, 0)){ + impossible("Lua error: %s", lua_tostring(L, -1)); + } } else lua_pop(L, 1); spo_endroom(g.coder); @@ -5766,9 +5766,9 @@ lspo_region(lua_State *L) lua_getfield(L, 1, "contents"); if (lua_type(L, -1) == LUA_TFUNCTION) { lua_remove(L, -2); - if (nhl_pcall(L, 0, 0)){ - impossible("Lua error: %s", lua_tostring(L, -1)); - } + if (nhl_pcall(L, 0, 0)){ + impossible("Lua error: %s", lua_tostring(L, -1)); + } } else lua_pop(L, 1); spo_endroom(g.coder); @@ -6372,9 +6372,9 @@ TODO: g.coder->croom needs to be updated if (has_contents && !(g.in_mk_themerooms && g.themeroom_failed)) { l_push_wid_hei_table(L, g.xsize, g.ysize); - if (nhl_pcall(L, 1, 0)){ - impossible("Lua error: %s", lua_tostring(L, -1)); - } + if (nhl_pcall(L, 1, 0)){ + impossible("Lua error: %s", lua_tostring(L, -1)); + } } return 0; diff --git a/src/u_init.c b/src/u_init.c index 575eea60d..ce3090dd6 100644 --- a/src/u_init.c +++ b/src/u_init.c @@ -1007,7 +1007,7 @@ ini_inv(struct trobj *trop) int otyp, i; boolean got_sp1 = FALSE; /* got a level 1 spellbook? */ - while (trop->trclass) { + while (trop->trclass) { otyp = (int) trop->trotyp; if (otyp != UNDEF_TYP) { obj = mksobj(otyp, TRUE, FALSE); diff --git a/src/uhitm.c b/src/uhitm.c index b50b3d744..63eef0c7d 100644 --- a/src/uhitm.c +++ b/src/uhitm.c @@ -651,7 +651,7 @@ hitum_cleave( dieroll = rnd(20); mhit = (tmp > dieroll); g.bhitpos.x = tx, g.bhitpos.y = ty; /* normally set up by - do_attack() */ + do_attack() */ (void) known_hitum(mtmp, uwep, &mhit, tmp, armorpenalty, uattk, dieroll); (void) passive(mtmp, uwep, mhit, !DEADMONSTER(mtmp), AT_WEAP, !uwep); diff --git a/src/utf8map.c b/src/utf8map.c index fba35b5b9..d4564486f 100644 --- a/src/utf8map.c +++ b/src/utf8map.c @@ -1026,7 +1026,7 @@ static int find_glyphs(const char *id); static void just_find_callback(int glyph, struct find_struct *findwhat); static void to_unicode_callback(int glyph, struct find_struct *findwhat); static struct customization_detail *find_display_urep_customization( - const char *customization_name, int glyphidx, + const char *customization_name, int glyphidx, enum graphics_sets which_set); void @@ -1045,7 +1045,7 @@ test_glyphnames(void) static void just_find_callback(int glyph UNUSED, struct find_struct *findwhat UNUSED) { - /* nothing */ + /* nothing */ } static int find_glyphs(const char *id) diff --git a/src/version.c b/src/version.c index 8958a3de4..19167ad13 100644 --- a/src/version.c +++ b/src/version.c @@ -272,7 +272,7 @@ insert_rtoption(char *buf) for (i = 0; i < SIZE(rt_opts); ++i) { if (strstri(buf, rt_opts[i].token) && *rt_opts[i].value) { (void) strsubst(buf, rt_opts[i].token, rt_opts[i].value); - } + } /* we don't break out of the loop after a match; there might be other matches on the same line */ } diff --git a/src/worm.c b/src/worm.c index fe8ae12b3..b25f68b68 100644 --- a/src/worm.c +++ b/src/worm.c @@ -1005,8 +1005,8 @@ flip_worm_segs_vertical(struct monst *worm, int miny, int maxy) struct wseg *curr = wtails[worm->wormno]; while (curr) { - curr->wy = (maxy - curr->wy + miny); - curr = curr->nseg; + curr->wy = (maxy - curr->wy + miny); + curr = curr->nseg; } } @@ -1016,8 +1016,8 @@ flip_worm_segs_horizontal(struct monst *worm, int minx, int maxx) struct wseg *curr = wtails[worm->wormno]; while (curr) { - curr->wx = (maxx - curr->wx + minx); - curr = curr->nseg; + curr->wx = (maxx - curr->wx + minx); + curr = curr->nseg; } }