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

some of Ray Chason's MSDOS and other fixes

Browse Source
This commit is contained in:
nhmall
2016-03-05 14:44:50 -05:00
parent ef9cd17942
commit 78857961d2
22 changed files with 1484 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/msdos/vidvga.c
+153 -71
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 vidvga.c $NHDT-Date: 1432512791 2015/05/25 00:13:11 $ $NHDT-Branch: master $:$NHDT-Revision: 1.17 $ */
/* NetHack 3.6 vidvga.c $NHDT-Date: 1457207044 2016/03/05 19:44:04 $ $NHDT-Branch: chasonr $:$NHDT-Revision: 1.18 $ */
/* Copyright (c) NetHack PC Development Team 1995 */
/* NetHack may be freely redistributed. See license for details. */
/*
@@ -10,7 +10,7 @@
#ifdef SCREEN_VGA /* this file is for SCREEN_VGA only */
#include "pcvideo.h"
#include "tile.h"
#include "pctiles.h"
#include "tileset.h"
#include <dos.h>
#include <ctype.h>
@@ -102,6 +102,8 @@
#include <conio.h>
#endif
extern short glyph2tile[];
/* STATIC_DCL void FDECL(vga_NoBorder, (int)); */
void FDECL(vga_gotoloc, (int, int)); /* This should be made a macro */
void NDECL(vga_backsp);
@@ -109,7 +111,7 @@ void NDECL(vga_backsp);
STATIC_DCL void FDECL(vga_scrollmap, (BOOLEAN_P));
#endif
STATIC_DCL void FDECL(vga_redrawmap, (BOOLEAN_P));
void FDECL(vga_cliparound, (int, int));
static void FDECL(vga_cliparound, (int, int));
STATIC_OVL void FDECL(decal_planar, (struct planar_cell_struct *, unsigned));
#ifdef POSITIONBAR
@@ -117,6 +119,19 @@ STATIC_DCL void NDECL(positionbar);
static void FDECL(vga_special, (int, int, int));
#endif
static void FDECL(vga_DisplayCell, (struct planar_cell_struct *, int, int));
static void FDECL(vga_DisplayCell_O,
(struct overview_planar_cell_struct *, int, int));
static void FDECL(vga_SwitchMode, (unsigned int));
static void FDECL(vga_SetPalette, (const struct Pixel *));
static void FDECL(vga_WriteChar, (int, int, int, int));
static void FDECL(vga_WriteStr, (char *, int, int, int, int));
static void FDECL(read_planar_tile, (unsigned, struct planar_cell_struct *));
static void FDECL(read_planar_tile_O,
(unsigned, struct overview_planar_cell_struct *));
static void FDECL(read_tile_indexes, (unsigned, unsigned char (*)[TILE_X]));
extern int clipx, clipxmax; /* current clipping column from wintty.c */
extern boolean clipping; /* clipping on? from wintty.c */
extern int savevmode; /* store the original video mode */
@@ -135,7 +150,7 @@ extern boolean inmap; /* in the map window */
STATIC_VAR unsigned char __far *font;
STATIC_VAR char *screentable[SCREENHEIGHT];
STATIC_VAR char *paletteptr;
STATIC_VAR const struct Pixel *paletteptr;
STATIC_VAR struct map_struct {
int glyph;
int ch;
@@ -156,8 +171,8 @@ STATIC_VAR struct map_struct {
}
#define TOP_MAP_ROW 1
STATIC_VAR int vgacmap[CLR_MAX] = { 0, 3, 5, 9, 4, 8, 12, 14,
11, 2, 6, 7, 1, 8, 12, 13 };
STATIC_VAR int vgacmap[CLR_MAX] = { 1, 4, 6, 10, 5, 9, 0, 15,
12, 3, 7, 8, 2, 9, 0, 14 };
STATIC_VAR int viewport_size = 40;
/* STATIC_VAR char masktable[8]={0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01}; */
/* STATIC_VAR char bittable[8]= {0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80}; */
@@ -187,13 +202,8 @@ int vp[SCREENPLANES] = { 8, 4, 2, 1 };
#endif
int vp2[SCREENPLANES] = { 1, 2, 4, 8 };
STATIC_VAR struct planar_cell_struct *planecell;
STATIC_VAR struct overview_planar_cell_struct *planecell_O;
#if defined(USE_TILES)
STATIC_VAR struct tibhdr_struct tibheader;
/* extern FILE *tilefile; */ /* Not needed in here most likely */
#endif
STATIC_VAR struct planar_cell_struct planecell;
STATIC_VAR struct overview_planar_cell_struct planecell_O;
/* STATIC_VAR int g_attribute; */ /* Current attribute to use */
@@ -365,6 +375,11 @@ unsigned special; /* special feature: corpse, invis, detected, pet, ridden -
int attr;
int ry;
/* If statue glyph, map to the generic statue */
if (GLYPH_STATUE_OFF <= glyphnum && glyphnum < GLYPH_STATUE_OFF + NUMMONS) {
glyphnum = objnum_to_glyph(STATUE);
}
row = currow;
col = curcol;
if ((col < 0 || col >= COLNO)
@@ -380,20 +395,14 @@ unsigned special; /* special feature: corpse, invis, detected, pet, ridden -
vga_WriteChar((unsigned char) ch, col, row, attr);
} else if (!iflags.over_view) {
if ((col >= clipx) && (col <= clipxmax)) {
if (!ReadPlanarTileFile(glyph2tile[glyphnum], &planecell)) {
if (map[ry][col].special)
decal_planar(planecell, special);
vga_DisplayCell(planecell, col - clipx, row);
} else
pline("vga_xputg: Error reading tile (%d,%d) from file",
glyphnum, glyph2tile[glyphnum]);
read_planar_tile(glyphnum, &planecell);
if (map[ry][col].special)
decal_planar(&planecell, special);
vga_DisplayCell(&planecell, col - clipx, row);
}
} else {
if (!ReadPlanarTileFile_O(glyph2tile[glyphnum], &planecell_O))
vga_DisplayCell_O(planecell_O, col, row);
else
pline("vga_xputg: Error reading tile (%d,%d) from file", glyphnum,
glyph2tile[glyphnum]);
read_planar_tile_O(glyphnum, &planecell_O);
vga_DisplayCell_O(&planecell_O, col, row);
}
if (col < (CO - 1))
++col;
@@ -422,7 +431,7 @@ int col, row;
}
#if defined(USE_TILES) && defined(CLIPPING)
void
static void
vga_cliparound(x, y)
int x, y;
{
@@ -489,22 +498,13 @@ boolean clearfirst;
t = map[y][x].glyph;
if (!(clearfirst && t == cmap_to_glyph(S_stone))) {
if (!iflags.over_view) {
if (!ReadPlanarTileFile(glyph2tile[t], &planecell)) {
if (map[y][x].special)
decal_planar(planecell, map[y][x].special);
vga_DisplayCell(planecell, x - clipx,
y + TOP_MAP_ROW);
} else
pline("vga_redrawmap: Error reading tile (%d,%d)",
t, glyph2tile[t]);
read_planar_tile(t, &planecell);
if (map[y][x].special)
decal_planar(&planecell, map[y][x].special);
vga_DisplayCell(&planecell, x - clipx, y + TOP_MAP_ROW);
} else {
if (!ReadPlanarTileFile_O(glyph2tile[t],
&planecell_O)) {
vga_DisplayCell_O(planecell_O, x,
y + TOP_MAP_ROW);
} else
pline("vga_redrawmap: Error reading tile (%d,%d)",
t, glyph2tile[t]);
read_planar_tile_O(t, &planecell_O);
vga_DisplayCell_O(&planecell_O, x, y + TOP_MAP_ROW);
}
}
}
@@ -632,19 +632,98 @@ boolean left;
for (y = 0; y < ROWNO; ++y) {
for (x = i; x < j; x += 2) {
t = map[y][x].glyph;
if (!ReadPlanarTileFile(glyph2tile[t], &planecell)) {
if (map[y][x].special)
decal_planar(planecell, map[y][x].special);
vga_DisplayCell(planecell, x - clipx, y + TOP_MAP_ROW);
} else {
pline("vga_shiftmap: Error reading tile (%d,%d)", t,
glyph2tile[t]);
}
read_planar_tile(t, &planecell);
if (map[y][x].special)
decal_planar(&planecell, map[y][x].special);
vga_DisplayCell(&planecell, x - clipx, y + TOP_MAP_ROW);
}
}
}
#endif /* SCROLLMAP */
static void
read_planar_tile(glyph, cell)
unsigned glyph;
struct planar_cell_struct *cell;
{
unsigned char indexes[TILE_Y][TILE_X];
unsigned plane, y, byte, bit;
read_tile_indexes(glyph, indexes);
/* cell->plane[0..3].image[0..15][0..1] */
for (plane = 0; plane < SCREENPLANES; ++plane) {
for (y = 0; y < TILE_Y; ++y) {
for (byte = 0; byte < MAX_BYTES_PER_CELL; ++byte) {
unsigned char b = 0;
for (bit = 0; bit < 8; ++bit) {
unsigned char x = byte * 8 + bit;
unsigned char i = indexes[y][x];
b <<= 1;
if (i & (0x8 >> plane)) b |= 1;
}
cell->plane[plane].image[y][byte] = b;
}
}
}
}
static void
read_planar_tile_O(glyph, cell)
unsigned glyph;
struct overview_planar_cell_struct *cell;
{
unsigned char indexes[TILE_Y][TILE_X];
unsigned plane, y, bit;
read_tile_indexes(glyph, indexes);
/* cell->plane[0..3].image[0..15][0..0] */
for (plane = 0; plane < SCREENPLANES; ++plane) {
for (y = 0; y < TILE_Y; ++y) {
unsigned char b = 0;
for (bit = 0; bit < 8; ++bit) {
unsigned char x = bit * 2;
unsigned char i = indexes[y][x];
b <<= 1;
if (i & (0x8 >> plane)) b |= 1;
}
cell->plane[plane].image[y][0] = b;
}
}
}
static void
read_tile_indexes(glyph, indexes)
unsigned glyph;
unsigned char (*indexes)[TILE_X];
{
const struct TileImage *tile;
unsigned x, y;
/* We don't have enough colors to show the statues */
if (glyph >= GLYPH_STATUE_OFF) {
glyph = GLYPH_OBJ_OFF + STATUE;
}
/* Get the tile from the image */
tile = get_tile(glyph2tile[glyph]);
/* Map to a 16 bit palette; assume colors laid out as in default tileset */
memset(indexes, 0, sizeof(indexes));
for (y = 0; y < TILE_Y && y < tile->height; ++y) {
for (x = 0; x < TILE_X && x < tile->width; ++x) {
unsigned i = tile->indexes[y * tile->width + x];
if (i == 28) {
i = 0;
} else if (i == 16) {
i = 13;
} else if (i > 15) {
i = 15;
}
indexes[y][x] = i;
}
}
}
STATIC_OVL void
decal_planar(gp, special)
struct planar_cell_struct *gp;
@@ -671,17 +750,20 @@ vga_Init(void)
int i;
#ifdef USE_TILES
const char *tile_file;
int tilefailure = 0;
/*
* Attempt to open the required tile files. If we can't
* don't perform the video mode switch, use TTY code instead.
*
*/
if (OpenTileFile(NETHACK_PLANAR_TILEFILE, FALSE))
tile_file = iflags.wc_tile_file;
if (tile_file == NULL || tile_file == '\0') {
tile_file = "nhtiles.bmp";
}
if (!read_tiles(tile_file, FALSE))
tilefailure |= 1;
if (OpenTileFile(NETHACK_OVERVIEW_TILEFILE, TRUE))
tilefailure |= 2;
if (ReadTileFileHeader(&tibheader, FALSE))
if (get_palette() == NULL)
tilefailure |= 4;
if (tilefailure) {
@@ -708,7 +790,7 @@ vga_Init(void)
/* vga_NoBorder(BACKGROUND_VGA_COLOR); */ /* Not needed after palette
mod */
#ifdef USE_TILES
paletteptr = tibheader.palette;
paletteptr = get_palette();
iflags.tile_view = TRUE;
iflags.over_view = FALSE;
#else
@@ -730,7 +812,7 @@ vga_Init(void)
* mode (video mode 0x12). No other modes are currently supported.
*
*/
void
static void
vga_SwitchMode(unsigned int mode)
{
union REGS regs;
@@ -760,8 +842,7 @@ vga_SwitchMode(unsigned int mode)
void
vga_Finish(void)
{
CloseTileFile(0);
CloseTileFile(1);
free_tiles();
vga_SwitchMode(MODETEXT);
windowprocs.win_cliparound = tty_cliparound;
g_attribute = attrib_text_normal;
@@ -853,7 +934,7 @@ vga_detect()
* do it using the colour 'colour'.
*
*/
void
static void
vga_WriteChar(chr, col, row, colour)
int chr, col, row, colour;
{
@@ -901,7 +982,7 @@ int chr, col, row, colour;
* not the x,y pixel location.
*
*/
void
static void
vga_DisplayCell(gp, col, row)
struct planar_cell_struct *gp;
int col, row;
@@ -932,7 +1013,7 @@ int col, row;
egawriteplane(15);
}
void
static void
vga_DisplayCell_O(gp, col, row)
struct overview_planar_cell_struct *gp;
int col, row;
@@ -965,7 +1046,7 @@ int col, row;
* is 'len' at location (x,y) using the 'colour' colour.
*
*/
void
static void
vga_WriteStr(s, len, col, row, colour)
char *s;
int len, col, row, colour;
@@ -993,19 +1074,20 @@ int len, col, row, colour;
* 16 colour mode at 640 x 480.
*
*/
void
static void
vga_SetPalette(p)
char *p;
const struct Pixel *p;
{
union REGS regs;
int i;
outportb(0x3c6, 0xff);
for (i = 0; i < COLORDEPTH; ++i) {
struct Pixel color = (i == 13) ? p[16] : p[i];
outportb(0x3c8, i);
outportb(0x3c9, (*p++) >> 2);
outportb(0x3c9, (*p++) >> 2);
outportb(0x3c9, (*p++) >> 2);
outportb(0x3c9, color.r >> 2);
outportb(0x3c9, color.g >> 2);
outportb(0x3c9, color.b >> 2);
}
regs.x.bx = 0x0000;
for (i = 0; i < COLORDEPTH; ++i) {
@@ -1021,10 +1103,10 @@ static unsigned char colorbits[] = { 0x08, 0x04, 0x02, 0x01 };
#ifdef POSITIONBAR
#define PBAR_ROW (LI - 4)
#define PBAR_COLOR_ON 15 /* slate grey background colour of tiles */
#define PBAR_COLOR_OFF 12 /* bluish grey, used in old style only */
#define PBAR_COLOR_STAIRS 9 /* brown */
#define PBAR_COLOR_HERO 14 /* creamy white */
#define PBAR_COLOR_ON 13 /* slate grey background colour of tiles */
#define PBAR_COLOR_OFF 0 /* bluish grey, used in old style only */
#define PBAR_COLOR_STAIRS 10 /* brown */
#define PBAR_COLOR_HERO 15 /* creamy white */
static unsigned char pbar[COLNO];
@@ -1152,7 +1234,7 @@ int chr, col, color;
pixy = PBAR_ROW * MAX_ROWS_PER_CELL;
for (vplane = 0; vplane < SCREENPLANES; ++vplane) {
egareadplane(vplane);
egareadplane(SCREENPLANES - 1 - vplane);
y = pixy;
for (i = 0; i < ROWS_PER_CELL; ++i) {
tmp_d = screentable[y++] + col;