diff options
| author | Steven Fuller <relnev@icculus.org> | 2008-05-04 15:17:55 -0700 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:37 +0200 |
| commit | 9b449609fac7b23f2f9655ce2d766f1f56679ba4 (patch) | |
| tree | 437781bff4f72b2d4bd3220f657a58ef516c18b5 /src/include | |
| parent | 361c1319328308341d00a8c6dacc28e6096dd041 (diff) | |
Removed SupportWindows95 and platform_pc macros.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/mem3dc.h | 6 | ||||
| -rw-r--r-- | src/include/module.h | 2 | ||||
| -rw-r--r-- | src/include/prototyp.h | 8 | ||||
| -rw-r--r-- | src/include/shape.h | 11 |
4 files changed, 1 insertions, 26 deletions
diff --git a/src/include/mem3dc.h b/src/include/mem3dc.h index 4bc4450..b1a1154 100644 --- a/src/include/mem3dc.h +++ b/src/include/mem3dc.h @@ -12,7 +12,6 @@ #include <stddef.h> /* defines */ -#if SupportWindows95 #if 1 #define DBGMALLOC 0 #else @@ -26,7 +25,6 @@ #define DBGMALLOC 1 #endif #endif -#endif /* parameters for DumpMallocInfo */ #define PARTIALDUMP 0 /* print outstanding mallocs number and total memory allocated */ @@ -43,11 +41,7 @@ a separate copy of the string for each malloc - just store the pointer. So, on PC this reduces the data size for the malloc records from 1.04Mb to 320K ! */ -#if SupportWindows95 #define COPY_FILENAME 0 /* new behavior */ -#else -#define COPY_FILENAME 1 /* previous behavior */ -#endif /* platform specific memory allocation and deallocation declarations */ extern void *AllocMem(size_t __size); diff --git a/src/include/module.h b/src/include/module.h index 2c64a17..ac68355 100644 --- a/src/include/module.h +++ b/src/include/module.h @@ -275,9 +275,7 @@ typedef struct module { MATRIXCH m_mat; /* Internal use only */ - #if SupportWindows95 char * name; - #endif WAYPOINT_HEADER *m_waypoints; diff --git a/src/include/prototyp.h b/src/include/prototyp.h index 5a84c89..71095b7 100644 --- a/src/include/prototyp.h +++ b/src/include/prototyp.h @@ -479,9 +479,7 @@ typedef struct screendescriptorblock { int SDB_Width; int SDB_Height; int SDB_Depth; - #if SupportWindows95 int SDB_ScreenDepth; - #endif int SDB_Size; int SDB_DiagonalWidth; @@ -593,9 +591,7 @@ typedef struct viewdescriptorblock { int VDB_Width; int VDB_Height; int VDB_Depth; - #if SupportWindows95 int VDB_ScreenDepth; - #endif int VDB_CentreX; int VDB_CentreY; @@ -865,9 +861,7 @@ typedef struct displayblock SHAPEHEADER* ObShapeData; - #if SupportWindows95 char * name; - #endif #if (SupportMorphing && LazyEvaluationForMorphing) VECTORCH *ObMorphedPts; @@ -1996,9 +1990,7 @@ typedef struct i_gouraud3dtexturepolygon_scan { */ -#if SupportWindows95 void ClearScreen(SCREENDESCRIPTORBLOCK *sdb, int Colour); -#endif void PlatformSpecificShowViewEntry(VIEWDESCRIPTORBLOCK *vdb, SCREENDESCRIPTORBLOCK *sdb); diff --git a/src/include/shape.h b/src/include/shape.h index 5ef5c10..2f4981f 100644 --- a/src/include/shape.h +++ b/src/include/shape.h @@ -2,16 +2,13 @@ #define SHAPE_INCLUDED #include "aw.h" // AW_BACKUPTEXTUREHANDLE + /* Header File for Shape Data */ -#ifndef SupportWindows95 /* Enable so that PC code is used */ -#define SupportWindows95 1 -#endif - #include "shpanim.h" @@ -527,9 +524,7 @@ typedef struct merged_poly #else - #if platform_pc #define iflag_zbuffer_w 0x00000080 /* Z-Buffer, Write-Only */ - #endif #endif /* InterfaceEngine */ @@ -550,9 +545,7 @@ typedef struct merged_poly #define iflag_no_mip 0x00008000 /* Use Index #0 */ -#if platform_pc #define iflag_zbuffer_r 0x00010000 /* Z-Buffer, Read-Only */ -#endif #define iflag_linear 0x00020000 /* Linear Interpolation */ @@ -783,12 +776,10 @@ typedef struct imageheader { TEXTURE *ImagePtr; /* Pointer to texture in memory */ -#if SupportWindows95 LPDIRECTDRAWSURFACE DDSurface; LPDIRECT3DTEXTURE D3DTexture; D3DTEXTUREHANDLE D3DHandle; AW_BACKUPTEXTUREHANDLE hBackup; -#endif int ImageNum; /* # MIP images */ char ImageName[ImageNameSize]; /* Filename */ |