Browse Source

Fix some more include paths

Michael Hansen 14 years ago
parent
commit
65ace75aa9
  1. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp
  2. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h
  3. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp
  4. 6
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h
  5. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h
  6. 10
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp
  7. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp
  8. 8
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp
  9. 4
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h
  10. 8
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp
  11. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp

@ -960,7 +960,7 @@ void plClient::SetHoldLoadRequests(bool hold)
ILoadNextRoom(); ILoadNextRoom();
} }
#include "../plResMgr/plPageInfo.h" #include "plResMgr/plPageInfo.h"
void plClient::IQueueRoomLoad(const std::vector<plLocation>& locs, bool hold) void plClient::IQueueRoomLoad(const std::vector<plLocation>& locs, bool hold)
{ {

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h

@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTypes.h" #include "hsTypes.h"
#include "hsUtils.h" #include "hsUtils.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "../pnFactory/plCreatable.h" #include "pnFactory/plCreatable.h"
class hsStream; class hsStream;

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp

@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "plNetApp.h" #include "plNetApp.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "../pnMessage/plMessage.h" #include "pnMessage/plMessage.h"
plNetApp* plNetApp::fInstance = nil; plNetApp* plNetApp::fInstance = nil;
plNetObjectDebuggerBase* plNetObjectDebuggerBase::fInstance=nil; plNetObjectDebuggerBase* plNetObjectDebuggerBase::fInstance=nil;

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h

@ -31,11 +31,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsBitVector.h" #include "hsBitVector.h"
#include "plNetGroup.h" #include "plNetGroup.h"
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include "../pnKeyedObject/plUoid.h" #include "pnKeyedObject/plUoid.h"
#include "../../PubUtilLib/plStatusLog/plLoggable.h" #include "plStatusLog/plLoggable.h"
#include <stdarg.h> #include <stdarg.h>

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plNetGroup_h #ifndef plNetGroup_h
#define plNetGroup_h #define plNetGroup_h
#include "../pnKeyedObject/plUoid.h" #include "pnKeyedObject/plUoid.h"
#include "hsStream.h" #include "hsStream.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"

10
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp

@ -45,11 +45,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include "plNetResManager.h" #include "plNetResManager.h"
#include "../pnKeyedObject/plKeyImp.h" #include "pnKeyedObject/plKeyImp.h"
#include "../pnKeyedObject/plUoid.h" #include "pnKeyedObject/plUoid.h"
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include "../pnFactory/plCreatable.h" #include "pnFactory/plCreatable.h"
#include "../pnNetCommon/plNetApp.h" #include "pnNetCommon/plNetApp.h"
#include "hsStream.h" #include "hsStream.h"
plNetResManager::plNetResManager() plNetResManager::plNetResManager()

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp

@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStream.h" #include "hsStream.h"
#include "plNetSharedState.h" #include "plNetSharedState.h"
#include "plGenericVar.h" #include "plGenericVar.h"
#include "../pnMessage/plMessage.h" #include "pnMessage/plMessage.h"
plNetSharedState::plNetSharedState(char* name) : fServerMayDelete(false) plNetSharedState::plNetSharedState(char* name) : fServerMayDelete(false)
{ {

8
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp

@ -28,10 +28,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetApp.h" #include "plNetApp.h"
#include "plNetGroup.h" #include "plNetGroup.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "../pnMessage/plSDLModifierMsg.h" #include "pnMessage/plSDLModifierMsg.h"
#include "../pnMessage/plSetNetGroupIDMsg.h" #include "pnMessage/plSetNetGroupIDMsg.h"
#include <algorithm> #include <algorithm>

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h

@ -27,8 +27,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define PLSYNCHOBJ_inc #define PLSYNCHOBJ_inc
#include "hsTypes.h" #include "hsTypes.h"
#include "../pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/hsKeyedObject.h"
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "plNetGroup.h" #include "plNetGroup.h"

8
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp

@ -26,12 +26,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plSynchedValue.h" #include "plSynchedValue.h"
#ifdef USE_SYNCHED_VALUES #ifdef USE_SYNCHED_VALUES
#include "../pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "hsBitVector.h" #include "hsBitVector.h"
#include "../pnSceneObject/plSceneObject.h" #include "pnSceneObject/plSceneObject.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include "../pnKeyedObject/plUoid.h" #include "pnKeyedObject/plUoid.h"
#include "../pnSceneObject/plCoordinateInterface.h" #include "pnSceneObject/plCoordinateInterface.h"
#define ISaveOrLoadSimpleType() \ #define ISaveOrLoadSimpleType() \
{ \ { \

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp

@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include "pnNetCommon.h" #include "pnNetCommon.h"
#include "../pnAddrInfo/pnAddrInfo.h" #include "pnAddrInfo/pnAddrInfo.h"
#ifdef HS_BUILD_FOR_WIN32 #ifdef HS_BUILD_FOR_WIN32
# include "hsWindows.h" # include "hsWindows.h"
#elif HS_BUILD_FOR_UNIX #elif HS_BUILD_FOR_UNIX

Loading…
Cancel
Save