From 95eaaf82a04bdab1a23232f52bd6683ef9b80b5a Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 9 Apr 2011 18:31:52 -0700 Subject: [PATCH] Fix some more include paths (cherry picked from commit 65ace75aa9350a48214d5f33f5bea4e16106a398) --- Sources/Plasma/Apps/plClient/plClient.cpp | 2 +- Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h | 2 +- Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp | 2 +- Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h | 6 +++--- Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h | 2 +- .../Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp | 10 +++++----- .../Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp | 2 +- .../Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp | 8 ++++---- .../Plasma/NucleusLib/pnNetCommon/plSynchedObject.h | 4 ++-- .../Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp | 8 ++++---- Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp index c13b7d41..73898121 100644 --- a/Sources/Plasma/Apps/plClient/plClient.cpp +++ b/Sources/Plasma/Apps/plClient/plClient.cpp @@ -978,7 +978,7 @@ void plClient::SetHoldLoadRequests(bool hold) ILoadNextRoom(); } -#include "../plResMgr/plPageInfo.h" +#include "plResMgr/plPageInfo.h" void plClient::IQueueRoomLoad(const std::vector& locs, bool hold) { diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h b/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h index f8bcd5b4..e18b4d39 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class hsStream; diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp index ccf0737f..48316716 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetApp.h" #include "hsStlUtils.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" plNetApp* plNetApp::fInstance = nil; plNetObjectDebuggerBase* plNetObjectDebuggerBase::fInstance=nil; diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h index dfa378f4..f4a21991 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBitVector.h" #include "plNetGroup.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plUoid.h" -#include "../../PubUtilLib/plStatusLog/plLoggable.h" +#include "plStatusLog/plLoggable.h" #include diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h b/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h index b19a9547..78121ea2 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetGroup_h #define plNetGroup_h -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" #include "hsStream.h" #include "hsStlUtils.h" diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp index 567aca5b..7bc5cef6 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp @@ -61,11 +61,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "plNetResManager.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnFactory/plCreatable.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnFactory/plCreatable.h" +#include "pnNetCommon/plNetApp.h" #include "hsStream.h" plNetResManager::plNetResManager() diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp index 2f4bb2d9..d1996ef5 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plNetSharedState.h" #include "plGenericVar.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" plNetSharedState::plNetSharedState(char* name) : fServerMayDelete(false) { diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp index eec71b63..5d889f03 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetApp.h" #include "plNetGroup.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../pnMessage/plSetNetGroupIDMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "pnMessage/plSetNetGroupIDMsg.h" #include diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h index 0142dcfa..0c429e75 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h @@ -43,8 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLSYNCHOBJ_inc #include "hsTypes.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" #include "hsStlUtils.h" #include "plNetGroup.h" diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp index 56ce188b..51312387 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSynchedValue.h" #ifdef USE_SYNCHED_VALUES -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsBitVector.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plUoid.h" +#include "pnSceneObject/plCoordinateInterface.h" #define ISaveOrLoadSimpleType() \ { \ diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp index 17c4812a..3868b390 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp @@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pnNetCommon.h" -#include "../pnAddrInfo/pnAddrInfo.h" +#include "pnAddrInfo/pnAddrInfo.h" #ifdef HS_BUILD_FOR_WIN32 # include "hsWindows.h" #elif HS_BUILD_FOR_UNIX