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

Remove vestiges of old overlay source split

Browse Source 
[trunk only]
This commit is contained in:
nethack.allison
2003-09-05 02:45:18 +00:00
parent 1a94dcfca3
commit 416412f92b
66 changed files with 25 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys/msdos/msdos.c
View File

@@ -47,8 +47,6 @@
void FDECL(get_cursor,(int *, int *));
#ifdef OVL0
/* direct bios calls are used only when iflags.BIOS is set */
static char NDECL(DOSgetch);
@@ -515,6 +513,4 @@ unsigned setvalue;
return (regs.x.dx);
}
# endif /* OVLB */
#endif /* MSDOS */

6
sys/msdos/pctiles.c
View File

@@ -45,8 +45,6 @@ boolean otiles_in_ram = FALSE;
extern int total_tiles_used; /* tile.c */
#endif
# ifdef OVLB
/*
* Read the header/palette information at the start of the
* NetHack.tib file.
@@ -161,9 +159,6 @@ boolean filestyle;
}
#endif
}
# endif /* OVLB */
# ifdef OVL0
struct planar_cell_struct plancell;
struct overview_planar_cell_struct oplancell;
@@ -253,7 +248,6 @@ char (*pta)[TILE_X];
return 0;
}
# endif
# endif /* OVL0 */
#endif /* USE_TILES */
/* pctiles.c */

57
sys/msdos/video.c
View File

@@ -73,7 +73,6 @@
*/
#ifdef OVLB
void
get_scr_size()
{
@@ -84,7 +83,6 @@ get_scr_size()
# endif
txt_get_scr_size();
}
#endif /*OVLB*/
/*
* --------------------------------------------------------------
@@ -122,7 +120,6 @@ void FDECL(cmov, (int, int));
void FDECL(nocmov, (int, int));
STATIC_DCL void NDECL(init_ttycolor);
# ifdef OVLB
int savevmode; /* store the original video mode in here */
int curcol,currow; /* graphics mode current cursor locations */
int g_attribute; /* Current attribute to use */
@@ -136,23 +133,7 @@ boolean inmap = FALSE; /* in the map window */
# ifdef TEXTCOLOR
char ttycolors[CLR_MAX]; /* also used/set in options.c */
# endif /* TEXTCOLOR */
# else
extern int savevmode;
extern int curcol,currow;
extern int g_attribute;
extern int monoflag;
extern int attrib_text_normal;
extern int attrib_gr_normal;
extern int attrib_text_intense;
extern int attrib_gr_intense;
extern boolean traditonal;
extern boolean inmap;
# ifdef TEXTCOLOR
extern char ttycolors[CLR_MAX]; /* also used/set in options.c */
# endif /* TEXTCOLOR */
# endif /* OVLB */
# ifdef OVLB
void
backsp()
{
@@ -164,9 +145,7 @@ backsp()
# endif
}
}
# endif /* OVLB */
# ifdef OVL0
void
clear_screen()
{
@@ -227,9 +206,7 @@ register int col, row;
# endif
}
}
# endif /* OVL0 */
# ifdef OVLB
int
has_color(int color)
{
@@ -240,9 +217,7 @@ has_color(int color)
return 0;
# endif
}
# endif /* OVLB */
# ifdef OVL0
void
home()
{
@@ -283,10 +258,7 @@ standoutend()
g_attribute = iflags.grmode ? attrib_gr_normal
: attrib_text_normal;
}
# endif /* OVL0 */
# ifdef OVLB
void
term_end_attr(int attr)
{
@@ -378,9 +350,7 @@ term_start_raw_bold(void)
{
standoutbeg();
}
# endif /* OVLB */
# ifdef OVL0
void
tty_delay_output()
{
@@ -393,9 +363,6 @@ tty_delay_output()
#endif
}
# endif /* OVL0 */
# ifdef OVLB
void
tty_end_screen()
{
@@ -514,8 +481,6 @@ gr_finish()
}
}
# endif /* OVLB */
/*
* Screen output routines (these are heavily used).
*
@@ -546,7 +511,6 @@ gr_finish()
* (that include wintty.h) are actually using these routines.
*/
# ifdef OVL0
void
xputs(s)
const char *s;
@@ -659,7 +623,6 @@ HideCursor()
}
# endif /* SIMULATE_CURSOR */
# endif /* OVL0 */
# ifdef TEXTCOLOR
/*
@@ -688,21 +651,12 @@ HideCursor()
/* assign_videocolors() is prototyped in extern.h */
/* assign_video() is prototyped in extern.h */
# ifdef OVLB
int shadeflag; /* shades are initialized */
int colorflag; /* colors are initialized */
char *schoice[3] = {"dark","normal","light"};
char *shade[3];
# else
extern int shadeflag;
extern int colorflag;
extern char *schoice[3];
extern char *shade[3];
# endif /* OVLB */
# endif /* VIDEOSHADES */
# ifdef OVLB
STATIC_OVL void
init_ttycolor()
{
@@ -741,9 +695,7 @@ init_ttycolor()
}
# endif
}
# endif /* OVLB */
# ifdef OVL1
static int FDECL(convert_uchars,(char *, uchar *, int));
# ifdef VIDEOSHADES
int assign_videoshades(char *choiceptr)
@@ -872,7 +824,6 @@ convert_uchars(bufp,list,size)
}
# endif /* VIDEOSHADES */
# endif /* OVL1 */
# endif /* TEXTCOLOR */
/*
@@ -884,7 +835,6 @@ convert_uchars(bufp,list,size)
* default (force use of the default video method for environment)
* vga (use vga adapter code)
*/
# ifdef OVL1
int
assign_video(sopt)
char *sopt;
@@ -948,8 +898,6 @@ char *sopt;
}
return 1;
}
# endif /* OVL1 */
# ifdef OVL0
void tileview(enable)
boolean enable;
@@ -958,12 +906,15 @@ boolean enable;
if (iflags.grmode) vga_traditional(enable ? FALSE : TRUE);
#endif
}
# endif /* OVL0 */
#endif /* NO_TERMS */
#else /* STUBVIDEO */
void tileview(enable)
boolean enable;
{
}
#endif /* STUBVIDEO */
/*video.c*/

