diff --git a/code/nel/include/nel/3d/stereo_display.h b/code/nel/include/nel/3d/stereo_display.h
index 570a62739..3b9c73b74 100644
--- a/code/nel/include/nel/3d/stereo_display.h
+++ b/code/nel/include/nel/3d/stereo_display.h
@@ -60,7 +60,6 @@ public:
{
StereoDisplay,
StereoHMD,
- StereoNGHMD,
};
enum TStereoDeviceLibrary
diff --git a/code/nel/include/nel/3d/stereo_ng_hmd.h b/code/nel/include/nel/3d/stereo_ng_hmd.h
deleted file mode 100644
index 1ab8ad144..000000000
--- a/code/nel/include/nel/3d/stereo_ng_hmd.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * \file stereo_ng_hmd.h
- * \brief IStereoNGHMD
- * \date 2014-04-01 10:53GMT
- * \author Jan Boon (Kaetemi)
- * IStereoNGHMD
- */
-
-/*
- * Copyright (C) 2014 by authors
- *
- * This file is part of NL3D.
- * NL3D is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * NL3D is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General
- * Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with NL3D. If not, see
- * .
- */
-
-#ifndef NL3D_STEREO_NG_HMD_H
-#define NL3D_STEREO_NG_HMD_H
-#include
-
-// STL includes
-
-// NeL includes
-
-// Project includes
-#include
-
-namespace NL3D {
-
-/**
- * \brief IStereoNGHMD
- * \date 2014-04-01 10:53GMT
- * \author Jan Boon (Kaetemi)
- * IStereoNGHMD
- */
-class IStereoNGHMD : public IStereoHMD
-{
-public:
- IStereoNGHMD();
- virtual ~IStereoNGHMD();
-
- /// Kill the player
- virtual void killUser() const = 0;
-
-}; /* class IStereoNGHMD */
-
-} /* namespace NL3D */
-
-#endif /* #ifndef NL3D_STEREO_NG_HMD_H */
-
-/* end of file */
diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt
index d614029f7..fff343915 100644
--- a/code/nel/src/3d/CMakeLists.txt
+++ b/code/nel/src/3d/CMakeLists.txt
@@ -697,8 +697,6 @@ SOURCE_GROUP(Stereo FILES
../../include/nel/3d/stereo_display.h
stereo_hmd.cpp
../../include/nel/3d/stereo_hmd.h
- stereo_ng_hmd.cpp
- ../../include/nel/3d/stereo_ng_hmd.h
stereo_ovr.cpp
stereo_ovr_fp.cpp
../../include/nel/3d/stereo_ovr.h
diff --git a/code/nel/src/3d/stereo_ng_hmd.cpp b/code/nel/src/3d/stereo_ng_hmd.cpp
deleted file mode 100644
index 1011b33e4..000000000
--- a/code/nel/src/3d/stereo_ng_hmd.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * \file stereo_hmd.cpp
- * \brief IStereoNGHMD
- * \date 2014-04-01 10:53GMT
- * \author Jan Boon (Kaetemi)
- * IStereoNGHMD
- */
-
-/*
- * Copyright (C) 2014 by authors
- *
- * This file is part of NL3D.
- * NL3D is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * NL3D is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General
- * Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with NL3D. If not, see
- * .
- */
-
-#include
-#include
-
-// STL includes
-
-// NeL includes
-// #include
-
-// Project includes
-
-using namespace std;
-// using namespace NLMISC;
-
-namespace NL3D {
-
-IStereoNGHMD::IStereoNGHMD()
-{
-
-}
-
-IStereoNGHMD::~IStereoNGHMD()
-{
-
-}
-
-} /* namespace NL3D */
-
-/* end of file */
diff --git a/code/ryzom/client/src/global.cpp b/code/ryzom/client/src/global.cpp
index 29db04f5e..c965db43f 100644
--- a/code/ryzom/client/src/global.cpp
+++ b/code/ryzom/client/src/global.cpp
@@ -28,7 +28,6 @@ using namespace NLMISC;
NL3D::UDriver *Driver = 0; // The main 3D Driver
NL3D::IStereoDisplay *StereoDisplay = NULL; // Stereo display
NL3D::IStereoHMD *StereoHMD = NULL; // Head mount display
-NL3D::IStereoNGHMD *StereoNGHMD = NULL; // HMD with player death support
CSoundManager *SoundMngr = 0; // the sound manager
NL3D::UMaterial GenericMat; // Generic Material
NL3D::UTextContext *TextContext = 0; // Context for all the text in the client.
@@ -69,8 +68,6 @@ bool PermanentlyBanned = false;
bool IgnoreEntityDbUpdates = false;
bool FreeTrial = false;
-bool NoLogout = false;
-
std::vector > VRDeviceCache;
diff --git a/code/ryzom/client/src/global.h b/code/ryzom/client/src/global.h
index f22f786d6..5879eeaec 100644
--- a/code/ryzom/client/src/global.h
+++ b/code/ryzom/client/src/global.h
@@ -42,7 +42,6 @@ namespace NL3D
class UWaterEnvMap;
class IStereoDisplay;
class IStereoHMD;
- class IStereoNGHMD;
}
class CEntityAnimationManager;
@@ -82,7 +81,6 @@ const float ExtraZoneLoadingVision = 100.f;
extern NL3D::UDriver *Driver; // The main 3D Driver
extern NL3D::IStereoDisplay *StereoDisplay; // Stereo display
extern NL3D::IStereoHMD *StereoHMD; // Head mount display
-extern NL3D::IStereoNGHMD *StereoNGHMD; // HMD with player death support
extern CSoundManager *SoundMngr; // the sound manager
extern NL3D::UMaterial GenericMat; // Generic Material
extern NL3D::UTextContext *TextContext; // Context for all the text in the client.
@@ -130,8 +128,6 @@ extern std::string Cookie, FSAddr;
extern std::string RingMainURL;
extern bool FreeTrial;
-extern bool NoLogout;
-
void resetTextContext (const char *font, bool resetInterfaceManager);
#endif // CL_GLOBAL_H
diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp
index d0a64b0a4..d603be4a3 100644
--- a/code/ryzom/client/src/init.cpp
+++ b/code/ryzom/client/src/init.cpp
@@ -40,7 +40,6 @@
#include "nel/3d/u_text_context.h"
#include "nel/3d/u_shape_bank.h"
#include "nel/3d/stereo_hmd.h"
-#include "nel/3d/stereo_ng_hmd.h"
// Net.
#include "nel/net/email.h"
// Ligo.
@@ -640,15 +639,10 @@ void initStereoDisplayDevice()
StereoDisplay = IStereoDisplay::createDevice(*deviceInfo);
if (StereoDisplay)
{
- if (deviceInfo->Class == CStereoDeviceInfo::StereoHMD
- || deviceInfo->Class == CStereoDeviceInfo::StereoNGHMD)
+ if (deviceInfo->Class == CStereoDeviceInfo::StereoHMD)
{
nlinfo("VR [C]: Stereo display device is a HMD");
StereoHMD = static_cast(StereoDisplay);
- if (deviceInfo->Class == CStereoDeviceInfo::StereoNGHMD)
- {
- StereoNGHMD = static_cast(StereoDisplay);
- }
}
if (Driver) // VR_DRIVER
{
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index 0228977a8..b89566ecd 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1090,7 +1090,6 @@ void CInterfaceManager::configureQuitDialogBox()
// Show Launch Editor if not in editor mode
CInterfaceElement *eltCancel = quitDlg->getElement(quitDialogStr+":cancel");
CInterfaceElement *eltEdit = quitDlg->getElement(quitDialogStr+":launch_editor");
-
if (eltEdit)
{
if (UserRoleInSession != R2::TUserRole::ur_editor && !sessionOwner)
@@ -1161,18 +1160,6 @@ void CInterfaceManager::configureQuitDialogBox()
eltQuitNow->setActive(false);
}
}
-
- if (NoLogout)
- {
- eltEdit->setY(0);
- eltEdit->setActive(false);
- eltQuit->setY(0);
- eltQuit->setActive(false);
- eltQuitNow->setY(0);
- eltQuitNow->setActive(false);
- eltRet->setY(0);
- eltRet->setActive(false);
- }
}
// Make all controls have the same size
diff --git a/code/ryzom/client/src/motion/modes/death_mode.cpp b/code/ryzom/client/src/motion/modes/death_mode.cpp
index 4e39f394f..cd987b635 100644
--- a/code/ryzom/client/src/motion/modes/death_mode.cpp
+++ b/code/ryzom/client/src/motion/modes/death_mode.cpp
@@ -21,9 +21,6 @@
// INCLUDES //
//////////////
#include "stdpch.h"
-
-#include "nel/3d/stereo_ng_hmd.h"
-
// Client.
#include "../../input.h"
#include "../user_controls.h"
@@ -31,7 +28,6 @@
#include "../../view.h"
#include "../../interface_v3/interface_manager.h"
#include "../../entities.h"
-#include "global.h"
///////////
@@ -65,9 +61,6 @@ void CUserControls::deathModeStart()
_InternalView = false;
// Show/hide all or parts of the user body (after _InternaView is set).
UserEntity->updateVisualDisplay();
- // Kill the player
- if (StereoNGHMD)
- StereoNGHMD->killUser();
}// deathModeStart //
//-----------------------------------------------
diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp
index 487e05358..1eedc16c5 100644
--- a/code/ryzom/client/src/net_manager.cpp
+++ b/code/ryzom/client/src/net_manager.cpp
@@ -3555,13 +3555,6 @@ void impulseSetNpcIconTimer(NLMISC::CBitMemStream &impulse)
CNPCIconCache::getInstance().setMissionGiverTimer(delay);
}
-void impulseEventDisableLogoutButton(NLMISC::CBitMemStream &impulse)
-{
- NoLogout = true;
- CInterfaceManager *im = CInterfaceManager::getInstance();
- im->configureQuitDialogBox();
-}
-
//-----------------------------------------------
// initializeNetwork :
//-----------------------------------------------
@@ -3711,8 +3704,6 @@ void initializeNetwork()
GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_DESC", impulseSetNpcIconDesc );
GenericMsgHeaderMngr.setCallback( "NPC_ICON:SVR_EVENT_MIS_AVL", impulseServerEventForMissionAvailability );
GenericMsgHeaderMngr.setCallback( "NPC_ICON:SET_TIMER", impulseSetNpcIconTimer );
-
- GenericMsgHeaderMngr.setCallback( "EVENT:DISABLE_LOGOUT_BUTTON", impulseEventDisableLogoutButton );
}
diff --git a/code/ryzom/client/src/release.cpp b/code/ryzom/client/src/release.cpp
index cdf5dbcb5..b40d68b35 100644
--- a/code/ryzom/client/src/release.cpp
+++ b/code/ryzom/client/src/release.cpp
@@ -36,7 +36,6 @@
#include "nel/3d/u_visual_collision_manager.h"
#include "nel/3d/u_shape_bank.h"
#include "nel/3d/stereo_hmd.h"
-#include "nel/3d/stereo_ng_hmd.h"
// Client
#include "global.h"
#include "release.h"
@@ -517,13 +516,9 @@ void releaseStereoDisplayDevice()
{
if (StereoDisplay)
{
- if (NoLogout && StereoNGHMD)
- StereoNGHMD->killUser();
-
delete StereoDisplay;
StereoDisplay = NULL;
StereoHMD = NULL;
- StereoNGHMD = NULL;
}
IStereoDisplay::releaseAllLibraries();
}
diff --git a/code/ryzom/common/data_common/msg.xml b/code/ryzom/common/data_common/msg.xml
index 9ae6fab16..3fa75650e 100644
--- a/code/ryzom/common/data_common/msg.xml
+++ b/code/ryzom/common/data_common/msg.xml
@@ -1111,8 +1111,8 @@
sendto="EGS"
format="u32 u32 uc"
description="set the cursom of the item in inventory $inventory in slot $slot to $text" />
-
+