From 936a5198e46e3c7a8f72959373a69336b1697e76 Mon Sep 17 00:00:00 2001
From: Steven Fuller <relnev@icculus.org>
Date: Thu, 12 Jul 2001 17:22:07 +0000
Subject: lots of small changes that didn't get checked in

---
 src/win95/d3_func.h  | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/win95/inline.h   |  4 +++-
 src/win95/platform.h |  8 ++++----
 3 files changed, 49 insertions(+), 5 deletions(-)

(limited to 'src/win95')

diff --git a/src/win95/d3_func.h b/src/win95/d3_func.h
index eedbd5e..b369add 100644
--- a/src/win95/d3_func.h
+++ b/src/win95/d3_func.h
@@ -5,6 +5,47 @@
 extern "C" {
 #endif
 
+
+/* KJL 14:24:45 12/4/97 - render state information */
+enum TRANSLUCENCY_TYPE
+{
+	TRANSLUCENCY_OFF,
+	TRANSLUCENCY_NORMAL,
+	TRANSLUCENCY_INVCOLOUR,
+	TRANSLUCENCY_COLOUR,
+	TRANSLUCENCY_GLOWING,
+	TRANSLUCENCY_DARKENINGCOLOUR,
+	TRANSLUCENCY_JUSTSETZ,
+	TRANSLUCENCY_NOT_SET
+};
+
+enum FILTERING_MODE_ID
+{
+	FILTERING_BILINEAR_OFF,
+	FILTERING_BILINEAR_ON,
+	FILTERING_NOT_SET
+};
+
+typedef struct
+{
+	enum TRANSLUCENCY_TYPE TranslucencyMode;
+	enum FILTERING_MODE_ID FilteringMode;
+	int FogDistance;
+	unsigned int FogIsOn :1;
+	unsigned int WireFrameModeIsOn :1;
+
+} RENDERSTATES;
+
+typedef struct D3DTextureFormat {
+//    DDSURFACEDESC ddsd; /* DDSURFACEDESC for the surface description */
+    BOOL Palette;   /* is Palettized? */
+    int RedBPP;         /* #red bits per pixel */
+    int BlueBPP;        /* #blue bits per pixel */
+    int GreenBPP;       /* #green bits per pixel */
+    int IndexBPP;       /* number of bits in palette index */
+} D3DTEXTUREFORMAT;
+
+#if 0 // disabled direct3d stuff 
 /*
   Direct3D globals
 */
@@ -95,6 +136,7 @@ typedef struct
 
 } RENDERSTATES;
 
+#endif
 
 
 
diff --git a/src/win95/inline.h b/src/win95/inline.h
index 30b7faa..719daf3 100644
--- a/src/win95/inline.h
+++ b/src/win95/inline.h
@@ -1228,7 +1228,9 @@ int NarrowDivide(LONGLONGCH *a, int b);
 int WideMulNarrowDiv(int a, int b, int c);
 void RotateVector_ASM(VECTORCH *v, MATRIXCH *m);
 void RotateAndCopyVector_ASM(VECTORCH *v1, VECTORCH *v2, MATRIXCH *m);
-int f2i(float f);
+
+int FloatToInt(float);
+#define f2i(a, b) { a = FloatToInt(b); }
 
 #endif
 
diff --git a/src/win95/platform.h b/src/win95/platform.h
index 6198d94..cefebf1 100644
--- a/src/win95/platform.h
+++ b/src/win95/platform.h
@@ -817,11 +817,11 @@ void ReleaseDirectMouse(void);
 /*
 	Internal
 */
-#ifdef AVP_DEBUG_VERSION
+//#ifdef AVP_DEBUG_VERSION
 int textprint(const char* t, ...);
-#else
-#define textprint(ignore)
-#endif
+//#else
+//#define textprint(ignore)
+//#endif
 
 
 void MakePaletteShades(VGAPALETTEENTRY *vga_palptr, int hue, int pal_shades_per_hue);
-- 
cgit v1.3