From fc5b084897d1e0a9eb4a3557d517607609f4d4e5 Mon Sep 17 00:00:00 2001 From: Steven Fuller Date: Tue, 7 Aug 2001 04:48:41 +0000 Subject: Removed some unused bits. --- src/include/prototyp.h | 208 ------------------------------------------------- src/include/shape.h | 32 -------- 2 files changed, 240 deletions(-) (limited to 'src/include') diff --git a/src/include/prototyp.h b/src/include/prototyp.h index bf965b1..2954480 100644 --- a/src/include/prototyp.h +++ b/src/include/prototyp.h @@ -34,24 +34,8 @@ /* Grrr!! That's the last time these will be missing! */ /* Oh, CDF 18/12/97 */ -#if platform_pc extern int sine[]; extern int cosine[]; -#endif - -/* - - A general system file header structure, storing the TYPE of the file as a - four character string, and the SIZE of the file as an unsigned 32-bit value. - -*/ - -typedef struct fileheaderch { - - char fh_type[4]; - unsigned int fh_size; - -} FILEHEADERCH; typedef struct vectorch { @@ -117,9 +101,6 @@ typedef struct line { - - - typedef struct euler { int EulerX; @@ -724,15 +705,6 @@ typedef struct viewdescriptorblock { #define ViewDB_Flag_drawtx3das2d 0x00080000 -/* - Neal - for starfields (currently only available - on Windows 95, all modes) -*/ - - -#define ViewDB_Flag_Starfield 0x00100000 - - /* test the flags with "& VDB_Trunc" to see if any truncation occurred */ #define VDB_Trunc (ViewDB_Flag_LTrunc | ViewDB_Flag_RTrunc | ViewDB_Flag_UTrunc | ViewDB_Flag_DTrunc) @@ -1130,50 +1102,6 @@ typedef struct p3d { } P3D; - -/* - - Standard Points - Z-Buffered - -*/ - -#if ZBufferTest - -typedef struct p2d_zb { - - VECTOR2D point2d; - int z2d; - -} P2D_ZB; - -typedef struct p3d_zb { - - VECTORCH point3d; - int z3d; - -} P3D_ZB; - -#endif - -#if SupportZBuffering - -typedef struct p2d_zb { - - VECTOR2D point2d; - float z2d; - -} P2D_ZB; - -typedef struct p3d_zb { - - VECTORCH point3d; - float z3d; - -} P3D_ZB; - -#endif - - /* Gouraud Points @@ -1194,55 +1122,6 @@ typedef struct p3d_gouraud { } P3D_GOURAUD; - -/* - - Gouraud Points - Z-Buffered - -*/ - -#if ZBufferTest - -typedef struct p2d_gouraud_zb { - - VECTOR2D point2d; - int i2d; - int zg2d; - -} P2D_GOURAUD_ZB; - -typedef struct p3d_gouraud_zb { - - VECTORCH point3d; - int i3d; - int zg3d; - -} P3D_GOURAUD_ZB; - -#endif - -#if SupportZBuffering - -typedef struct p2d_gouraud_zb { - - VECTOR2D point2d; - int i2d; - float zg2d; - -} P2D_GOURAUD_ZB; - -typedef struct p3d_gouraud_zb { - - VECTORCH point3d; - int i3d; - float zg3d; - -} P3D_GOURAUD_ZB; - -#endif - - - /* Phong Points @@ -1371,39 +1250,6 @@ typedef struct p3d_texture3d { #endif - -/* - - Texture 3d Points - Z-Buffered - -*/ - -#if 0 -#if (support3dtextures && SupportZBuffering) - -typedef struct p2d_texture3d_zb { - - VECTOR2D point2d; - float u2d_tx3d; - float v2d_tx3d; - float z2d_tx3d; - -} P2D_TEXTURE3D_ZB; - - -typedef struct p3d_texture3d_zb { - - VECTORCH point3d; - float u3d_tx3d; - float v3d_tx3d; - float z3d_tx3d; - -} P3D_TEXTURE3D_ZB; - -#endif -#endif - - /* Gouraud Texture 2d Points @@ -2203,36 +2049,6 @@ void UpdateGame(void); SHAPEHEADER* GetShapeData(int shapenum); -#if flic_player - -/* - - FLIC File Player and Options - -*/ - -int PlayFLICFile(char *fname, int fflags, int floops, unsigned char *pal); - -#define FFlag_DiskPlay 0x00000001 /* Force a disk play */ - -#define FFlag_FadeDownFirst 0x00000002 /* First FLIC only */ - -#define FFlag_RestoreScreen 0x00000004 /* Last FLIC only - - Copy the current contents - of the screen buffer back to - the video memory and fade up - the old palette */ - -#define FFlag_EnableFade 0x00000008 /* NOT fading is the default */ - - #endif - - - - - - - void InitialiseObjectBlocks(void); DISPLAYBLOCK* AllocateObjectBlock(void); @@ -2754,13 +2570,9 @@ int LoadBackdrop(char *image, IMAGEHEADER *ihdr); void GetProjectFilename(char *fname, char *image); -int CompareStringCH(char *string1, char *string2); - void GetDOSFilename(char *fnameptr); int CompareFilenameCH(char *string1, char *string2); -void CopyMemoryCH(void *source, void *dest, int c); - TEXTURE* LoadImageCH(char *fname, IMAGEHEADER *iheader); TEXTURE* LoadBMP(char *fname, IMAGEHEADER *iheader); TEXTURE* LoadPGM(char *fname, IMAGEHEADER *iheader); @@ -2771,20 +2583,9 @@ void MakeTextureLightingTableRaw256(unsigned char *palette); void Create_MIP_Map(IMAGEHEADER *iheader); -int** ShadingTables(SHAPEHEADER **sh_list); -PALCREATIONDATA* CreatePaletteCH(SHAPEHEADER **sh_list, int pstart, int pent, unsigned char *pal); -PALCREATIONDATA* CreateRaw256PaletteCH(SHAPEHEADER **sh_list, unsigned char *pal); -void RemapShapesForCreatePaletteCH(SHAPEHEADER **sh_list); - -void ClearShadingTables(void); -void ClearPaletteShadingTables(void); - int NextLowPower2(int i); -void PlotPixelTest(int x, int y, unsigned char col); - - /* User Input */ void ReadUserInput(void); @@ -2894,15 +2695,6 @@ void DrawPalette(int x0, int y0, int x1, int y1); */ -typedef enum { - - DrawPerFrame, - DrawPerVDB, - DrawPerObject - -} DRAWMODES; - - typedef enum { Boundary_Left, diff --git a/src/include/shape.h b/src/include/shape.h index 9bd7e6c..3f3057b 100644 --- a/src/include/shape.h +++ b/src/include/shape.h @@ -34,38 +34,6 @@ #define col24(r, g, b) ((r << 16) + (g << 8) + b) -/* - - Maximum number shading tables. - - This equate might have to be moved to "system.h" - -*/ - -#define MaxShadingTables 4096 - - - -/* - - Palette Creation Function Structure - -*/ - -typedef struct palcreationdata { - - unsigned char** PCD_ArrayPtr; - int PCD_NumHues; - int PCD_ShadesPerHue; - int PCD_NumColsUsed; - -} PALCREATIONDATA; - - - - - - /* Shape Item Function Array Indices -- cgit v1.3