Browse Source

Move plNetObjectDebugger NetClient -> NetCommon.

Darryl Pogue 10 years ago
parent
commit
760377016c
  1. 2
      Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
  2. 3
      Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp
  3. 2
      Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt
  4. 2
      Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp
  5. 2
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
  6. 2
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp
  7. 2
      Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt
  8. 2
      Sources/Plasma/PubUtilLib/plNetCommon/plNetObjectDebugger.cpp
  9. 0
      Sources/Plasma/PubUtilLib/plNetCommon/plNetObjectDebugger.h
  10. 2
      Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp

2
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp

@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plgDispatch.h"
#include "plAgeLoader/plAgeLoader.h"
#include "plNetClient/plNetObjectDebugger.h"
#include "plNetCommon/plNetObjectDebugger.h"
#include "plNetClient/plNetClientMgr.h"
#include "plNetClient/plNetLinkingMgr.h"
#include "plAgeLoader/plResPatcher.h"

3
Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp

@ -46,10 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnSceneObject/plSceneObject.h"
#include "pnMessage/plSDLModifierMsg.h"
#include "plNetCommon/plNetObjectDebugger.h"
#include "plNetMessage/plNetMessage.h"
#include "plSDL/plSDL.h"
#include "plNetClient/plNetClientMgr.h"
#include "plNetClient/plNetObjectDebugger.h"
plSDLModifier::plSDLModifier() : fStateCache(nil), fSentOrRecvdState(false)
{

2
Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt

@ -19,7 +19,6 @@ set(plNetClient_SOURCES
plNetClientMsgHandler.cpp
plNetClientMsgScreener.cpp
plNetLinkingMgr.cpp
plNetObjectDebugger.cpp
plNetVoiceList.cpp
)
@ -33,7 +32,6 @@ set(plNetClient_HEADERS
plNetClientMsgHandler.h
plNetClientMsgScreener.h
plNetLinkingMgr.h
plNetObjectDebugger.h
plNetVoiceList.h
)

2
Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp

@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetCliAgeJoiner.h"
#include "plNetClientMgr.h"
#include "plNetLinkingMgr.h"
#include "plNetObjectDebugger.h"
#include "plNetCommon/plNetObjectDebugger.h"
#include "pnSceneObject/plSceneObject.h"
#include "pnSceneObject/plCoordinateInterface.h"

2
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp

@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPhysical.h"
#include "plNetClientMsgHandler.h"
#include "plNetLinkingMgr.h"
#include "plNetObjectDebugger.h"
#include "plNetCommon/plNetObjectDebugger.h"
#include "pnUtils/pnUtils.h"
#include "plProduct.h"

2
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsResMgr.h"
#include "plNetClientMgr.h"
#include "plCreatableIndex.h"
#include "plNetObjectDebugger.h"
#include "plNetCommon/plNetObjectDebugger.h"
#include "pnNetCommon/plSynchedObject.h"
#include "pnNetCommon/plSDLTypes.h"

2
Sources/Plasma/PubUtilLib/plNetCommon/CMakeLists.txt

@ -10,6 +10,7 @@ set(plNetCommon_SOURCES
plNetCommonHelpers.cpp
plNetMember.cpp
plNetMsgScreener.cpp
plNetObjectDebugger.cpp
plNetServerSessionInfo.cpp
plSpawnPointInfo.cpp
)
@ -23,6 +24,7 @@ set(plNetCommon_HEADERS
plNetMember.h
plNetMsgHandler.h
plNetMsgScreener.h
plNetObjectDebugger.h
plNetServerSessionInfo.h
plSpawnPointInfo.h
)

2
Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.cpp → Sources/Plasma/PubUtilLib/plNetCommon/plNetObjectDebugger.cpp

@ -156,7 +156,7 @@ plNetObjectDebugger* plNetObjectDebugger::GetInstance()
{
static plNetObjectDebugger gNetObjectDebugger;
if (plNetObjectDebuggerBase::GetInstance()==nil)
if (plNetObjectDebuggerBase::GetInstance() == nullptr)
plNetObjectDebuggerBase::SetInstance(&gNetObjectDebugger);
return &gNetObjectDebugger;

0
Sources/Plasma/PubUtilLib/plNetClient/plNetObjectDebugger.h → Sources/Plasma/PubUtilLib/plNetCommon/plNetObjectDebugger.h

2
Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp

@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plClientUnifiedTime.h"
#if 0
#include "plNetClient/plNetObjectDebugger.h"
#include "plNetCommon/plNetObjectDebugger.h"
#include "plNetClient/plNetClientMgr.h"
#endif

Loading…
Cancel
Save