Skip to content

Commit 0328560

Browse files
Xottab-DUTYXottab-DUTY
committed
Global: use GEnv.isDedicatedServer instead of g_dedicated_server
1 parent e00be34 commit 0328560

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+170
-197
lines changed

‎src/Include/xrAPI/xrAPI.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ class XRAPI_API EngineGlobalEnvironment
3333
IRenderFactory* RenderFactory;
3434
CScriptEngine* ScriptEngine;
3535
AISpaceBase* AISpace;
36+
37+
bool isDedicatedServer;
3638
};
3739

3840
extern XRAPI_API EngineGlobalEnvironment GEnv;
39-
extern XRAPI_API bool g_dedicated_server; // XXX: move to EngineGlobalEnvironment

‎src/Layers/xrAPI/xrAPI.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
#include "Include/xrAPI/xrAPI.h"
33

44
EngineGlobalEnvironment GEnv = {};
5-
bool g_dedicated_server = false;

‎src/Layers/xrRender/HW.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void CHW::Reset(HWND hwnd)
4848
// BOOL bWindowed = TRUE;
4949
//#endif
5050
BOOL bWindowed = TRUE;
51-
if (!g_dedicated_server)
51+
if (!GEnv.isDedicatedServer)
5252
bWindowed = !psDeviceFlags.is(rsFullscreen);
5353

5454
selectResolution(DevPP.BackBufferWidth, DevPP.BackBufferHeight, bWindowed);
@@ -98,7 +98,7 @@ void CHW::CreateD3D()
9898
LPCSTR _name = "xrD3D9-Null";
9999

100100
#ifndef _EDITOR
101-
if (!g_dedicated_server)
101+
if (!GEnv.isDedicatedServer)
102102
#endif
103103
_name = "d3d9.dll";
104104

