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

fix a couple of ms-dos shadow declaration warnings

Browse Source
This commit is contained in:
nhmall
2022-11-29 23:43:42 -05:00
parent 5ac1557d9a
commit 6b99a50821
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys/msdos/vidvesa.c
View File

@@ -481,10 +481,10 @@ static unsigned long
vesa_MakeColor(struct Pixel p) vesa_MakeColor(struct Pixel p)
{ {
unsigned long r = p.r >> vesa_red_shift; unsigned long r = p.r >> vesa_red_shift;
unsigned long gr = p.g >> vesa_green_shift; unsigned long g = p.g >> vesa_green_shift;
unsigned long b = p.b >> vesa_blue_shift; unsigned long b = p.b >> vesa_blue_shift;
return (r << vesa_red_pos) return (r << vesa_red_pos)
| (gr << vesa_green_pos) | (g << vesa_green_pos)
| (b << vesa_blue_pos); | (b << vesa_blue_pos);
} }

14
sys/msdos/vidvga.c
View File

@@ -713,7 +713,7 @@ read_tile_indexes(unsigned glyph, unsigned char (*indexes)[TILE_X])
} }
static void static void
decal_planar(struct planar_cell_struct *gp UNUSED, unsigned special) decal_planar(struct planar_cell_struct *gpcs UNUSED, unsigned special)
{ {
if (special & MG_CORPSE) { if (special & MG_CORPSE) {
} else if (special & MG_INVIS) { } else if (special & MG_INVIS) {
@@ -1022,7 +1022,7 @@ vga_GetBitmap(uint32 chr, unsigned char *bitmap)
* *
*/ */
static void static void
vga_DisplayCell(struct planar_cell_struct *gp, int col, int row) vga_DisplayCell(struct planar_cell_struct *gpcs, int col, int row)
{ {
int i, pixx, pixy; int i, pixx, pixy;
char __far *tmp_s; /* source pointer */ char __far *tmp_s; /* source pointer */
@@ -1037,10 +1037,10 @@ vga_DisplayCell(struct planar_cell_struct *gp, int col, int row)
tmp_d = screentable[i + pixy]; tmp_d = screentable[i + pixy];
tmp_d += pixx; tmp_d += pixx;
/* /*
* memcpy((void *)tmp,(void *)gp->plane[vplane].image[i], * memcpy((void *)tmp,(void *)gpcs->plane[vplane].image[i],
* BYTES_PER_CELL); * BYTES_PER_CELL);
*/ */
tmp_s = gp->plane[vplane].image[i]; tmp_s = gpcs->plane[vplane].image[i];
WRITE_ABSOLUTE(tmp_d, (*tmp_s)); WRITE_ABSOLUTE(tmp_d, (*tmp_s));
++tmp_s; ++tmp_s;
++tmp_d; ++tmp_d;
@@ -1051,7 +1051,7 @@ vga_DisplayCell(struct planar_cell_struct *gp, int col, int row)
} }
static void static void
vga_DisplayCell_O(struct overview_planar_cell_struct *gp, int col, int row) vga_DisplayCell_O(struct overview_planar_cell_struct *gpcs, int col, int row)
{ {
int i, pixx, pixy; int i, pixx, pixy;
char __far *tmp_s; /* source pointer */ char __far *tmp_s; /* source pointer */
@@ -1066,10 +1066,10 @@ vga_DisplayCell_O(struct overview_planar_cell_struct *gp, int col, int row)
tmp_d = screentable[i + pixy]; tmp_d = screentable[i + pixy];
tmp_d += pixx; tmp_d += pixx;
/* /*
* memcpy((void *)tmp,(void *)gp->plane[vplane].image[i], * memcpy((void *)tmp,(void *)gpcs->plane[vplane].image[i],
* BYTES_PER_CELL); * BYTES_PER_CELL);
*/ */
tmp_s = gp->plane[vplane].image[i]; tmp_s = gpcs->plane[vplane].image[i];
WRITE_ABSOLUTE(tmp_d, (*tmp_s)); WRITE_ABSOLUTE(tmp_d, (*tmp_s));
} }
} }