diff options
| author | Steven Fuller <relnev@icculus.org> | 2001-07-05 18:05:07 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:36 +0200 |
| commit | 1fcf3c028ae1eb5072e70fa0a8a856dfbfae595b (patch) | |
| tree | fa8525b82613bee8b819ce12b7e37dc044ec248c /src/include | |
| parent | 49c2203275d1e8480f8778c8d8ce2a7947278b67 (diff) | |
afont.c now builds
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/prototyp.h | 25 | ||||
| -rw-r--r-- | src/include/shape.h | 19 |
2 files changed, 9 insertions, 35 deletions
diff --git a/src/include/prototyp.h b/src/include/prototyp.h index 6405685..d00ac1c 100644 --- a/src/include/prototyp.h +++ b/src/include/prototyp.h @@ -1,4 +1,5 @@ #ifndef PROTOTYP_INCLUDED +#define PROTOTYP_INCLUDED /* @@ -2470,22 +2471,13 @@ void BackFaceCullPointOutcodeFlagging(void); */ -#if SupportWindows95 -void InitialiseSystem(HINSTANCE hInstance, int nCmdShow); -#else void InitialiseSystem(void); -#endif - void InitialiseRenderer(void); - void ExitSystem(void); - void InitialVideoMode(void); - void ResetFrameCounter(void); void FrameCounterHandler(void); -#if SupportWindows95 void DirectWriteD3DLine(VECTOR2D* LineStart, VECTOR2D* LineEnd, int LineColour); void* LoadImageIntoDirectDrawSurface(char *fname, IMAGEHEADER *iheader, int ImageLoadMode, BOOL Sysmem); @@ -2499,19 +2491,6 @@ int GetTextureHandle(IMAGEHEADER *imageHeaderPtr); void* LoadFontIntoDirectDrawSurface(char *fname, IMAGEHEADER *iheader); void ClearScreen(SCREENDESCRIPTORBLOCK* sdb, int Colour); -#ifdef __cplusplus -LPDIRECTDRAWSURFACE LoadPPMInD3DMode(char* fname, - LPDDSURFACEDESC lpFormat, IMAGEHEADER* iheader, - int MemoryType); -LPDIRECTDRAWSURFACE LoadPPMIntoDDSurface(LPDIRECTDRAWSURFACE lpDDS, - DDSURFACEDESC format, int Height, int Width, - IMAGEHEADER* iheader, BOOL Quantise, FILE* fp, - int psize, int pcaps, char* fname, int MipNum); -LPDIRECTDRAWSURFACE LoadPGMInD3DMode(char* fname, - LPDDSURFACEDESC lpFormat, IMAGEHEADER* iheader, - int MemoryType); -#endif // for __cplusplus -#endif // for SupportWindows95 void InitGame(void); void StartGame(void); @@ -2986,6 +2965,6 @@ int Approximate3dMagnitude(VECTORCH *v); #endif -#define PROTOTYP_INCLUDED + #endif diff --git a/src/include/shape.h b/src/include/shape.h index 32ed022..e1c7919 100644 --- a/src/include/shape.h +++ b/src/include/shape.h @@ -1,5 +1,7 @@ #ifndef SHAPE_INCLUDED +#define SHAPE_INCLUDED +#include "aw.h" // AW_BACKUPTEXTUREHANDLE /* Header File for Shape Data @@ -826,17 +828,12 @@ typedef struct imageheader { TEXTURE *ImagePtr; /* Pointer to texture in memory */ - #if SupportWindows95 - - LPDIRECTDRAWSURFACE DDSurface; - - LPDIRECT3DTEXTURE D3DTexture; - - D3DTEXTUREHANDLE D3DHandle; - +#if SupportWindows95 +// LPDIRECTDRAWSURFACE DDSurface; +// LPDIRECT3DTEXTURE D3DTexture; +// D3DTEXTUREHANDLE D3DHandle; AW_BACKUPTEXTUREHANDLE hBackup; - - #endif +#endif int ImageNum; /* # MIP images */ char ImageName[ImageNameSize]; /* Filename */ @@ -1096,7 +1093,5 @@ typedef enum { #endif -#define SHAPE_INCLUDED #endif - |