Skip to content

Commit 3729c3b

Browse files
committed
Remove ServerBrowser/CServerCache.h from StdInc.h
1 parent b6fd299 commit 3729c3b

File tree

9 files changed

+9
-11
lines changed

9 files changed

+9
-11
lines changed

Client/core/CCore.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "CTimingCheckpoints.hpp"
2121
#include "CModelCacheManager.h"
2222
#include "detours/include/detours.h"
23+
#include <ServerBrowser/CServerCache.h>
2324

2425
using SharedUtil::CalcMTASAPath;
2526
using namespace std;

Client/core/CCore.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111

1212
class CCore;
1313

14-
#ifndef __CCORE_H
15-
#define __CCORE_H
14+
#pragma once
1615

1716
#include "../version.h"
1817

@@ -368,5 +367,3 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
368367
std::map<std::string, std::string> m_CommandLineOptions; // e.g. "-o option" -> {"o" = "option"}
369368
const char* m_szCommandLineArgs; // Everything that comes after the options
370369
};
371-
372-
#endif

Client/core/DXHook/CDirect3DHook9.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include "StdInc.h"
1313
#include "detours/include/detours.h"
14+
#include <ServerBrowser/CServerCache.h>
1415

1516
template <>
1617
CDirect3DHook9* CSingleton<CDirect3DHook9>::m_pSingleton = NULL;

Client/core/DXHook/CDirect3DHook9.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
*
1010
*****************************************************************************/
1111

12-
#ifndef __CDIRECT3DHOOK9_H
13-
#define __CDIRECT3DHOOK9_H
12+
#pragma once
1413

1514
typedef IDirect3D9*(__stdcall* pDirect3DCreate)(int SDKVersion);
1615

@@ -29,5 +28,3 @@ class CDirect3DHook9 : public CSingleton<CDirect3DHook9>
2928
pDirect3DCreate m_pfnDirect3DCreate9;
3029
bool m_bDirect3DCreate9Suspended;
3130
};
32-
33-
#endif

Client/core/ServerBrowser/CServerBrowser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*****************************************************************************/
1111

1212
#include "StdInc.h"
13+
#include <ServerBrowser/CServerCache.h>
1314

1415
using namespace std;
1516

Client/core/ServerBrowser/CServerCache.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include "StdInc.h"
1414
#include "CVersionUpdater.Util.hpp"
15+
#include "CServerCache.h"
1516

1617
namespace
1718
{

Client/core/ServerBrowser/CServerCache.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****************************************************************************
22
*
3-
* PROJECT: Multi Theft Auto v1.0
3+
* PROJECT: Multi Theft Auto
44
* LICENSE: See LICENSE in the top level directory
55
* FILE: core/CServerCache.h
66
* PURPOSE:
@@ -21,4 +21,4 @@ class CServerCacheInterface
2121
virtual bool GenerateServerList(CServerList* pList) = 0;
2222
};
2323

24-
CServerCacheInterface* GetServerCache();
24+
CServerCacheInterface* GetServerCache();

Client/core/ServerBrowser/CServerList.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include "StdInc.h"
1313
#include "CServerBrowser.MasterServerManager.h"
14+
#include "CServerCache.h"
1415

1516
using namespace std;
1617

Client/core/StdInc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
#include "CExceptionInformation_Impl.h"
6464
#include "CJoystickManager.h"
6565
#include <Graphics/CVideoModeManager.h>
66-
#include <ServerBrowser/CServerCache.h>
6766
#include "CCrashDumpWriter.h"
6867
#include "CMemStats.h"
6968
#include "CGraphStats.h"

0 commit comments

Comments
 (0)