- removed the code for Doom's help screens.

source/CMakeLists.txt

@@ -837,7 +837,6 @@ set (PCH_SOURCES
 	common/menu/menuinput.cpp
 	common/menu/messagebox.cpp
 	common/menu/optionmenu.cpp
-	common/menu/readthis.cpp
 )
 
 if( MSVC )

source/common/menu/menu.cpp

@@ -67,7 +67,8 @@ CVAR (Float, mouse_sensitivity, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 EXTERN_CVAR (Bool, show_messages)
 
 
-CVAR (Float, snd_menuvolume, 0.6f, CVAR_ARCHIVE)
+CVAR(Bool, menu_sounds, true, CVAR_ARCHIVE) // added mainly because RR's sounds are so supremely annoying.
+//CVAR (Float, snd_menuvolume, 0.6f, CVAR_ARCHIVE) the current sound engine cannot deal with this.
 CVAR(Int, m_use_mouse, 1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR(Int, m_show_backbutton, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 
@@ -874,7 +875,6 @@ void Menu_Close(int playerid)
 //
 //
 //=============================================================================
-CVAR(Bool, menu_sounds, true, CVAR_ARCHIVE) // added mainly because RR's sounds are so supremely annoying.
 
 void M_MenuSound(EMenuSounds snd)
 {

source/common/menu/readthis.cpp

@@ -1,147 +0,0 @@
-/*
-** readthis.cpp
-** Help screens
-**
-**---------------------------------------------------------------------------
-** Copyright 2001-2010 Randy Heit
-** Copyright 2010 Christoph Oelckers
-** All rights reserved.
-**
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions
-** are met:
-**
-** 1. Redistributions of source code must retain the above copyright
-**    notice, this list of conditions and the following disclaimer.
-** 2. Redistributions in binary form must reproduce the above copyright
-**    notice, this list of conditions and the following disclaimer in the
-**    documentation and/or other materials provided with the distribution.
-** 3. The name of the author may not be used to endorse or promote products
-**    derived from this software without specific prior written permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-**---------------------------------------------------------------------------
-**
-*/
-
-#include "menu/menu.h"
-#include "v_draw.h"
-#include "textures/textures.h"
-
-#if 0 // This is probably useless. To be replaced with what Build games use to draw their help screens.
-
-class DReadThisMenu : public DMenu
-{
-	int mScreen;
-	int mInfoTic;
-
-public:
-
-	DReadThisMenu(DMenu *parent = NULL);
-	void Drawer();
-	bool MenuEvent(int mkey, bool fromcontroller);
-	bool DimAllowed () { return false; }
-	bool MouseEvent(int type, int x, int y);
-};
-
-
-//=============================================================================
-//
-// Read This Menus
-//
-//=============================================================================
-
-DReadThisMenu::DReadThisMenu(DMenu *parent)
-: DMenu(parent)
-{
-	mScreen = 1;
-	mInfoTic = gametic;
-}
-
-
-//=============================================================================
-//
-//
-//
-//=============================================================================
-
-void DReadThisMenu::Drawer()
-{
-	FTexture *tex = NULL, *prevpic = NULL;
-	fixed_t alpha;
-
-	// Did the mapper choose a custom help page via MAPINFO?
-	if ((level.info != NULL) && level.info->F1Pic.Len() != 0)
-	{
-		tex = TexMan.FindTexture(level.info->F1Pic);
-		mScreen = 1;
-	}
-	
-	if (tex == NULL)
-	{
-		tex = TexMan[gameinfo.infoPages[mScreen-1].GetChars()];
-	}
-
-	if (mScreen > 1)
-	{
-		prevpic = TexMan[gameinfo.infoPages[mScreen-2].GetChars()];
-	}
-
-	screen->Dim(0, 1.0, 0,0, SCREENWIDTH, SCREENHEIGHT);
-	alpha = MIN<fixed_t> (Scale (gametic - mInfoTic, OPAQUE, TICRATE/3), OPAQUE);
-	if (alpha < OPAQUE && prevpic != NULL)
-	{
-		screen->DrawTexture (prevpic, 0, 0, DTA_Fullscreen, true, TAG_DONE);
-	}
-	screen->DrawTexture (tex, 0, 0, DTA_Fullscreen, true, DTA_Alpha, alpha,	TAG_DONE);
-
-}
-
-
-//=============================================================================
-//
-//
-//
-//=============================================================================
-
-bool DReadThisMenu::MenuEvent(int mkey, bool fromcontroller)
-{
-	if (mkey == MKEY_Enter)
-	{
-		S_Sound (CHAN_VOICE | CHAN_UI, "menu/choose", snd_menuvolume, ATTN_NONE);
-		mScreen++;
-		mInfoTic = gametic;
-		if ((level.info != NULL && level.info->F1Pic.Len() != 0) || mScreen > int(gameinfo.infoPages.Size()))
-		{
-			Close();
-		}
-		return true;
-	}
-	else return Super::MenuEvent(mkey, fromcontroller);
-}
-
-//=============================================================================
-//
-//
-//
-//=============================================================================
-
-bool DReadThisMenu::MouseEvent(int type, int x, int y)
-{
-	if (type == MOUSE_Click)
-	{
-		return MenuEvent(MKEY_Enter, true);
-	}
-	return false;
-}
-
-#endif