15
sys/msdos/vidtxt.c
View File

@@ -38,8 +38,6 @@ extern int attrib_gr_normal; /* graphics mode normal attribute */
extern int attrib_text_intense; /* text mode intense attribute */
extern int attrib_gr_intense; /* graphics mode intense attribute */
#ifdef OVLB
void
txt_get_scr_size()
{
@@ -84,7 +82,6 @@ txt_get_scr_size()
CO = regs.h.ah;
# endif /* PC9800 */
}
#endif /*OVLB*/
/*
* --------------------------------------------------------------
@@ -113,7 +110,6 @@ void FDECL(txt_get_cursor, (int *, int *));
extern int g_attribute; /* Current attribute to use */
extern int monoflag; /* 0 = not monochrome, else monochrome */
# ifdef OVLB
void
txt_backsp()
{
@@ -145,9 +141,7 @@ txt_nhbell()
regs.h.ah = 0x02; /* Character Output function */
(void) int86(DOSCALL, &regs, &regs);
}
# endif /* OVLB */
# ifdef OVL0
void
txt_clear_screen()
/* djgpp provides ScreenClear(), but in version 1.09 it is broken
@@ -254,9 +248,7 @@ txt_cl_eos() /* clear to end of screen */
(void) int86(VIDEO_BIOS, &regs, &regs); /* Scroll or initialize window */
# endif
}
# endif /* OVL0 */
# ifdef OVLB
void
txt_startup(wid, hgt)
int *wid, *hgt;
@@ -269,7 +261,6 @@ txt_startup(wid, hgt)
attrib_gr_intense = attrib_text_intense;
g_attribute = attrib_text_normal; /* Give it a starting value */
}
# endif /* OVLB */
/*
* Screen output routines (these are heavily used).
@@ -295,7 +286,6 @@ txt_startup(wid, hgt)
* (that include wintty.h) are actually using these routines.
*/
# ifdef OVL0
void
txt_xputs(s,col,row)
const char *s;
@@ -372,7 +362,6 @@ int attr;
txt_gotoxy(col,row);
# endif /* PC9800 */
}
# endif /* OVL0 */
/*
* This marks the end of the general screen output routines that are
@@ -396,7 +385,6 @@ int attr;
* the location of the player on the NetHack level.
*/
# ifdef OVL0
# if defined(SCREEN_BIOS) && !defined(PC9800)
/*
* This is implemented as a macro under DJGPPFAST.
@@ -447,14 +435,12 @@ int x,y;
* returns nothing. -3.
*/
}
# endif /* OVL0 */
/*
* This marks the end of the cursor manipulation/information routines.
* -------------------------------------------------------------------
*/
# ifdef OVLB
# ifdef MONO_CHECK
int txt_monoadapt_check()
{
@@ -466,7 +452,6 @@ int txt_monoadapt_check()
return (regs.h.al == 7) ? 1 : 0; /* 7 means monochrome mode */
}
# endif /* MONO_CHECK */
# endif /* OVLB */
#endif /* NO_TERMS */
/* vidtxt.c */

