Fix some more include paths

(cherry picked from commit 65ace75aa9)
13 years ago · 95eaaf82a0
11 changed files with 24 additions and 24 deletions
--- 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<plLocation>& locs, bool hold)
 {
--- 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;

--- 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;
--- 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 <stdarg.h>

--- 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"

--- 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()
--- 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)
 { 
--- 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 <algorithm>

--- 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"

--- 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() \
 { \
--- 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