diff --git a/src/avp/win95/vision.c b/src/avp/win95/vision.c index ad95ae5..d705783 100644 --- a/src/avp/win95/vision.c +++ b/src/avp/win95/vision.c @@ -47,7 +47,6 @@ extern int NormalFrameTime; extern int GlobalAmbience; /* JH 29/5/97 - to control how D3D does the lighting */ struct D3DLightColourControl d3d_light_ctrl; -struct D3DOverlayColourControl d3d_overlay_ctrl; /*KJL**************************************************************************************** * F U N C T I O N S * ****************************************************************************************KJL*/ diff --git a/src/avp/win95/vision.h b/src/avp/win95/vision.h index 0e2aa00..998b471 100644 --- a/src/avp/win95/vision.h +++ b/src/avp/win95/vision.h @@ -60,29 +60,6 @@ struct D3DLightColourControl }; extern struct D3DLightColourControl d3d_light_ctrl; -/* JH 6/4/97 - define a structure to control an alpha channelled coloured overlay */ -//extern D3DINFO d3d; -//#define d3d_overlays_available ((d3d.ThisDriver.dpcTriCaps.dwSrcBlendCaps & (D3DPBLENDCAPS_SRCALPHA|D3DPBLENDCAPS_INVSRCALPHA))==(D3DPBLENDCAPS_SRCALPHA|D3DPBLENDCAPS_INVSRCALPHA)) -#define d3d_overlays_available 1 - -enum D3DOCC_Mode -{ - OCCM_NORMAL, /* default behaviour - all other parms ignored */ - OCCM_ON, /* r,g,b,alpha specify a colour of a light to use instead of white */ -}; - -struct D3DOverlayColourControl -{ - enum D3DOCC_Mode ctrl; - - /* these should be in [0..255] */ - int r; - int g; - int b; - int alpha; -}; - - /* KJL 17:07:29 10/02/98 - all new vision modes */ enum VISION_MODE_ID { diff --git a/src/main.c b/src/main.c index 11eaa94..5081210 100644 --- a/src/main.c +++ b/src/main.c @@ -1260,7 +1260,6 @@ if (AvP_MainMenus()) /* turn off any special effects */ d3d_light_ctrl.ctrl = LCCM_NORMAL; - d3d_overlay_ctrl.ctrl = OCCM_NORMAL; SetOGLVideoMode(VideoModeList[CurrentVideoMode].w, VideoModeList[CurrentVideoMode].h);