From 332acfbf8bacc4beac1f7e7dd25f06ae0d39f53f Mon Sep 17 00:00:00 2001
From: Steven Fuller <relnev@icculus.org>
Date: Sun, 4 May 2008 04:17:26 -0700
Subject: [PATCH] Removed another old menu header.

---
 src/avp/win95/menugfx.h | 79 -----------------------------------------
 src/avp/win95/pcmenus.h | 62 --------------------------------
 src/avp/win95/pldnet.c  |  1 -
 3 files changed, 142 deletions(-)
 delete mode 100644 src/avp/win95/menugfx.h

diff --git a/src/avp/win95/menugfx.h b/src/avp/win95/menugfx.h
deleted file mode 100644
index 556ae06..0000000
--- a/src/avp/win95/menugfx.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef _included_menugfx_h_
-#define _included_menugfx_h_
-
-#include "aw.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "langenum.h"
-// structures used for the menu code
-
-typedef struct menugraphic {
-	char *filename;
-	int image_number;
-//	LPDIRECTDRAWSURFACE image_ptr;
-
-	AW_BACKUPTEXTUREHANDLE hBackup;
-	short destx;
-	short desty;
-	short width;
-	short height;
-
-} MENUGRAPHIC;
-
-/* JH 12/5/97 these were static in menuplat.cpp - but they're quite useful functions */
-extern void LoadMenuGraphic(MENUGRAPHIC* menugraphptr);
-extern void BLTMenuToScreen(MENUGRAPHIC* menuptr);
-extern void ReleaseMenuGraphic(MENUGRAPHIC* mptr);
-
-typedef struct menu_graphic_item{
-	int id;
-	MENUGRAPHIC On;
-	MENUGRAPHIC Off;
-} MENU_GRAPHIC_ITEM;
-
-
-
-/* KJL 15:23:39 05/03/97 - new menu_text_item, which
-looks as much like the menu_font_item as possible
-while enabling me to add language internationalization */
-typedef struct menu_text_item
-{
-	int id;
-	enum TEXTSTRING_ID StringID;
-	char *SecondStringPtr;
-	int X;
-	int Y;
-} MENU_TEXT_ITEM;
-
-
-
-// OVERALL menus - this describes one menu screen
-
-typedef struct avp_menu 
-{
- 	MENUGRAPHIC *backdrop;
-	MENU_GRAPHIC_ITEM *menugitems;
-	MENU_TEXT_ITEM *menufitems;
-	int previous_selection;
-	int default_selection;
-
-} AVP_MENU;
-
-
-#define BASEX 112
-#define BASEY 43
-
-
-extern AVP_MENU *Current_Menu;
-extern void ProcessGraphicForLoading(AVP_MENU *menu_to_load);
-extern void ProcessGraphicForUnloading(AVP_MENU *menu_to_load);
-
-extern void PlatformSpecificEnteringDatabase(void);
-extern void PlatformSpecificExitingDatabase(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ! _included_menugfx_h_ */
diff --git a/src/avp/win95/pcmenus.h b/src/avp/win95/pcmenus.h
index 36db6e2..e904265 100644
--- a/src/avp/win95/pcmenus.h
+++ b/src/avp/win95/pcmenus.h
@@ -5,8 +5,6 @@
 extern "C" {
 #endif
 
-#include "menugfx.h"
-
 #define ENABLE_SHADING_OPTION 0
 #define ENABLE_MIPMAP_OPTION 0
 
@@ -116,69 +114,9 @@ float GetUVScale(IMAGETYPEIDX);
 #define AMB_MODELESS 0x00000001 /* do not wait for select or blank screen */
 void AvpMessageBox(char const * text, char const * title, int flags);
 
-extern AVP_MENU OptionsMenuData;
-extern AVP_MENU VideoModeOptionsMenu;
-
 #ifdef __cplusplus
 }
 #endif
 
 
-
-
-/*
-	NEW CONTENT 1/4/98 by DHM:
-	--------------------------
-
-	Building the video options page for the new menu system, I need
-	access to various variables declared as static within PCMENUS.CPP
-
-	I've decided to access them through an export variable interface,
-	hoping this will make the code cleaner.
-*/
-#ifdef __cplusplus
-#	ifndef _expvar_hpp
-#		include "expvar.hpp"
-#	endif
-#	ifndef _scstring
-#		include "scstring.hpp"
-#	endif
-
-	namespace RebMenus
-	{
-		class ExportVariable_3dAcceleration : public ExportVariable<OurBool>
-		{
-		public:
-			OurBool Get(void) const;
-			void Set(OurBool NewVal);
-		};
-
-		class ExportVariable_ZBuffering : public ExportVariable<OurBool>
-		{
-		public:
-			OurBool Get(void) const;
-			void Set(OurBool NewVal);
-		};
-
-		class ExportVariable_BilinearFiltering : public ExportVariable<OurBool>
-		{
-		public:
-			OurBool Get(void) const;
-			void Set(OurBool NewVal);
-		};
-
-		class VideoModeSelection
-		{
-		public:
-			static SCString* DescribeCurrentSelection(void);
-			static void Dec(void);
-			static void Inc(void);
-		};
-	};
-
-#endif /* __cplusplus */
-
-
-
-
 #endif /* ! _included_pcmenus_h_ */
diff --git a/src/avp/win95/pldnet.c b/src/avp/win95/pldnet.c
index c859328..aa4f6e2 100644
--- a/src/avp/win95/pldnet.c
+++ b/src/avp/win95/pldnet.c
@@ -11,7 +11,6 @@
 #include "bh_types.h"
 #include "dynblock.h"
 #include "dynamics.h"
-#include "menugfx.h"
 #include "bh_debri.h"
 #include "pvisible.h"
 #include "bh_plift.h"