Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove BattlEye since S.T.A.L.K.E.R. is not longer supported by #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove BattlEye since S.T.A.L.K.E.R. is not longer supported by #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions trunk/xrNetServer/NET_Client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "net_server.h"
#include "net_messages.h"
#include "NET_Log.h"
#include "../xr_3da/xrGame/battleye.h"

#pragma warning(push)
#pragma warning(disable:4995)
Expand Down Expand Up @@ -228,16 +227,6 @@ void IPureClient::_Recieve( const void* data, u32 data_size, u32 /*param*/ )
if ( data_size == sizeof(MSYS_CONFIG) )
{
MSYS_CONFIG* msys_cfg = (MSYS_CONFIG*)data;
if ( msys_cfg->is_battleye )
{
#ifdef BATTLEYE
if ( !TestLoadBEClient() )
{
net_Connected = EnmConnectionFails;
return;
}
#endif // BATTLEYE
}
net_Connected = EnmConnectionCompleted;
return;
}
Expand Down
1 change: 0 additions & 1 deletion trunk/xrNetServer/NET_Messages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ struct MSYS_CONFIG
{
u32 sign1; // 0x12071980;
u32 sign2; // 0x26111975;
u32 is_battleye;
};
struct MSYS_PING
{
Expand Down
9 changes: 0 additions & 9 deletions trunk/xr_3da/xrGame/Level.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,15 +1035,6 @@ bool IsGameTypeSingle()
return g_pGamePersistent->GameType()==GAME_SINGLE || g_pGamePersistent->GameType()==GAME_ANY;
}

#ifdef BATTLEYE

bool CLevel::TestLoadBEClient()
{
return battleye_system.TestLoadClient();
}

#endif // BATTLEYE

GlobalFeelTouch::GlobalFeelTouch()
{
}
Expand Down
7 changes: 0 additions & 7 deletions trunk/xr_3da/xrGame/Level.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "alife_space.h"
#include "xrDebug.h"
#include "xrServer.h"
#include "battleye_system.h"

class CHUDManager;
class CParticlesObject;
Expand Down Expand Up @@ -178,12 +177,6 @@ class CLevel : public IGame_Level, public IPureClient
xrServer* Server;
GlobalFeelTouch m_feel_deny;


#ifdef BATTLEYE
BattlEyeSystem battleye_system;
virtual bool TestLoadBEClient();
#endif // BATTLEYE

private:
// preload sounds registry
DEFINE_MAP (shared_str,ref_sound,SoundRegistryMap,SoundRegistryMapIt);
Expand Down
4 changes: 0 additions & 4 deletions trunk/xr_3da/xrGame/Level_network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,6 @@ void CLevel::ClientSend()
if ( !net_HasBandwidth() ) return;
};

#ifdef BATTLEYE
battleye_system.UpdateClient();
#endif // BATTLEYE

NET_Packet P;
u32 start = 0;
//----------- for E3 -----------------------------
Expand Down
6 changes: 0 additions & 6 deletions trunk/xr_3da/xrGame/Level_network_messages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,12 +321,6 @@ void CLevel::ClientReceive()
if (GameID() != GAME_SINGLE)
Game().m_WeaponUsageStatistic->OnUpdateRespond(P);
}break;
case M_BATTLEYE:
{
#ifdef BATTLEYE
battleye_system.ReadPacketClient( P );
#endif // BATTLEYE
}break;
}

net_msg_Release();
Expand Down
4 changes: 0 additions & 4 deletions trunk/xr_3da/xrGame/Level_start.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,6 @@ bool xr_stdcall net_start_finalizer()
DEL_INSTANCE (g_pGameLevel);
Console->Execute("main_menu on");

if (g_connect_server_err==xrServer::ErrBELoad)
{
MainMenu()->OnLoadError("BattlEye/BEServer.dll");
}else
if(g_connect_server_err==xrServer::ErrConnect && !psNET_direct_connect && !g_dedicated_server)
{
MainMenu()->SwitchToMultiplayerMenu();
Expand Down
4 changes: 0 additions & 4 deletions trunk/xr_3da/xrGame/battleye.h
View file
Open in desktop

This file was deleted.

Loading