@@ -174,7 +174,7 @@ void CHW::selectResolution(u32& dwWidth, u32& dwHeight, BOOL bWindowed)
174174
{
175175
fill_vid_mode_list(this);
176176
#ifndef _EDITOR
177-
if (g_dedicated_server)
177+
if (GEnv.isDedicatedServer)
178178
{
179179
dwWidth = 640;
180180
dwHeight = 480;
@@ -222,7 +222,7 @@ void CHW::CreateDevice(HWND m_hWnd, bool move_window)
222222
BOOL bWindowed = TRUE;
223223

224224
#ifndef _EDITOR
225-
if (!g_dedicated_server)
225+
if (!GEnv.isDedicatedServer)
226226
bWindowed = !psDeviceFlags.is(rsFullscreen);
227227
#else
228228
bWindowed = 1;
@@ -534,7 +534,7 @@ void CHW::updateWindowProps(HWND m_hWnd)
534534

535535
BOOL bWindowed = TRUE;
536536
#ifndef _EDITOR
537-
if (!g_dedicated_server)
537+
if (!GEnv.isDedicatedServer)
538538
bWindowed = !psDeviceFlags.is(rsFullscreen);
539539
#endif
540540

@@ -580,7 +580,7 @@ void CHW::updateWindowProps(HWND m_hWnd)
580580
}
581581

582582
#ifndef _EDITOR
583-
if (!g_dedicated_server)
583+
if (!GEnv.isDedicatedServer)
584584
{
585585
ShowCursor(FALSE);
586586
SetForegroundWindow(m_hWnd);

‎src/Layers/xrRender/R_Backend_Runtime.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void CBackend::OnFrameEnd()
1717
{
1818
//#ifndef DEDICATED_SERVER
1919
#ifndef _EDITOR
20-
if (!g_dedicated_server)
20+
if (!GEnv.isDedicatedServer)
2121
#endif
2222
{
2323
#if defined(USE_DX10) || defined(USE_DX11)
@@ -41,7 +41,7 @@ void CBackend::OnFrameBegin()
4141
{
4242
//#ifndef DEDICATED_SERVER
4343
#ifndef _EDITOR
44-
if (!g_dedicated_server)
44+
if (!GEnv.isDedicatedServer)
4545
#endif
4646
{
4747
PGO(Msg("PGO:*****frame[%d]*****", RDEVICE.dwFrame));

‎src/Layers/xrRender/ResourceManager.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ Shader* CResourceManager::_cpp_Create(LPCSTR s_shader, LPCSTR s_textures, LPCSTR
270270
{
271271
//#ifndef DEDICATED_SERVER
272272
#ifndef _EDITOR
273-
if (!g_dedicated_server)
273+
if (!GEnv.isDedicatedServer)
274274
#endif
275275
{
276276
// TODO: DX10: When all shaders are ready switch to common path
@@ -297,7 +297,7 @@ Shader* CResourceManager::Create(IBlender* B, LPCSTR s_shader, LPCSTR s_textures
297297
{
298298
//#ifndef DEDICATED_SERVER
299299
#ifndef _EDITOR
300-
if (!g_dedicated_server)
300+
if (!GEnv.isDedicatedServer)
301301
#endif
302302
{
303303
return _cpp_Create(B, s_shader, s_textures, s_constants, s_matrices);
@@ -316,7 +316,7 @@ Shader* CResourceManager::Create(LPCSTR s_shader, LPCSTR s_textures, LPCSTR s_co
316316
{
317317
//#ifndef DEDICATED_SERVER
318318
#ifndef _EDITOR
319-
if (!g_dedicated_server)
319+
if (!GEnv.isDedicatedServer)
320320
#endif
321321
{
322322
// TODO: DX10: When all shaders are ready switch to common path

‎src/Layers/xrRender/SH_Texture.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void CTexture::Load()
169169
Preload();
170170
//#ifndef DEDICATED_SERVER
171171
#ifndef _EDITOR
172-
if (!g_dedicated_server)
172+
if (!GEnv.isDedicatedServer)
173173
#endif
174174
{
175175
// Check for OGM

‎src/Layers/xrRender/r__dsgraph_build.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ void D3DXRenderBase::OnDeviceCreate(const char* shName)
10031003
m_Gamma.Update();
10041004
Resources->OnDeviceCreate(shName);
10051005
create();
1006-
if (!g_dedicated_server)
1006+
if (!GEnv.isDedicatedServer)
10071007
{
10081008
m_WireShader.create("editor\\wire");
10091009
m_SelectionShader.create("editor\\selection");

‎src/Layers/xrRender/r__sector.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ void CSector::load(IReader& fs)
303303
count--;
304304
}
305305

306-
if (g_dedicated_server)
306+
if (GEnv.isDedicatedServer)
307307
m_root = nullptr;
308308
else
309309
{

‎src/Layers/xrRender/stats_manager.cpp‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@
77
#include "stdafx.h"
88
#include "stats_manager.h"
99

10-
#ifdef _EDITOR
11-
const bool g_dedicated_server = false;
12-
#endif
13-
1410
void stats_manager::increment_stats(u32 size, enum_stats_buffer_type type, _D3DPOOL location)
1511
{
16-
if (g_dedicated_server)
12+
if (GEnv.isDedicatedServer)
1713
return;
1814

1915
R_ASSERT(type >= 0 && type < enum_stats_buffer_type_COUNT);
@@ -23,7 +19,7 @@ void stats_manager::increment_stats(u32 size, enum_stats_buffer_type type, _D3DP
2319

2420
void stats_manager::increment_stats(u32 size, enum_stats_buffer_type type, _D3DPOOL location, void* buff_ptr)
2521
{
26-
if (g_dedicated_server)
22+
if (GEnv.isDedicatedServer)
2723
return;
2824

2925
R_ASSERT(buff_ptr != NULL);
@@ -44,7 +40,7 @@ void stats_manager::increment_stats(u32 size, enum_stats_buffer_type type, _D3DP
4440

4541
void stats_manager::increment_stats_rtarget(ID3DTexture2D* buff)
4642
{
47-
if (g_dedicated_server)
43+
if (GEnv.isDedicatedServer)
4844
return;
4945

5046
_D3DPOOL pool = D3DPOOL_MANAGED;
@@ -63,7 +59,7 @@ void stats_manager::increment_stats_rtarget(ID3DTexture2D* buff)
6359

6460
void stats_manager::increment_stats_vb(ID3DVertexBuffer* buff)
6561
{
66-
if (g_dedicated_server)
62+
if (GEnv.isDedicatedServer)
6763
return;
6864

6965
#if defined(USE_DX10) || defined(USE_DX11)
@@ -79,7 +75,7 @@ void stats_manager::increment_stats_vb(ID3DVertexBuffer* buff)
7975

8076
void stats_manager::increment_stats_ib(ID3DIndexBuffer* buff)
8177
{
82-
if (g_dedicated_server)
78+
if (GEnv.isDedicatedServer)
8379
return;
8480

8581
#if defined(USE_DX10) || defined(USE_DX11)
@@ -95,7 +91,7 @@ void stats_manager::increment_stats_ib(ID3DIndexBuffer* buff)
9591

9692
void stats_manager::decrement_stats_rtarget(ID3DTexture2D* buff)
9793
{
98-
if (buff == nullptr || g_dedicated_server)
94+
if (buff == nullptr || GEnv.isDedicatedServer)
9995
return;
10096

10197
buff->AddRef();
@@ -119,7 +115,7 @@ void stats_manager::decrement_stats_rtarget(ID3DTexture2D* buff)
119115

120116
void stats_manager::decrement_stats_vb(ID3DVertexBuffer* buff)
121117
{
122-
if (buff == nullptr || g_dedicated_server)
118+
if (buff == nullptr || GEnv.isDedicatedServer)
123119
return;
124120

125121
buff->AddRef();
@@ -140,7 +136,7 @@ void stats_manager::decrement_stats_vb(ID3DVertexBuffer* buff)
140136

141137
void stats_manager::decrement_stats_ib(ID3DIndexBuffer* buff)
142138
{
143-
if (buff == nullptr || g_dedicated_server)
139+
if (buff == nullptr || GEnv.isDedicatedServer)
144140
return;
145141

146142
buff->AddRef();
@@ -161,7 +157,7 @@ void stats_manager::decrement_stats_ib(ID3DIndexBuffer* buff)
161157

162158
void stats_manager::decrement_stats(u32 size, enum_stats_buffer_type type, _D3DPOOL location)
163159
{
164-
if (g_dedicated_server)
160+
if (GEnv.isDedicatedServer)
165161
return;
166162

167163
R_ASSERT(type >= 0 && type < enum_stats_buffer_type_COUNT);
@@ -171,7 +167,7 @@ void stats_manager::decrement_stats(u32 size, enum_stats_buffer_type type, _D3DP
171167

172168
void stats_manager::decrement_stats(u32 size, enum_stats_buffer_type type, _D3DPOOL location, void* buff_ptr)
173169
{
174-
if (buff_ptr == nullptr || g_dedicated_server)
170+
if (buff_ptr == nullptr || GEnv.isDedicatedServer)
175171
return;
176172

177173
#ifdef DEBUG

‎src/Layers/xrRender/xrRender_console.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ class CCC_Screenshot : public IConsole_Command
327327
CCC_Screenshot(LPCSTR N) : IConsole_Command(N){};
328328
virtual void Execute(LPCSTR args)
329329
{
330-
if (g_dedicated_server)
330+
if (GEnv.isDedicatedServer)
331331
return;
332332

333333
string_path name;

0 commit comments

Comments
 (0)