42
sys/msdos/vidvga.c
View File

@@ -54,11 +54,6 @@
* the Video BIOS ROM on board the VGA adapter. Code in vga_WriteChar
* copies the appropriate pixels from the video ROM to the Video buffer.
*
* - Currently, most of the routines are in an ifdef OVLB.
* If you change that, you may have to muck with some of the
* variable declarations which now assume this. This is not a
* problem in a non-overlaid environment (djgpp for example).
*
* - VGA 640 by 480, 16 colour mode (0x12) uses an odd method to
* represent a colour value from the palette. There are four
* planes of video memory, all overlaid at the same memory location.
@@ -153,7 +148,7 @@ STATIC_VAR struct map_struct {
for (x=0; x < COLNO; ++x) { map[y][x].glyph = cmap_to_glyph(S_stone); \
map[y][x].ch = S_stone; map[y][x].attr = 0; map[y][x].special = 0;} }
# define TOP_MAP_ROW 1
# if defined(OVLB)
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 viewport_size = 40;
/* STATIC_VAR char masktable[8]={0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01}; */
@@ -183,17 +178,6 @@ STATIC_VAR char defpalette[] = { /* Default VGA palette */
int vp[SCREENPLANES] = {8,4,2,1};
# endif
int vp2[SCREENPLANES] = {1,2,4,8};
# else
extern int vgacmap[CLR_MAX];
extern int viewport_size;
extern char masktable[8];
extern char bittable[8];
extern char defpalette[];
# ifndef ALTERNATE_VIDEO_METHOD
extern int vp[SCREENPLANES];
# endif
extern int vp2[SCREENPLANES];
# endif /* OVLB */
STATIC_VAR struct planar_cell_struct *planecell;
STATIC_VAR struct overview_planar_cell_struct *planecell_O;
@@ -205,18 +189,12 @@ STATIC_VAR struct tibhdr_struct tibheader;
/* STATIC_VAR int g_attribute; */ /* Current attribute to use */
#ifdef OVLB
void
vga_get_scr_size()
{
CO = 80;
LI = 29;
}
#endif /*OVLB*/
# ifdef OVLB
void
vga_backsp()
@@ -230,9 +208,6 @@ vga_backsp()
vga_gotoloc(col,row);
}
# endif /* OVLB */
# ifdef OVL0
void
vga_clear_screen(colour)
int colour;
@@ -292,10 +267,6 @@ int cy;
}
}
# endif /* OVL0 */
# ifdef OVLB
void
vga_tty_end_screen()
{
@@ -321,7 +292,6 @@ vga_tty_startup(wid, hgt)
attrib_gr_intense = ATTRIB_VGA_INTENSE;
g_attribute = attrib_gr_normal; /* Give it a starting value */
}
# endif /* OVLB */
/*
* Screen output routines (these are heavily used).
@@ -344,7 +314,6 @@ vga_tty_startup(wid, hgt)
*
*/
# ifdef OVL0
void
vga_xputs(s,col,row)
const char *s;
@@ -537,8 +506,6 @@ boolean clearfirst;
}
}
# endif /* USE_TILES && CLIPPING */
# endif /* OVL0 */
# ifdef OVL2
void
vga_userpan(left)
@@ -668,9 +635,7 @@ boolean left;
}
}
# endif /* SCROLLMAP */
# endif /* OVL2 */
# ifdef OVLB
STATIC_OVL void
decal_planar(gp, special)
struct planar_cell_struct *gp;
@@ -1004,10 +969,6 @@ int len,col,row,colour;
}
}
# endif /* OVLB */
# ifdef OVLB
/*
* Initialize the VGA palette with the desired colours. This
* must be a series of 48 bytes for use with a card in
@@ -1474,7 +1435,6 @@ vga_HideCursor()
egawriteplane(15);
}
# endif /* SIMULATE_CURSOR */
# endif /* OVLB */
#endif /* SCREEN_VGA */
/* vidvga.c */

