From 1633f29eab1ea350c84a1c512ec2994963f19149 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 3 Mar 2013 01:03:33 +0000 Subject: [PATCH] Move */include/grdef.h -> common/include/grdef.h Drop the special case for Metrowerks in Descent I. --- {d2x-rebirth => common}/include/grdef.h | 2 + d1x-rebirth/include/grdef.h | 115 ------------------------ 2 files changed, 2 insertions(+), 115 deletions(-) rename {d2x-rebirth => common}/include/grdef.h (98%) delete mode 100644 d1x-rebirth/include/grdef.h diff --git a/d2x-rebirth/include/grdef.h b/common/include/grdef.h similarity index 98% rename from d2x-rebirth/include/grdef.h rename to common/include/grdef.h index 8b882a743..72e7c2698 100644 --- a/d2x-rebirth/include/grdef.h +++ b/common/include/grdef.h @@ -17,9 +17,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#ifdef DXX_BUILD_DESCENT_II void gr_init_bitmap_alloc( grs_bitmap *bm, int mode, int x, int y, int w, int h, int bytesperline); void gr_init_sub_bitmap (grs_bitmap *bm, grs_bitmap *bmParent, int x, int y, int w, int h ); void gr_init_bitmap( grs_bitmap *bm, int mode, int x, int y, int w, int h, int bytesperline, unsigned char * data ); +#endif extern void gr_set_buffer(int w, int h, int r, int (*buffer_func)()); diff --git a/d1x-rebirth/include/grdef.h b/d1x-rebirth/include/grdef.h deleted file mode 100644 index fc3a28321..000000000 --- a/d1x-rebirth/include/grdef.h +++ /dev/null @@ -1,115 +0,0 @@ -/* -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS -SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE -FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE -CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ -/* - * $Source: /cvsroot/dxx-rebirth/d1x-rebirth/include/grdef.h,v $ - * $Revision: 1.1.1.1 $ - * $Author: zicodxx $ - * $Date: 2006/03/17 19:46:35 $ - * - * Internal definitions for graphics lib. - * - * $Log: grdef.h,v $ - * Revision 1.1.1.1 2006/03/17 19:46:35 zicodxx - * initial import - * - * Revision 1.2 1999/11/20 10:05:16 donut - * variable size menu patch from Jan Bobrowski. Variable menu font size support and a bunch of fixes for menus that didn't work quite right, by me (MPM). - * - * Revision 1.1.1.1 1999/06/14 22:02:14 donut - * Import of d1x 1.37 source. - * - * Revision 1.5 1995/09/14 15:36:33 allender - * added stuff for 68k version - * - * Revision 1.4 1995/07/05 16:10:57 allender - * gr_linear_movsd prototype changes - * - * Revision 1.3 1995/04/19 14:39:28 allender - * changed function prototype - * - * Revision 1.2 1995/04/18 09:49:53 allender - * *** empty log message *** - * - * Revision 1.1 1995/03/09 09:04:56 allender - * Initial revision - * - * - * --- PC RCS information --- - * Revision 1.8 1994/05/06 12:50:09 john - * Added supertransparency; neatend things up; took out warnings. - * - * Revision 1.7 1994/01/25 11:40:29 john - * Added gr_check_mode function. - * - * Revision 1.6 1993/10/15 16:22:53 john - * y - * - * Revision 1.5 1993/09/29 17:31:00 john - * added gr_vesa_pixel - * - * Revision 1.4 1993/09/29 16:14:43 john - * added global canvas descriptors. - * - * Revision 1.3 1993/09/08 17:38:02 john - * Looking for errors - * - * Revision 1.2 1993/09/08 15:54:29 john - * *** empty log message *** - * - * Revision 1.1 1993/09/08 11:37:57 john - * Initial revision - * - * - */ -#define USE_2D_ASM 1 - -extern void gr_set_buffer(int w, int h, int r, int (*buffer_func)()); - -extern void gr_pal_setblock( int start, int n, unsigned char * palette ); -extern void gr_pal_getblock( int start, int n, unsigned char * palette ); -extern void gr_pal_setone( int index, unsigned char red, unsigned char green, unsigned char blue ); - -void gr_linear_movsb( ubyte * source, ubyte * dest, int nbytes); -void gr_linear_movsw( ubyte * source, ubyte * dest, int nbytes); -#if ( defined(__MWERKS__) && defined(__MC68K__) && defined(USE_2D_ASM) ) -void gr_linear_movsd(ubyte * src:__A0, ubyte * dest:__A1, uint num_pixels:__D0 ); -#else -void gr_linear_movsd( ubyte * source, ubyte * dest, unsigned int nbytes); -#endif -void gr_linear_rep_movsd_2x( ubyte * source, ubyte * dest, uint nbytes); -void gr_linear_stosd( ubyte * dest, unsigned char color, unsigned int nbytes); -extern unsigned int gr_var_color; -extern unsigned int gr_var_bwidth; -extern unsigned char * gr_var_bitmap; - -void gr_linear_line( int x0, int y0, int x1, int y1); - -extern unsigned int Table8to32[256]; - -#ifdef __MSDOS__ -extern unsigned char * gr_video_memory; -#endif - - -#define MINX 0 -#define MINY 0 -#define MAXX (GWIDTH-1) -#define MAXY (GHEIGHT-1) -#define TYPE grd_curcanv->cv_bitmap.bm_type -#define DATA grd_curcanv->cv_bitmap.bm_data -#define XOFFSET grd_curcanv->cv_bitmap.bm_x -#define YOFFSET grd_curcanv->cv_bitmap.bm_y -#define ROWSIZE grd_curcanv->cv_bitmap.bm_rowsize -#define COLOR grd_curcanv->cv_color - -void order( int *x1, int *x2 );