nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

couple of formatting tweaks

Browse Source
This commit is contained in:
PatR
2016-04-04 14:05:31 -07:00
parent bde9fdd48b
commit cb66774430
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmd.c
View File

@@ -1124,7 +1124,8 @@ wiz_intrinsic(VOID_ARGS)
for (i = 0; i < SIZE(intrinsics); ++i) { for (i = 0; i < SIZE(intrinsics); ++i) {
accelerator = intrinsics[i][0]; accelerator = intrinsics[i][0];
any.a_int = i + 1; any.a_int = i + 1;
add_menu(win, NO_GLYPH, &any, accelerator, 0, ATR_NONE, intrinsics[i], FALSE); add_menu(win, NO_GLYPH, &any, accelerator, 0,
ATR_NONE, intrinsics[i], FALSE);
} }
end_menu(win, "Which intrinsic?"); end_menu(win, "Which intrinsic?");
n = select_menu(win, PICK_ONE, &pick_list); n = select_menu(win, PICK_ONE, &pick_list);
@@ -1137,7 +1138,7 @@ wiz_intrinsic(VOID_ARGS)
return 0; return 0;
} }
if (!strcmp(intrinsics[i],"deafness")) { if (!strcmp(intrinsics[i], "deafness")) {
You("go deaf."); You("go deaf.");
incr_itimeout(&HDeaf, 30); incr_itimeout(&HDeaf, 30);
context.botl = TRUE; context.botl = TRUE;

20
src/sp_lev.c
View File

@@ -611,8 +611,8 @@ schar filling;
if (level.flags.corrmaze) if (level.flags.corrmaze)
levl[x][y].typ = STONE; levl[x][y].typ = STONE;
else else
levl[x][y].typ = levl[x][y].typ = (y < 2 || ((x % 2) && (y % 2))) ? STONE
(y < 2 || ((x % 2) && (y % 2))) ? STONE : filling; : filling;
} }
} }
@@ -4747,7 +4747,8 @@ struct sp_coder *coder;
dy1 = (xchar) SP_REGION_Y1(OV_i(r)); dy1 = (xchar) SP_REGION_Y1(OV_i(r));
dx2 = (xchar) SP_REGION_X2(OV_i(r)); dx2 = (xchar) SP_REGION_X2(OV_i(r));
dy2 = (xchar) SP_REGION_Y2(OV_i(r)); dy2 = (xchar) SP_REGION_Y2(OV_i(r));
wallify_map(dx1 < 0 ? (xstart-1) : dx1, dy1 < 0 ? (ystart-1) : dy1, wallify_map(dx1 < 0 ? (xstart - 1) : dx1,
dy1 < 0 ? (ystart - 1) : dy1,
dx2 < 0 ? (xstart + xsize + 1) : dx2, dx2 < 0 ? (xstart + xsize + 1) : dx2,
dy2 < 0 ? (ystart + ysize + 1) : dy2); dy2 < 0 ? (ystart + ysize + 1) : dy2);
break; break;
@@ -4846,7 +4847,7 @@ struct sp_coder *coder;
ystart = valign; ystart = valign;
break; break;
} }
if ((ystart < 0) || (ystart + ysize > ROWNO)) { if (ystart < 0 || ystart + ysize > ROWNO) {
/* try to move the start a bit */ /* try to move the start a bit */
ystart += (ystart > 0) ? -2 : 2; ystart += (ystart > 0) ? -2 : 2;
if (ysize == ROWNO) if (ysize == ROWNO)
@@ -4860,13 +4861,13 @@ struct sp_coder *coder;
xsize = COLNO - 1; xsize = COLNO - 1;
ysize = ROWNO; ysize = ROWNO;
} else { } else {
xchar x, y; xchar x, y, mptyp;
/* Load the map */ /* Load the map */
for (y = ystart; y < ystart + ysize; y++) for (y = ystart; y < ystart + ysize; y++)
for (x = xstart; x < xstart + xsize; x++) { for (x = xstart; x < xstart + xsize; x++) {
xchar mptyp = mptyp = (mpmap->vardata.str[(y - ystart) * xsize
(mpmap->vardata.str[(y - ystart) * xsize + (x - xstart)] + (x - xstart)] - 1);
- 1);
if (mptyp >= MAX_TYPE) if (mptyp >= MAX_TYPE)
continue; continue;
levl[x][y].typ = mptyp; levl[x][y].typ = mptyp;
@@ -5907,7 +5908,8 @@ const char *name;
(void) dlb_fclose(fd); (void) dlb_fclose(fd);
goto give_up; goto give_up;
} }
lvl = (sp_lev *) alloc(sizeof(sp_lev));
lvl = (sp_lev *) alloc(sizeof (sp_lev));
result = sp_level_loader(fd, lvl); result = sp_level_loader(fd, lvl);
(void) dlb_fclose(fd); (void) dlb_fclose(fd);
if (result) if (result)