From d760c45eaafb51df54536e636831b441c7dded7c Mon Sep 17 00:00:00 2001 From: Zrax Date: Thu, 7 Apr 2011 21:24:11 -0700 Subject: [PATCH] PubUtilLib part III (cherry picked from commit 82a4fc867cfc2eaff37417898de8789c4d803c54) --- Sources/Plasma/PubUtilLib/CMakeLists.txt | 77 +++++++--- .../Plasma/PubUtilLib/plMath/CMakeLists.txt | 24 ++++ .../PubUtilLib/plMessage/CMakeLists.txt | 131 ++++++++++++++++++ .../Plasma/PubUtilLib/plMessage/plAIMsg.cpp | 2 +- Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h | 2 +- .../PubUtilLib/plMessage/plAccountUpdateMsg.h | 2 +- .../PubUtilLib/plMessage/plActivatorMsg.h | 2 +- .../PubUtilLib/plMessage/plAgeLoadedMsg.h | 4 +- .../plMessage/plAngularVelocityMsg.h | 4 +- .../PubUtilLib/plMessage/plAnimCmdMsg.h | 6 +- .../PubUtilLib/plMessage/plAvCoopMsg.cpp | 4 +- .../Plasma/PubUtilLib/plMessage/plAvCoopMsg.h | 2 +- .../PubUtilLib/plMessage/plAvatarFootMsg.h | 2 +- .../PubUtilLib/plMessage/plAvatarMsg.cpp | 6 +- .../Plasma/PubUtilLib/plMessage/plAvatarMsg.h | 6 +- .../Plasma/PubUtilLib/plMessage/plBulletMsg.h | 2 +- .../Plasma/PubUtilLib/plMessage/plCCRMsg.cpp | 6 +- .../Plasma/PubUtilLib/plMessage/plCCRMsg.h | 4 +- .../plMessage/plCaptureRenderMsg.cpp | 4 +- .../PubUtilLib/plMessage/plCaptureRenderMsg.h | 2 +- .../PubUtilLib/plMessage/plClimbEventMsg.h | 2 +- .../Plasma/PubUtilLib/plMessage/plClimbMsg.h | 2 +- .../PubUtilLib/plMessage/plCollideMsg.h | 2 +- .../PubUtilLib/plMessage/plCondRefMsg.h | 2 +- .../plMessage/plConnectedToVaultMsg.h | 2 +- .../PubUtilLib/plMessage/plConsoleMsg.h | 2 +- .../plMessage/plDeviceRecreateMsg.h | 2 +- .../plMessage/plDynaDecalEnableMsg.h | 4 +- .../PubUtilLib/plMessage/plDynamicEnvMapMsg.h | 2 +- .../PubUtilLib/plMessage/plDynamicTextMsg.h | 2 +- .../PubUtilLib/plMessage/plExcludeRegionMsg.h | 2 +- .../PubUtilLib/plMessage/plInputEventMsg.cpp | 2 +- .../PubUtilLib/plMessage/plInputEventMsg.h | 4 +- .../plMessage/plInputIfaceMgrMsg.cpp | 2 +- .../PubUtilLib/plMessage/plInputIfaceMgrMsg.h | 4 +- .../PubUtilLib/plMessage/plInterestingPing.h | 2 +- .../Plasma/PubUtilLib/plMessage/plLOSHitMsg.h | 2 +- .../PubUtilLib/plMessage/plLOSRequestMsg.cpp | 2 +- .../PubUtilLib/plMessage/plLOSRequestMsg.h | 4 +- .../Plasma/PubUtilLib/plMessage/plLayRefMsg.h | 2 +- .../PubUtilLib/plMessage/plLightRefMsg.h | 2 +- .../plMessage/plLinearVelocityMsg.h | 4 +- .../PubUtilLib/plMessage/plLinkToAgeMsg.cpp | 4 +- .../PubUtilLib/plMessage/plLinkToAgeMsg.h | 8 +- .../PubUtilLib/plMessage/plListenerMsg.cpp | 4 +- .../PubUtilLib/plMessage/plListenerMsg.h | 2 +- .../PubUtilLib/plMessage/plLoadAgeMsg.h | 4 +- .../PubUtilLib/plMessage/plLoadAvatarMsg.cpp | 6 +- .../PubUtilLib/plMessage/plLoadAvatarMsg.h | 2 +- .../PubUtilLib/plMessage/plLoadCloneMsg.cpp | 2 +- .../PubUtilLib/plMessage/plLoadCloneMsg.h | 4 +- .../Plasma/PubUtilLib/plMessage/plMatRefMsg.h | 2 +- .../PubUtilLib/plMessage/plMatrixUpdateMsg.h | 2 +- .../PubUtilLib/plMessage/plMemberUpdateMsg.h | 2 +- .../PubUtilLib/plMessage/plMeshRefMsg.h | 2 +- .../PubUtilLib/plMessage/plMessageCreatable.h | 2 +- .../Plasma/PubUtilLib/plMessage/plMovieMsg.h | 4 +- .../PubUtilLib/plMessage/plMultistageMsg.h | 2 +- .../PubUtilLib/plMessage/plNCAgeJoinerMsg.h | 2 +- .../PubUtilLib/plMessage/plNetClientMgrMsg.h | 2 +- .../PubUtilLib/plMessage/plNetCommMsgs.h | 8 +- .../PubUtilLib/plMessage/plNetOwnershipMsg.h | 4 +- .../PubUtilLib/plMessage/plNetVoiceListMsg.h | 2 +- .../PubUtilLib/plMessage/plNodeCleanupMsg.h | 2 +- .../PubUtilLib/plMessage/plOneShotCallbacks.h | 2 +- .../plMessage/plParticleUpdateMsg.h | 2 +- .../Plasma/PubUtilLib/plMessage/plPickedMsg.h | 2 +- .../PubUtilLib/plMessage/plPreloaderMsg.h | 2 +- .../Plasma/PubUtilLib/plMessage/plRenderMsg.h | 2 +- .../plMessage/plRenderRequestMsg.cpp | 4 +- .../PubUtilLib/plMessage/plRenderRequestMsg.h | 2 +- .../plMessage/plReplaceGeometryMsg.h | 2 +- .../PubUtilLib/plMessage/plResMgrHelperMsg.h | 4 +- .../PubUtilLib/plMessage/plResponderMsg.h | 2 +- .../plMessage/plRideAnimatedPhysMsg.h | 2 +- .../PubUtilLib/plMessage/plRippleShapeMsg.h | 2 +- .../plMessage/plRoomLoadNotifyMsg.h | 2 +- .../PubUtilLib/plMessage/plShadowCastMsg.h | 2 +- .../plMessage/plSimInfluenceMsg.cpp | 4 +- .../PubUtilLib/plMessage/plSimInfluenceMsg.h | 4 +- .../PubUtilLib/plMessage/plSimStateMsg.cpp | 2 +- .../PubUtilLib/plMessage/plSimStateMsg.h | 2 +- .../PubUtilLib/plMessage/plSpawnModMsg.h | 4 +- .../PubUtilLib/plMessage/plSpawnRequestMsg.h | 2 +- .../Plasma/PubUtilLib/plMessage/plSwimMsg.h | 2 +- .../PubUtilLib/plMessage/plSynchEnableMsg.cpp | 2 +- .../PubUtilLib/plMessage/plSynchEnableMsg.h | 2 +- .../PubUtilLib/plMessage/plTimerCallbackMsg.h | 2 +- .../PubUtilLib/plMessage/plTransitionMsg.h | 2 +- .../PubUtilLib/plMessage/plTriggerMsg.h | 2 +- .../PubUtilLib/plMessage/plVaultNotifyMsg.h | 6 +- .../PubUtilLib/plNetClientComm/CMakeLists.txt | 21 +++ .../plNetClientComm/plNetClientComm.cpp | 30 ++-- .../plNetClientComm/plNetClientComm.h | 10 +- .../plNetClientRecorder/CMakeLists.txt | 19 +++ .../plNetClientRecorder.cpp | 18 +-- .../plNetClientStatsRecorder.cpp | 18 +-- .../plNetClientStreamRecorder.cpp | 18 +-- .../plNetCommon/plNetCommonHelpers.h | 6 +- .../plNetCommon/plNetServerSessionInfo.h | 8 +- .../PubUtilLib/plNetGameLib/CMakeLists.txt | 35 +++++ .../plNetGameLib/Private/plNglAllIncludes.h | 2 +- .../PubUtilLib/plNetMessage/plNetMessage.h | 24 ++-- Sources/Plasma/PubUtilLib/plUUID/plUUID.h | 4 +- 104 files changed, 480 insertions(+), 219 deletions(-) create mode 100644 Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetClientComm/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetClientRecorder/CMakeLists.txt create mode 100644 Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt index ee5e5c36..7bd7c42b 100644 --- a/Sources/Plasma/PubUtilLib/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/CMakeLists.txt @@ -1,23 +1,54 @@ -add_definitions(-D_LIB) - -add_subdirectory(plAgeDescription) -add_subdirectory(plAgeLoader) -add_subdirectory(plAudible) -#add_subdirectory(plAudio) # TODO: DirectX -#add_subdirectory(plAudioCore) # TODO: DirectX -add_subdirectory(plAvatar) -add_subdirectory(plCompression) -add_subdirectory(plContainer) -#add_subdirectory(plDeviceSelector) # Not being used by any current slns -add_subdirectory(plDrawable) -add_subdirectory(plEncryption) -add_subdirectory(plFile) -#add_subdirectory(plGClip) # Not being used by any current slns -#add_subdirectory(plGeometry) # Not being used by any current slns -#add_subdirectory(plGImage) -add_subdirectory(plGLight) -#add_subdirectory(plGRenderProcs) # Not being used by any current slns -#add_subdirectory(plInputCore) # TODO: DirectX -add_subdirectory(plInterp) -add_subdirectory(plIntersect) -add_subdirectory(plJPEG) +add_definitions(-D_LIB) + +add_subdirectory(plAgeDescription) +add_subdirectory(plAgeLoader) +add_subdirectory(plAudible) +#add_subdirectory(plAudio) # TODO: DirectX +#add_subdirectory(plAudioCore) # TODO: DirectX +add_subdirectory(plAvatar) +add_subdirectory(plCompression) +add_subdirectory(plContainer) +#add_subdirectory(plDeviceSelector) # Not being used by any current slns +add_subdirectory(plDrawable) +add_subdirectory(plEncryption) +add_subdirectory(plFile) +#add_subdirectory(plGClip) # Not being used by any current slns +#add_subdirectory(plGeometry) # Not being used by any current slns +#add_subdirectory(plGImage) +add_subdirectory(plGLight) +#add_subdirectory(plGRenderProcs) # Not being used by any current slns +#add_subdirectory(plInputCore) # TODO: DirectX +add_subdirectory(plInterp) +add_subdirectory(plIntersect) +add_subdirectory(plJPEG) +add_subdirectory(plMath) +add_subdirectory(plMessage) +#add_subdirectory(plModifier) # TODO: PhysX +#add_subdirectory(plNetClient) # TODO: STLport +add_subdirectory(plNetClientComm) +add_subdirectory(plNetClientRecorder) +#add_subdirectory(plNetCommon) # TODO: STLport +add_subdirectory(plNetGameLib) +#add_subdirectory(plNetMessage) +#add_subdirectory(plNetTransport) +#add_subdirectory(plParticleSystem) +#add_subdirectory(plPhysical) +#add_subdirectory(plPhysX) +#add_subdirectory(plPipeline) +#add_subdirectory(plProgressMgr) +#add_subdirectory(plResMgr) +#add_subdirectory(plScene) +#add_subdirectory(plSDL) +#add_subdirectory(plSDLBrowser) # Not being used by any current slns +#add_subdirectory(plSockets) +#add_subdirectory(plStatGather) +#add_subdirectory(plStatusLog) +#add_subdirectory(plStreamLogger) +#add_subdirectory(plSurface) +#add_subdirectory(plTransform) +#add_subdirectory(plUnifiedTime) +#add_subdirectory(plUUID) +#add_subdirectory(plVault) +#add_subdirectory(plWinStrBlock) # Not being used by any current slns +#add_subdirectory(plWndCtrls) # Not being used by any current slns +#add_subdirectory(PubUtilInc) diff --git a/Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt new file mode 100644 index 00000000..72e12ffe --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plMath/CMakeLists.txt @@ -0,0 +1,24 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plMath_SOURCES + hsNoiseFunc.cpp + hsRadixSort.cpp + plAvg.cpp + plTriUtils.cpp +) + +set(plMath_HEADERS + hsNoiseFunc.h + hsRadixSort.h + hsSearchVersion.h + plAvg.h + plRandom.h + plTriUtils.h +) + +add_library(plMath STATIC ${plMath_SOURCES} ${plMath_HEADERS}) + +source_group("Source Files" FILES ${plMath_SOURCES}) +source_group("Header Files" FILES ${plMath_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt new file mode 100644 index 00000000..36a3376f --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plMessage/CMakeLists.txt @@ -0,0 +1,131 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plMessage_SOURCES + plAccountUpdateMsg.cpp + plAIMsg.cpp + plAnimCmdMsg.cpp + plAvatarMsg.cpp + plAvCoopMsg.cpp + plBulletMsg.cpp + plCaptureRenderMsg.cpp + plCCRMsg.cpp + plClimbMsg.cpp + plCollideMsg.cpp + plDynaDecalEnableMsg.cpp + plDynamicEnvMapMsg.cpp + plDynamicTextMsg.cpp + plInputEventMsg.cpp + plInputIfaceMgrMsg.cpp + plLayRefMsg.cpp + plLinkToAgeMsg.cpp + plListenerMsg.cpp + plLoadAgeMsg.cpp + plLoadAvatarMsg.cpp + plLoadCloneMsg.cpp + plLOSHitMsg.cpp + plLOSRequestMsg.cpp + plMatrixUpdateMsg.cpp + plMultistageMsg.cpp + plNCAgeJoinerMsg.cpp + plNetClientMgrMsg.cpp + plNetCommMsgs.cpp + plNetVoiceListMsg.cpp + plOneShotCallbacks.cpp + plOneShotMsg.cpp + plRenderRequestMsg.cpp + plRideAnimatedPhysMsg.cpp + plRippleShapeMsg.cpp + plSimInfluenceMsg.cpp + plSimStateMsg.cpp + plSwimMsg.cpp + plSynchEnableMsg.cpp + plTransitionMsg.cpp + plVaultNotifyMsg.cpp +) + +set(plMessage_HEADERS + plAccountUpdateMsg.h + plActivatorMsg.h + plAgeLoadedMsg.h + plAIMsg.h + plAngularVelocityMsg.h + plAnimCmdMsg.h + plAvatarFootMsg.h + plAvatarMsg.h + plAvCoopMsg.h + plBulletMsg.h + plCaptureRenderMsg.h + plCCRMessageCreatable.h + plCCRMsg.h + plClimbEventMsg.h + plClimbMsg.h + plCollideMsg.h + plCondRefMsg.h + plConnectedToVaultMsg.h + plConsoleMsg.h + plDeviceRecreateMsg.h + plDynaDecalEnableMsg.h + plDynamicEnvMapMsg.h + plDynamicTextMsg.h + plElementRefMsg.h + plExcludeRegionMsg.h + plInputEventMsg.h + plInputIfaceMgrMsg.h + plInterestingPing.h + plLayRefMsg.h + plLightRefMsg.h + plLinearVelocityMsg.h + plLinkToAgeMsg.h + plListenerMsg.h + plLoadAgeMsg.h + plLoadAvatarMsg.h + plLoadCloneMsg.h + plLOSHitMsg.h + plLOSRequestMsg.h + plMatRefMsg.h + plMatrixUpdateMsg.h + plMemberUpdateMsg.h + plMeshRefMsg.h + plMessageCreatable.h + plMovieMsg.h + plMultistageMsg.h + plNCAgeJoinerMsg.h + plNetClientMgrMsg.h + plNetCommMsgs.h + plNetOwnershipMsg.h + plNetVoiceListMsg.h + plNodeCleanupMsg.h + plOneShotCallbacks.h + plOneShotMsg.h + plParticleUpdateMsg.h + plPickedMsg.h + plPreloaderMsg.h + plRenderMsg.h + plRenderRequestMsg.h + plReplaceGeometryMsg.h + plResMgrHelperMsg.h + plResponderMsg.h + plRideAnimatedPhysMsg.h + plRippleShapeMsg.h + plRoomLoadNotifyMsg.h + plShadowCastMsg.h + plSimInfluenceMsg.h + plSimStateMsg.h + plSpawnModMsg.h + plSpawnRequestMsg.h + plSwimMsg.h + plSynchEnableMsg.h + plTimerCallbackMsg.h + plTransitionMsg.h + plTriggerMsg.h + plUniqueIdsMsg.h + plVaultNotifyMsg.h +) + +add_library(plMessage STATIC ${plMessage_SOURCES} ${plMessage_HEADERS}) + +source_group("Source Files" FILES ${plMessage_SOURCES}) +source_group("Header Files" FILES ${plMessage_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp index 8a96043c..63b65e52 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.cpp @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsStream.h" -#include "..\plAvatar\plArmatureMod.h" +#include "plAvatar/plArmatureMod.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h index a3865657..908339f1 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAIMsg.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef NO_AV_MSGS #include "hsGeometry3.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plAvBrainCritter; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h index 6a98b94b..bd50e828 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAccountUpdateMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAccountUpdateMsg_inc #define plAccountUpdateMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plActivatorMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plActivatorMsg.h index 8a2be228..ea14f18a 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plActivatorMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plActivatorMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plActivatorMsg_inc #define plActivatorMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAgeLoadedMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAgeLoadedMsg.h index f57a34b9..e9849850 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAgeLoadedMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAgeLoadedMsg.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAgeLoadedMsg_INC #define plAgeLoadedMsg_INC -#include "../pnUtils/pnUtils.h" -#include "../pnMessage/plMessage.h" +#include "pnUtils/pnUtils.h" +#include "pnMessage/plMessage.h" // // A msg sent locally when pending pages are done loading or unloading. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAngularVelocityMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAngularVelocityMsg.h index 0d9bed8c..bb65bc7c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAngularVelocityMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAngularVelocityMsg.h @@ -39,8 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../../NucleusLib/pnMessage/plSimulationMsg.h" -#include "../../CoreLib/hsGeometry3.h" +#include "pnMessage/plSimulationMsg.h" +#include "hsGeometry3.h" class plAngularVelocityMsg : public plSimulationMsg { public: diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h index c0444e10..4ce85d4c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h @@ -43,12 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimCmdMsg_inc #define plAnimCmdMsg_inc -#include "../pnMessage/plMessageWithCallbacks.h" +#include "pnMessage/plMessageWithCallbacks.h" #include "hsBitVector.h" #include "hsTemplates.h" #include "hsGeometry3.h" -#include "../plInterp/plAnimEaseTypes.h" -#include "../plInterp/plAnimTimeConvert.h" +#include "plInterp/plAnimEaseTypes.h" +#include "plInterp/plAnimTimeConvert.h" class plAGAnimInstance; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp index 8b6ebb12..dea3ab81 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.cpp @@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" // other -#include "../plAvatar/plAvatarMgr.h" -#include "../plAvatar/plCoopCoordinator.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plCoopCoordinator.h" // plAvCoopMsg ----------- // ------------ diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.h index 71a60a40..9523add0 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvCoopMsg.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // INCLUDES // ///////////////////////////////////////////////////////////////////////////////////////// -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" ///////////////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvatarFootMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAvatarFootMsg.h index 5b57e8c2..4fd27701 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvatarFootMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvatarFootMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAvatarFootMsg_inc #define plAvatarFootMsg_inc -#include "../pnMessage/plEventCallbackMsg.h" +#include "pnMessage/plEventCallbackMsg.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp index 41bd7759..17f5f53b 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp @@ -45,11 +45,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnSceneObject/plSceneObject.h" #ifndef SERVER -#include "../plAvatar/plAvBrain.h" +#include "plAvatar/plAvBrain.h" #endif diff --git a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h index 32ba1151..8c84bd7f 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.h @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAvatarMsg_inc #define plAvatarMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsBitVector.h" -#include "../plAvatar/plArmatureMod.h" -#include "../pnMessage/plEventCallbackMsg.h" +#include "plAvatar/plArmatureMod.h" +#include "pnMessage/plEventCallbackMsg.h" class plSceneObject; class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.h index b33247ae..85d3ee36 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plBulletMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plBulletMsg_inc #define plBulletMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" class plBulletMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp index a681c3ef..fb4740a5 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.cpp @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plCCRMsg.h" -#include "../pnNetCommon/plNetApp.h" -#include "../plResMgr/plResManager.h" -#include "../plNetCommon/plNetCommon.h" +#include "pnNetCommon/plNetApp.h" +#include "plResMgr/plResManager.h" +#include "plNetCommon/plNetCommon.h" void plCCRPetitionMsg::Read(hsStream* stream, hsResMgr* mgr) { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.h index 82d141ad..163f1db2 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plCCRMsg.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCCRMsg_h #define plCCRMsg_h -#include "../pnMessage/plMessage.h" -#include "../plNetCommon/plNetCommon.h" +#include "pnMessage/plMessage.h" +#include "plNetCommon/plNetCommon.h" // // Abstract Baseclass for CCR messages. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp index 309dbff7..22e019aa 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.cpp @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plCaptureRenderMsg.h" -#include "../plGImage/plMipmap.h" +#include "plGImage/plMipmap.h" plCaptureRenderMsg::~plCaptureRenderMsg() { hsRefCnt_SafeUnRef(fMipmap); -} \ No newline at end of file +} diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.h index 98f25a46..c0275bfd 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plCaptureRenderMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCaptureRenderMsg_inc #define plCaptureRenderMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plMipmap; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plClimbEventMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plClimbEventMsg.h index fbe67eb5..1a41539a 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plClimbEventMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plClimbEventMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClimbEventMsg_h_inc #define plClimbEventMsg_h_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.h index 4927d010..a4766070 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plClimbMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plClimbMsg_h #define plClimbMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" /** \class plClimbMsg Things you can say with a climb message: diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.h index 502c19a7..ae284f65 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plCollideMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLCOLLIDEMSG_INC #define PLCOLLIDEMSG_INC -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plCollideMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h index 14a0a5d1..05dbb227 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plCondRefMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plCondRefMsg_inc #define plCondRefMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsStream.h" class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plConnectedToVaultMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plConnectedToVaultMsg.h index cbc059f5..4fa237fd 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plConnectedToVaultMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plConnectedToVaultMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plConnectedToVaultMsg_INC #define plConnectedToVaultMsg_INC -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" // // A msg sent locally (once) when the client has successfully connected to the vault. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plConsoleMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plConsoleMsg.h index 56724790..da4a2311 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plConsoleMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plConsoleMsg.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plConsoleMsg_inc #define plConsoleMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plEventCallbackMsg; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDeviceRecreateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plDeviceRecreateMsg.h index 382c5ecd..16a1e685 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plDeviceRecreateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plDeviceRecreateMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plDeviceRecreateMsg_h #define _plDeviceRecreateMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPipeline; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.h index 9e1ba91b..f27f8297 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plDynaDecalEnableMsg.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDynaDecalEnableMsg_inc #define plDynaDecalEnableMsg_inc -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/plKey.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/plKey.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.h index 3c408702..455ecf84 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plDynamicEnvMapMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDynamicEnvMapMsg_inc #define plDynamicEnvMapMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" #include "hsColorRGBA.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.h index 743b5173..c75b2b7e 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plDynamicTextMsg_h #define _plDynamicTextMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsColorRGBA.h" class plDynamicTextMap; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h index c1055820..ffd45542 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plExcludeRegionMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plExcludeRegionMsg_inc #define plExcludeRegionMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp index 5ae463bd..89f54929 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plInputEventMsg.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsResMgr.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.h index 708f30e1..e2f21c86 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plInputEventMsg.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInputEventMsg_inc #define plInputEventMsg_inc -#include "../pnMessage/plMessage.h" -#include "../pnInputCore/plControlDefinition.h" +#include "pnMessage/plMessage.h" +#include "pnInputCore/plControlDefinition.h" #include "hsGeometry3.h" #include "hsStream.h" #include "hsUtils.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp index 9d7f539d..1b7e1116 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.cpp @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plInputIfaceMgrMsg.h" -#include "../plInputCore/plInputInterface.h" +#include "plInputCore/plInputInterface.h" #include "hsResMgr.h" #include "hsRefCnt.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h index 43d0c9cd..b861eeba 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h @@ -51,8 +51,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStream.h" #include "hsResMgr.h" -#include "../pnMessage/plMessage.h" -#include "../pnUtils/pnUtils.h" +#include "pnMessage/plMessage.h" +#include "pnUtils/pnUtils.h" class plInputInterface; class plInputIfaceMgrMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plInterestingPing.h b/Sources/Plasma/PubUtilLib/plMessage/plInterestingPing.h index 40c21023..f5c74672 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plInterestingPing.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plInterestingPing.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plInterestingPing_inc #define plInterestingPing_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h index 4ff6b9fc..2166416c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLOSHitMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLOSHitMsg_inc #define plLOSHitMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsStream.h" #include "hsResMgr.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp index 899d3adb..c2dbfe54 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plLOSRequestMsg.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" plLOSRequestMsg::plLOSRequestMsg() : fRequestID(0), diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.h index 60a1be0c..b4ee9b8a 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLOSRequestMsg.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLOSRequestMsg_inc #define plLOSRequestMsg_inc -#include "../pnMessage/plMessage.h" -#include "../plPhysical/plSimDefs.h" +#include "pnMessage/plMessage.h" +#include "plPhysical/plSimDefs.h" #include "hsGeometry3.h" class plLOSRequestMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.h index 633f8cb5..a67a0b37 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLayRefMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLayRefMsg_inc #define plLayRefMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLightRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLightRefMsg.h index 1078bab0..28898c31 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLightRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLightRefMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLightRefMsg_inc #define plLightRefMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" class hsKeyedObject; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLinearVelocityMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLinearVelocityMsg.h index 095935a8..b182c6ed 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLinearVelocityMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLinearVelocityMsg.h @@ -39,8 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../../NucleusLib/pnMessage/plSimulationMsg.h" -#include "../../CoreLib/hsGeometry3.h" +#include "pnMessage/plSimulationMsg.h" +#include "hsGeometry3.h" class plLinearVelocityMsg : public plSimulationMsg { public: diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp index f8e17b9f..f162dec4 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" #include "hsUtils.h" #include "plgDispatch.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plNetCommon.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetCommon.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h index 380252b3..029d70cb 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLinkToAgeMsg_INC #define plLinkToAgeMsg_INC -#include "../pnMessage/plMessageWithCallbacks.h" -#include "../pnMessage/plEventCallbackMsg.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plNetCommonHelpers.h" +#include "pnMessage/plMessageWithCallbacks.h" +#include "pnMessage/plEventCallbackMsg.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetCommonHelpers.h" #include "hsUtils.h" //////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp index d8691e1a..8ef206dc 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.cpp @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plListenerMsg.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plFixedKey.h" void plListenerMsg::Read(hsStream* s, hsResMgr* mgr) diff --git a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h index 6c2ae2fa..908235ed 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plListenerMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plListenerMsg_inc #define plListenerMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" class plListenerMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h index a4d1551a..5e9472c8 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLoadAgeMsg_INC #define plLoadAgeMsg_INC -#include "../pnMessage/plMessage.h" -#include "../plUUID/plUUID.h" +#include "pnMessage/plMessage.h" +#include "plUUID/plUUID.h" #include "hsUtils.h" // diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp index 0218c9ef..091d205c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp @@ -45,10 +45,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plLoadAvatarMsg.h" #include "hsResMgr.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnNetCommon/plSynchedObject.h" +#include "pnNetCommon/plNetApp.h" +#include "pnNetCommon/plSynchedObject.h" -#include "../plAvatar/plAvatarTasks.h" +#include "plAvatar/plAvatarTasks.h" ////////////////// diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.h index 5ca1b060..05e837cc 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.h @@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plLoadCloneMsg.h" #include "hsUtils.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" class plAvTask; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp index 697646c6..5fffbb5b 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.cpp @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsResMgr.h" // other -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" #include "hsTypes.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.h index 47cf5cb1..f03dceb3 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plLoadCloneMsg.h @@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plLoadCloneMsgMsg_INC -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" // #include "hsUtils.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" /** \class plLoadCloneMsg Tell the net client manager to allocate a new object based on copying an diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMatRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMatRefMsg.h index 0c2a55c0..e3483cf1 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMatRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMatRefMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMatRefMsg_inc #define plMatRefMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" class plMatRefMsg : public plGenRefMsg { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h index e0f95f4a..fa78608d 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMatrixUpdateMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMatrixUpdateMsg_inc #define plMatrixUpdateMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsMatrix44.h" class plMatrixUpdateMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMemberUpdateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMemberUpdateMsg.h index e4151666..43966fd0 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMemberUpdateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMemberUpdateMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMemberUpdateMsg_INC #define plMemberUpdateMsg_INC -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsUtils.h" // diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMeshRefMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMeshRefMsg.h index b40c167d..e974b5a3 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMeshRefMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMeshRefMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMeshRefMsg_inc #define plMeshRefMsg_inc -#include "../pnMessage/plRefMsg.h" +#include "pnMessage/plRefMsg.h" #include "hsStream.h" class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h b/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h index 25dac2e2..7258c1a8 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMessageCreatable.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMessageCreatable_inc #define plMessageCreatable_inc -#include "../pnFactory/plCreator.h" +#include "pnFactory/plCreator.h" #include "plInterestingPing.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h index fdeb74b0..9b72e2f8 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMovieMsg_inc #define plMovieMsg_inc -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsPoint2.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.h index 0b9753dd..0a91aa5b 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMultistageMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMultistageMsg_inc #define plMultistageMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsBitVector.h" // Messages sent to a MultistageModifier. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.h index 0a380b9e..4d6c1ff9 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNCAgeJoinerMsg.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNCAGEJOINERMSG_H #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNCAGEJOINERMSG_H -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plNCAgeJoinerMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.h index d84c3bdb..70749cf3 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNetClientMgrMsg.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNETCLIENTMGRMSG_H #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNETCLIENTMGRMSG_H -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plNetClientMgrMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h b/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h index f8d55641..99c3c2bb 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNetCommMsgs.h @@ -49,10 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLNETCOMMMSGS_H -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../pnMessage/plMessage.h" -#include "../pnNetProtocol/pnNetProtocol.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "pnMessage/plMessage.h" +#include "pnNetProtocol/pnNetProtocol.h" class plNetCommReplyMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h index ad00ef2b..e1bd9014 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNetOwnershipMsg.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetOwnershipMsg_INC #include "hsStlUtils.h" -#include "../pnMessage/plMessage.h" -#include "../plNetMessage/plNetMessage.h" +#include "pnMessage/plMessage.h" +#include "plNetMessage/plNetMessage.h" // // A msg sent locally when this client changes ownership of a group of objects diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.h index d83e6281..72ed53fc 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNetVoiceListMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetVoiceListMsg_inc #define plNetVoiceListMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsTemplates.h" class plNetVoiceListMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plNodeCleanupMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plNodeCleanupMsg.h index 8d020514..1f4fbdd4 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plNodeCleanupMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plNodeCleanupMsg.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plNodeCleanupMsg_h #define _plNodeCleanupMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plNodeCleanupMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h b/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h index 5998c59a..e576bb26 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "hsRefCnt.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plParticleUpdateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plParticleUpdateMsg.h index 051c25a5..5eef2a2f 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plParticleUpdateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plParticleUpdateMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plParticleUpdateMsg_inc #define plParticleUpdateMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsResMgr.h" #include "hsStream.h" #include "hsBitVector.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plPickedMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plPickedMsg.h index 6c09c1ff..27c20b95 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plPickedMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plPickedMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPickedMsg_inc #define plPickedMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plPreloaderMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plPreloaderMsg.h index da60a98a..afb24105 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plPreloaderMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plPreloaderMsg.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLPRELOADERMSG_H #define PLASMA20_SOURCES_PLASMA_PUBUTILLIB_PLMESSAGE_PLPRELOADERMSG_H -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPreloaderMsg : public plMessage { public: diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRenderMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plRenderMsg.h index 812df545..5239e33f 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRenderMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plRenderMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRenderMsg_inc #define plRenderMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPipeline; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp index 577fdd9c..f36b32a7 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.cpp @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "plRenderRequestMsg.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plFixedKey.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plFixedKey.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.h index 5755f2d1..094d5324 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plRenderRequestMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRenderRequestMsg_inc #define plRenderRequestMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsRefCnt.h" class plRenderRequest; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plReplaceGeometryMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plReplaceGeometryMsg.h index fe016543..7897407c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plReplaceGeometryMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plReplaceGeometryMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plReplaceGeometryMsg_inc #define plReplaceGeometryMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plSharedMesh; class hsGMaterial; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h index 79a2422f..8b1ff388 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plResMgrHelperMsg.h @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStream.h" -#include "../pnMessage/plMessage.h" -#include "../plResMgr/plResManagerHelper.h" +#include "pnMessage/plMessage.h" +#include "plResMgr/plResManagerHelper.h" class plResManagerHelper; class plResMgrHelperMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plResponderMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plResponderMsg.h index 56cf5b03..1dbed889 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plResponderMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plResponderMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plResponderMsg_inc #define plResponderMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" // Derive your message from this class if you need to know the key of the avatar // that activated your responder diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.h index dbe573d9..764a4395 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plRideAnimatedPhysMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_RIDE_ANIMATED_PHYS_MSG #define PL_RIDE_ANIMATED_PHYS_MSG -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plRideAnimatedPhysMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.h index 8e1d16f1..991d6f7e 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plRippleShapeMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plRippleShapeMsg_inc #define plRippleShapeMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPrintShape; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plRoomLoadNotifyMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plRoomLoadNotifyMsg.h index 0da01e59..bb87e8bb 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plRoomLoadNotifyMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plRoomLoadNotifyMsg.h @@ -51,7 +51,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // Its up to the receiver to decide if they are interested in that particular room // -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plRoomLoadNotifyMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plShadowCastMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plShadowCastMsg.h index 96e71a92..f5707708 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plShadowCastMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plShadowCastMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plShadowCastMsg_inc #define plShadowCastMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plPipeline; class plShadowCaster; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp index 0af7aa91..da166d76 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.cpp @@ -39,8 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../plMessage/plSimInfluenceMsg.h" -#include "../../CoreLib/hsStream.h" +#include "plMessage/plSimInfluenceMsg.h" +#include "hsStream.h" /* void plSimInfluenceMsg::Read(hsStream *stream, hsResMgr *mgr) diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h index 204d6f06..3a51c671 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSimInfluenceMsg.h @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLSIMINFLUENCEMSG_H #define PLSIMINFLUENCEMSG_H /* -#include "../../NucleusLib/pnMessage/plSimulationMsg.h" -#include "../../CoreLib/hsGeometry3.h" +#include "pnMessage/plSimulationMsg.h" +#include "hsGeometry3.h" //////////// // diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp index eead4707..9d3b9fe2 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.cpp @@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "../plMessage/plSimStateMsg.h" +#include "plMessage/plSimStateMsg.h" #include "hsResMgr.h" void plSubWorldMsg::Read(hsStream *stream, hsResMgr *mgr) diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.h index c3958118..9ba77fac 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSimStateMsg.h @@ -44,7 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLSIMSTATEMSG_INC #define PLSIMSTATEMSG_INC -#include "../pnMessage/plSimulationMsg.h" +#include "pnMessage/plSimulationMsg.h" // use a nil key to return to main world // otherwise pass in the key of the world you're going to. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSpawnModMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSpawnModMsg.h index 719b549b..7be544e1 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSpawnModMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSpawnModMsg.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSpawnModMsg_inc #define plSpawnModMsg_inc -#include "../pnMessage/plMessage.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnMessage/plMessage.h" +#include "pnKeyedObject/plUoid.h" #include "hsGeometry3.h" class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSpawnRequestMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSpawnRequestMsg.h index 4ec3746e..6ab4042f 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSpawnRequestMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSpawnRequestMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSpawnRequestMsg_inc #define plSpawnRequestMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class hsStream; class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.h index fd4eec4f..95487496 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSwimMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSwimMsg_h #define plSwimMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" /** \class plSwimMsg You're either entering the pool, or leaving. Those are the only swim messages right now. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp b/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp index da98f048..097d6065 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp +++ b/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plSynchEnableMsg.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnNetCommon/plNetApp.h" plSynchEnableMsg::plSynchEnableMsg(bool push, bool enable) : fPush(push), fEnable(enable) { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.h index ee8bdda6..669789c8 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plSynchEnableMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSynchEnableMsg_h #define plSynchEnableMsg_h -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" // // Push or pop a cmd to enable/disable dirty state tracking. diff --git a/Sources/Plasma/PubUtilLib/plMessage/plTimerCallbackMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plTimerCallbackMsg.h index 0427bd44..77a313a7 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plTimerCallbackMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plTimerCallbackMsg.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plTimerCallbackMsg_inc #define plTimerCallbackMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" #include "hsStream.h" class hsResMgr; diff --git a/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.h index b6abaa85..dc54521c 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plTransitionMsg.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStream.h" -#include "../pnMessage/plMessageWithCallbacks.h" +#include "pnMessage/plMessageWithCallbacks.h" class plTransitionMsg : public plMessageWithCallbacks { diff --git a/Sources/Plasma/PubUtilLib/plMessage/plTriggerMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plTriggerMsg.h index b5de339f..df9cfd12 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plTriggerMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plTriggerMsg.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plTriggerMsg_inc #define plTriggerMsg_inc -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" class plTriggerMsg : public plMessage diff --git a/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.h index 65430305..a5e32145 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plVaultNotifyMsg.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plVaultNotifyMsg_h_inc #define plVaultNotifyMsg_h_inc -#include "../pnMessage/plMessage.h" -#include "../plNetCommon/plNetCommonHelpers.h" -#include "../plNetCommon/plNetCommon.h" +#include "pnMessage/plMessage.h" +#include "plNetCommon/plNetCommonHelpers.h" +#include "plNetCommon/plNetCommon.h" class plVaultNotifyMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plNetClientComm/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetClientComm/CMakeLists.txt new file mode 100644 index 00000000..77339ecf --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetClientComm/CMakeLists.txt @@ -0,0 +1,21 @@ +include_directories("../../CoreLib") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plNetClientComm_SOURCES + plNetClientComm.cpp +) + +set(plNetClientComm_HEADERS + plNetClientComm.h + plNetClientCommCreatable.h +) + +add_library(plNetClientComm STATIC ${plNetClientComm_SOURCES} ${plNetClientComm_HEADERS}) + +source_group("Source Files" FILES ${plNetClientComm_SOURCES}) +source_group("Header Files" FILES ${plNetClientComm_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp index 135be4de..d0f85d71 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp @@ -47,21 +47,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientComm.h" -#include "../pnAsyncCore/pnAsyncCore.h" -#include "../pnProduct/pnProduct.h" -#include "../pnNetCli/pnNetCli.h" -#include "../plNetGameLib/plNetGameLib.h" -#include "../pnIni/pnIni.h" - -#include "../plMessage/plNetCommMsgs.h" -#include "../plMessage/plNetClientMgrMsg.h" -#include "../plNetMessage/plNetMessage.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plVault/plVault.h" -#include "../plMessage/plAccountUpdateMsg.h" -#include "../plNetClient/plNetClientMgr.h" - -#include "../../FeatureLib/pfMessage/pfKIMsg.h" +#include "pnAsyncCore/pnAsyncCore.h" +#include "pnProduct/pnProduct.h" +#include "pnNetCli/pnNetCli.h" +#include "plNetGameLib/plNetGameLib.h" +#include "pnIni/pnIni.h" + +#include "plMessage/plNetCommMsgs.h" +#include "plMessage/plNetClientMgrMsg.h" +#include "plNetMessage/plNetMessage.h" +#include "plNetCommon/plNetCommon.h" +#include "plVault/plVault.h" +#include "plMessage/plAccountUpdateMsg.h" +#include "plNetClient/plNetClientMgr.h" + +#include "pfMessage/pfKIMsg.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h index 5e38eabc..91cc7cdd 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h +++ b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h @@ -54,11 +54,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" -#include "../pnUtils/pnUtils.h" -#include "../pnNetBase/pnNetBase.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plNetCommonHelpers.h" -#include "../plMessage/plNetCommMsgs.h" +#include "pnUtils/pnUtils.h" +#include "pnNetBase/pnNetBase.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetCommonHelpers.h" +#include "plMessage/plNetCommMsgs.h" class plNetMessage; diff --git a/Sources/Plasma/PubUtilLib/plNetClientRecorder/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetClientRecorder/CMakeLists.txt new file mode 100644 index 00000000..9387185b --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetClientRecorder/CMakeLists.txt @@ -0,0 +1,19 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +set(plNetClientRecorder_SOURCES + plNetClientRecorder.cpp + plNetClientStatsRecorder.cpp + plNetClientStreamRecorder.cpp +) + +set(plNetClientRecorder_HEADERS + plNetClientRecorder.h +) + +add_library(plNetClientRecorder STATIC ${plNetClientRecorder_SOURCES} ${plNetClientRecorder_HEADERS}) + +source_group("Source Files" FILES ${plNetClientRecorder_SOURCES}) +source_group("Header Files" FILES ${plNetClientRecorder_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp index 05c2458e..c232bb27 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientRecorder.cpp @@ -43,20 +43,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "hsTimer.h" -#include "../plNetMessage/plNetMessage.h" +#include "plNetMessage/plNetMessage.h" #include "plCreatableIndex.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../plSDL/plSDL.h" -#include "../pnNetCommon/plNetApp.h" +#include "plSDL/plSDL.h" +#include "pnNetCommon/plNetApp.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "plMessage/plAgeLoadedMsg.h" -#include "../plStatusLog/plStatusLog.h" -#include "../plFile/hsFiles.h" +#include "plStatusLog/plStatusLog.h" +#include "plFile/hsFiles.h" plNetClientRecorder::plNetClientRecorder(TimeWrapper* timeWrapper) : fTimeWrapper(timeWrapper) diff --git a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStatsRecorder.cpp b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStatsRecorder.cpp index d93169dd..ba2facf6 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStatsRecorder.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStatsRecorder.cpp @@ -41,19 +41,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetClientRecorder.h" #include "hsStream.h" -#include "../plNetMessage/plNetMessage.h" +#include "plNetMessage/plNetMessage.h" #include "plCreatableIndex.h" #include "plgDispatch.h" -#include "../plSDL/plSDL.h" -#include "../pnNetCommon/plNetApp.h" +#include "plSDL/plSDL.h" +#include "pnNetCommon/plNetApp.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "plMessage/plAgeLoadedMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" plNetClientStatsRecorder::plNetClientStatsRecorder(TimeWrapper* timeWrapper) : diff --git a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStreamRecorder.cpp b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStreamRecorder.cpp index 91d12be3..62fb8b38 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStreamRecorder.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientRecorder/plNetClientStreamRecorder.cpp @@ -41,20 +41,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetClientRecorder.h" #include "hsStream.h" -#include "../plNetMessage/plNetMessage.h" +#include "plNetMessage/plNetMessage.h" #include "plCreatableIndex.h" #include "hsResMgr.h" #include "plgDispatch.h" -#include "../plSDL/plSDL.h" -#include "../pnNetCommon/plNetApp.h" +#include "plSDL/plSDL.h" +#include "pnNetCommon/plNetApp.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../plMessage/plLoadAvatarMsg.h" -#include "../plMessage/plLinkToAgeMsg.h" -#include "../pnMessage/plNotifyMsg.h" -#include "../plMessage/plAgeLoadedMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plLoadAvatarMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "pnMessage/plNotifyMsg.h" +#include "plMessage/plAgeLoadedMsg.h" -#include "../plStatusLog/plStatusLog.h" +#include "plStatusLog/plStatusLog.h" plNetClientStreamRecorder::plNetClientStreamRecorder(TimeWrapper* timeWrapper) : plNetClientLoggingRecorder(timeWrapper), diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h index b1e0b534..a7229ff7 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h @@ -45,9 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" #include "hsTimer.h" -#include "../pnNetCommon/pnNetCommon.h" -#include "../pnNetCommon/plNetApp.h" -#include "../pnFactory/plCreatable.h" +#include "pnNetCommon/pnNetCommon.h" +#include "pnNetCommon/plNetApp.h" +#include "pnFactory/plCreatable.h" //////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h index 33152de8..6a3bb976 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" -#include "../pnNetCommon/plNetServers.h" -#include "../plNetCommon/plSpawnPointInfo.h" -#include "../plUUID/plUUID.h" +#include "pnFactory/plCreatable.h" +#include "pnNetCommon/plNetServers.h" +#include "plNetCommon/plSpawnPointInfo.h" +#include "plUUID/plUUID.h" class hsStream; diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt new file mode 100644 index 00000000..b955b145 --- /dev/null +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib") + +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(plNetGameLib_PRIVATE + Private/plNglAllIncludes.h + Private/plNglAuth.h + Private/plNglAuth.cpp + Private/plNglCore.h + Private/plNglCore.cpp + Private/plNglCsr.h + Private/plNglCsr.cpp + Private/plNglFile.h + Private/plNglFile.cpp + Private/plNglGame.h + Private/plNglGame.cpp + Private/plNglGateKeeper.h + Private/plNglGateKeeper.cpp + Private/plNglMisc.cpp + Private/plNglTrans.cpp +) + +set(plNetGameLib_HEADERS + Intern.h + Pch.h + plNetGameLib.h +) + +add_library(plNetGameLib STATIC ${plNetGameLib_PRIVATE} ${plNetGameLib_HEADERS}) + +source_group("Private" FILES ${plNetGameLib_PRIVATE}) +source_group("Header Files" FILES ${plNetGameLib_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAllIncludes.h b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAllIncludes.h index a4bbe0ee..0220752f 100644 --- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAllIncludes.h +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAllIncludes.h @@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // libs on which we rely -#include "../pnGameMgr/pnGameMgr.h" +#include "pnGameMgr/pnGameMgr.h" #include "plNglCore.h" #include "plNglAuth.h" diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h index aee848d3..7e457948 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.h @@ -49,21 +49,21 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBitVector.h" #include "hsTemplates.h" #include "plGeneric.h" -#include "../pnNetCommon/plNetServers.h" -#include "../pnNetCommon/plNetGroup.h" -#include "../pnFactory/plCreatable.h" -#include "../pnFactory/plFactory.h" -#include "../plUnifiedTime/plClientUnifiedTime.h" -#include "../plNetCommon/plNetServerSessionInfo.h" -#include "../plNetCommon/plNetCommon.h" -#include "../plNetCommon/plNetCommonHelpers.h" -#include "../plNetCommon/plNetCommonConstants.h" - -#include "../plStreamLogger/plStreamLogger.h" +#include "pnNetCommon/plNetServers.h" +#include "pnNetCommon/plNetGroup.h" +#include "pnFactory/plCreatable.h" +#include "pnFactory/plFactory.h" +#include "plUnifiedTime/plClientUnifiedTime.h" +#include "plNetCommon/plNetServerSessionInfo.h" +#include "plNetCommon/plNetCommon.h" +#include "plNetCommon/plNetCommonHelpers.h" +#include "plNetCommon/plNetCommonConstants.h" + +#include "plStreamLogger/plStreamLogger.h" #include "plNetMsgHelpers.h" -#include "../pnNetBase/pnNetBase.h" +#include "pnNetBase/pnNetBase.h" #include diff --git a/Sources/Plasma/PubUtilLib/plUUID/plUUID.h b/Sources/Plasma/PubUtilLib/plUUID/plUUID.h index 2c181580..81f42989 100644 --- a/Sources/Plasma/PubUtilLib/plUUID/plUUID.h +++ b/Sources/Plasma/PubUtilLib/plUUID/plUUID.h @@ -44,8 +44,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsStlUtils.h" -#include "../pnUtils/pnUtils.h" -#include "../pnFactory/plCreatable.h" +#include "pnUtils/pnUtils.h" +#include "pnFactory/plCreatable.h" class hsStream;