22
sys/share/pcmain.c
View File

@@ -29,14 +29,7 @@
#include <unistd.h> /* for getcwd() prototype */
#endif
#ifdef OVL0
#define SHARED_DCL
#else
#define SHARED_DCL extern
#endif
SHARED_DCL char orgdir[PATHLEN]; /* also used in pcsys.c, amidos.c */
char orgdir[PATHLEN]; /* also used in pcsys.c, amidos.c */
#ifdef TOS
boolean run_from_desktop = TRUE; /* should we pause before exiting?? */
@@ -67,23 +60,16 @@ extern void NDECL(mswin_destroy_reg);
STATIC_DCL char *FDECL(exepath,(char *));
#endif
#ifdef OVL0
int FDECL(main, (int,char **));
#endif
extern void FDECL(pcmain, (int,char **));
#if defined(__BORLANDC__) && !defined(_WIN32)
void NDECL( startup );
# ifdef OVLB
unsigned _stklen = STKSIZ;
# else
extern unsigned _stklen;
# endif
#endif
#ifdef OVL0
/* If the graphics version is built, we don't need a main; it is skipped
* to help MinGW decide which entry point to choose. If both main and
* WinMain exist, the resulting executable won't work correctly.
@@ -104,8 +90,6 @@ char *argv[];
return 0;
}
#endif /*MSWIN_GRAPHICS*/
#endif /*OVL0*/
#ifdef OVL1
void
pcmain(argc,argv)
@@ -667,8 +651,6 @@ boolean wr;
if (wr) check_recordfile(dir ? dir : thisdir);
}
#endif /* CHDIR */
#endif /*OVL1*/
#ifdef OVLB
#ifdef PORT_HELP
# if defined(MSDOS) || defined(WIN32)
@@ -718,5 +700,5 @@ char *str;
return tmp;
}
#endif /* EXEPATH */
#endif /*OVLB*/
/*pcmain.c*/

4
sys/share/pcunix.c
View File

@@ -19,8 +19,6 @@ extern void NDECL(backsp);
extern void NDECL(clear_screen);
#endif
#ifdef OVLB
#if 0
static struct stat buf;
#endif
@@ -292,8 +290,6 @@ register char *s;
*lp = '_';
}
# endif /* WIN32 */
#endif /* OVLB */
#ifdef __EMX__
void seteuid(int i){;}

8
sys/wince/winhack.c
View File

@@ -8,13 +8,7 @@
#include "mhmain.h"
#include "mhmap.h"
#ifdef OVL0
#define SHARED_DCL
#else
#define SHARED_DCL extern
#endif
SHARED_DCL char orgdir[PATHLEN]; /* also used in pcsys.c, amidos.c */
extern char orgdir[PATHLEN]; /* also used in pcsys.c, amidos.c */
extern void FDECL(nethack_exit,(int));
static TCHAR* _get_cmd_arg(TCHAR* pCmdLine);