More compiling.

src/win95/awtexld.cpp

@@ -1,4 +1,5 @@
-#include "advwin32.h"
+#include "fixer.h"
+
 #ifndef DB_LEVEL
 #define DB_LEVEL 4
 #endif
@@ -19,10 +20,8 @@
 #include <stdarg.h>
 #include <limits.h>
 
-#include "awTexLd.h"
-#pragma warning(disable: 4701)
-#include "awTexLd.hpp"
-#pragma warning(default: 4701)
+#include "awtexld.h"
+#include "awtexld.hpp"
 
 #ifdef _CPPRTTI
 	#include <typeinfo.h>

src/win95/dd_func.cpp

@@ -53,7 +53,7 @@ LPDIRECTDRAW            lpDD;           // DirectDraw object
 LPDIRECTDRAWSURFACE     lpDDSPrimary;   // DirectDraw primary surface
 LPDIRECTDRAWSURFACE     lpDDSBack;      // DirectDraw back surface
 LPDIRECTDRAWSURFACE     lpDDSHiddenBack; // for system memory rendering target, stable configuration
-LPDIRECTDRAWPALETTE     lpDDPal[MaxPalettes];        // DirectDraw palette
+LPDIRECTDRAWPALETTE     lpDDPal[1];        // DirectDraw palette
 #if debug || PreBeta
 LPDIRECTDRAWSURFACE     lpDDDbgFont; // Debugging font, specific to current video mode
 #endif

src/win95/io.c

@@ -35,25 +35,6 @@
 /* As specified by Roxby */
 #define ClearScreenColour 1000
 
-/*
-   To filter frame rate values from
-   Windows timer to provide a smoother
-   ride.  This may make some AI systems
-   etc behave better, though it will take
-   some time to catch up if there is a genuine
-   abrupt transition in the frame rate.
-
-   There may also be some sort of convergence
-   instability here!!!! IMPORTANT
-   FIXME!!!! (possibly)
-
-   Although this code was derived from
-   some of Jamie's filter algorithms, I have
-   mangled it hideously, so _don't blame him_!
-*/
-
-#define KalmanTimer No
-
 /*
   Experiment to try and fix mystery driver problems
   Don't set with ForceWindowsPalette on!!!

src/win95/platform.h

@@ -59,24 +59,6 @@ typedef enum {
 
 } PROCESSORTYPES;
 
-
-/*
-
- VGA Palette Entry
-
-*/
-
-typedef struct vgapaletteentry {
-
-	unsigned char vga_r;
-	unsigned char vga_g;
-	unsigned char vga_b;
-
-} VGAPALETTEENTRY;
-
-
-extern void LoadAndChangeToPalette(char*);
-
 /*
 	Video mode decsription (to be filled
 	in by DirectDraw callback).
@@ -377,15 +359,6 @@ typedef enum {
 #define MaxScreenWidth 1600		/* Don't get this wrong! */
 
 
-/*
-	Max no of palettes -- at present there is NO
-	code for palette switching and ALL palette
-	calls within the DirectDraw interface system
-	run on palette 0
-*/
-
-#define MaxPalettes 4 
-
 /*
 
  Video Mode Types
@@ -447,21 +420,6 @@ typedef enum {
 
 } VIDEORESTARTMODES;
 
-/*
-	Load modes for putting an image
-	in a DirectDraw surface --- either
-	do or do not deallocate the
-	system memory image, but always
-	keep the DirectDraw one
-*/
-
-typedef enum {
-
-	LoadModeDirectDrawOnly,
-	LoadModeFull
-
-} IMAGELOADMODES;
-
 
 /*
 	Direct3D driver modes
@@ -562,42 +520,6 @@ typedef enum {
 
 } DXMEMORYMODES;
 
-/*
-
- .BMP File header
-
-*/
-
-/* 
-  Pack the header to 1 byte alignment so that the 
-  loader works (John's code, still under test).
-*/
-
-typedef struct bmpheader {
-
-	unsigned short BMP_ID;	/* Contains 'BM' */
-	int BMP_Size;
-
-	short BMP_Null1;
-	short BMP_Null2;
-
-	int BMP_Image;		/* Byte offset of image start relative to offset 14 */
-	int BMP_HeadSize;	/* Size of header (40 for Windows, 12 for OS/2) */
-	int BMP_Width;		/* Width of image in pixels */
-	int BMP_Height;		/* Height of image in pixels */
-
-	short BMP_Planes;	/* Number of image planes (must be 1) */
-	short BMP_Bits;		/* Number of bits per pixel (1,4,8 or 24) */
-
-	int BMP_Comp;			/* Compression type */
-	int BMP_CSize;		/* Size in bytes of compressed image */
-	int BMP_Hres;			/* Horizontal resolution in pixels/meter */
-	int BMP_Vres;			/* Vertical resolution in pixels/meter */
-	int BMP_Colours;		/* Number of colours used, below (N) */
-	int BMP_ImpCols;		/* Number of important colours */
-
-} PACKED BMPHEADER;
-
 /*
 	Types of texture files that can be
 	requested from the main D3D texture
@@ -802,7 +724,6 @@ int textprint(const char* t, ...);
 //#endif
 
 
-void MakePaletteShades(VGAPALETTEENTRY *vga_palptr, int hue, int pal_shades_per_hue);
 void ConvertToDDPalette(unsigned char* src, unsigned char* dst, int length, int flags);
 int textprintXY(int x, int y, const char* t, ...);
 void LoadSystemFonts(char* fname);