Finish the port of FeatureLib to CMake

2025-07-18 11:19:10 +00:00 · 2011-04-08 00:42:40 -07:00
parent ff1320388e
commit 4134a68f2c
281 changed files with 2011 additions and 1166 deletions
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt
@ -0,0 +1,38 @@
+include_directories(../../CoreLib)
+include_directories(../../FeatureLib)
+include_directories(../../NucleusLib)
+include_directories(../../NucleusLib/inc)
+include_directories(../../PubUtilLib)
+
+include_directories(${OPENSSL_INCLUDE_DIR})
+include_directories(${OPENAL_INCLUDE_DIR})
+include_directories(${PYTHON_INCLUDE_DIR})
+
+set(pfConsole_SOURCES
+	pfAvatarConsoleCommands.cpp
+	pfCCRConsoleCommands.cpp
+	pfConsole.cpp
+	pfConsoleCmd.cpp
+	pfConsoleCommands.cpp
+	pfConsoleCommandsNet.cpp
+	pfConsoleContext.cpp
+	pfConsoleDirSrc.cpp
+	pfConsoleEngine.cpp
+	pfDispatchLog.cpp
+	pfGameConsoleCommands.cpp
+)
+
+set(pfConsole_HEADERS
+	pfConsole.h
+	pfConsoleCmd.h
+	pfConsoleContext.h
+	pfConsoleCreatable.h
+	pfConsoleDirSrc.h
+	pfConsoleEngine.h
+	pfDispatchLog.h
+)
+
+add_library(pfConsole STATIC ${pfConsole_SOURCES} ${pfConsole_HEADERS})
+
+source_group("Source Files" FILES ${pfConsole_SOURCES})
+source_group("Header Files" FILES ${pfConsole_HEADERS})
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp
@ -38,41 +38,41 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfConsole.h"
 #include "hsResMgr.h"

-#include "../pfMessage/plArmatureEffectMsg.h"
+#include "pfMessage/plArmatureEffectMsg.h"

-#include "../plMessage/plOneShotMsg.h"
-#include "../plMessage/plAvatarMsg.h"
-#include "../plMessage/plInputEventMsg.h"
-#include "../plMessage/plSimStateMsg.h"
-#include "../plMessage/plCCRMsg.h"
-#include "../plMessage/plLinkToAgeMsg.h"
-#include "../pnMessage/plNotifyMsg.h"
+#include "plMessage/plOneShotMsg.h"
+#include "plMessage/plAvatarMsg.h"
+#include "plMessage/plInputEventMsg.h"
+#include "plMessage/plSimStateMsg.h"
+#include "plMessage/plCCRMsg.h"
+#include "plMessage/plLinkToAgeMsg.h"
+#include "pnMessage/plNotifyMsg.h"

-#include "../plModifier/plSpawnModifier.h"
+#include "plModifier/plSpawnModifier.h"

-#include "../plResMgr/plKeyFinder.h"
+#include "plResMgr/plKeyFinder.h"

-#include "../plAvatar/plArmatureMod.h"
-#include "../plAvatar/plAvBrainCritter.h"
-#include "../plAvatar/plAvBrainHuman.h"
-#include "../plAvatar/plAvBrainSwim.h"
-#include "../plAvatar/plAvBrainGeneric.h"
-#include "../plAvatar/plAvatarMgr.h"
-#include "../plAvatar/plSeekPointMod.h"
-#include "../plAvatar/plOneShotMod.h"
-#include "../plAvatar/plAGAnim.h"
-#include "../plAvatar/plAvBrainUser.h"
-#include "../plAvatar/plAvBrainHuman.h"
-#include "../plAvatar/plNPCSpawnMod.h"
-#include "../plAvatar/plAGAnimInstance.h"
-#include "../plAvatar/plArmatureEffects.h"
-#include "../plAvatar/plAvTaskSeek.h"
+#include "plAvatar/plArmatureMod.h"
+#include "plAvatar/plAvBrainCritter.h"
+#include "plAvatar/plAvBrainHuman.h"
+#include "plAvatar/plAvBrainSwim.h"
+#include "plAvatar/plAvBrainGeneric.h"
+#include "plAvatar/plAvatarMgr.h"
+#include "plAvatar/plSeekPointMod.h"
+#include "plAvatar/plOneShotMod.h"
+#include "plAvatar/plAGAnim.h"
+#include "plAvatar/plAvBrainUser.h"
+#include "plAvatar/plAvBrainHuman.h"
+#include "plAvatar/plNPCSpawnMod.h"
+#include "plAvatar/plAGAnimInstance.h"
+#include "plAvatar/plArmatureEffects.h"
+#include "plAvatar/plAvTaskSeek.h"

 //#include "../plHavok1/plSimulationMgr.h"
-#include "../pnNetCommon/plNetApp.h"
-#include "../plNetClient/plNetClientMgr.h"
-#include "../plDrawable/plInstanceDrawInterface.h"
-#include "../plDrawable/plDrawableSpans.h"
+#include "pnNetCommon/plNetApp.h"
+#include "plNetClient/plNetClientMgr.h"
+#include "plDrawable/plInstanceDrawInterface.h"
+#include "plDrawable/plDrawableSpans.h"

 #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }

@ -119,7 +119,7 @@ PF_CONSOLE_SUBGROUP( Avatar, LOD )

 #endif // LIMIT_CONSOLE_COMMANDS

-#include "../plAvatar/plAnimStage.h"
+#include "plAvatar/plAnimStage.h"

 plAvBrainHuman * GetMainAvatarBrain()
 {
@ -440,7 +440,7 @@ PF_CONSOLE_CMD( Avatar, PopBrain, "", "Remove the topmost brain from the avatar.
 	}
 }

-#include "../plScene/plRelevanceMgr.h"
+#include "plScene/plRelevanceMgr.h"

 PF_CONSOLE_CMD( Avatar, 
 			   MarkRelevanceRegion,
@ -746,7 +746,7 @@ PF_CONSOLE_CMD( Avatar_LOD,  GetLODDistance, "", "Get Distance for switching Ava



-#include "../plAvatar/plAvBrainClimb.h"
+#include "plAvatar/plAvBrainClimb.h"

 PF_CONSOLE_CMD( Avatar_Climb, Start, "string direction", "Specify initial mount direction: up, down, left, right")
 {
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfCCRConsoleCommands.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfCCRConsoleCommands.cpp
@ -38,8 +38,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 #include "pfConsoleCmd.h"
 #include "pfConsole.h"
-#include "../pfCCR/plCCRMgr.h"
-#include "../plNetClient/plNetClientMgr.h"
+#include "pfCCR/plCCRMgr.h"
+#include "plNetClient/plNetClientMgr.h"

 //// This is here so Microsoft VC won't decide to "optimize" this file out
 // YOU ALSO NEED TO CALL THIS FXN
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
@ -31,26 +31,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 #include "pfConsole.h"
 #include "pfConsoleEngine.h"
-#include "../plPipeline/plDebugText.h"
-#include "../plInputCore/plInputDevice.h"
-#include "../plInputCore/plInputInterface.h"
-#include "../plInputCore/plInputInterfaceMgr.h"
-#include "../pnInputCore/plKeyMap.h"
-#include "../pnInputCore/plKeyDef.h"
-#include "../plMessage/plInputEventMsg.h"
-#include "../plMessage/plConsoleMsg.h"
-#include "../plMessage/plInputIfaceMgrMsg.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "plPipeline/plDebugText.h"
+#include "plInputCore/plInputDevice.h"
+#include "plInputCore/plInputInterface.h"
+#include "plInputCore/plInputInterfaceMgr.h"
+#include "pnInputCore/plKeyMap.h"
+#include "pnInputCore/plKeyDef.h"
+#include "plMessage/plInputEventMsg.h"
+#include "plMessage/plConsoleMsg.h"
+#include "plMessage/plInputIfaceMgrMsg.h"
+#include "pnKeyedObject/plFixedKey.h"
 #include "hsTimer.h"
 #include "plgDispatch.h"
 #include "plPipeline.h"
 #include "hsConfig.h"

-#include "../pfPython/cyPythonInterface.h"
-#include "../plNetClient/plNetClientMgr.h"
+#include "pfPython/cyPythonInterface.h"
+#include "plNetClient/plNetClientMgr.h"

 #ifndef PLASMA_EXTERNAL_RELEASE
-#include "../pfGameMgr/pfGameMgr.h"
+#include "pfGameMgr/pfGameMgr.h"
 #endif // PLASMA_EXTERNAL_RELEASE


--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h
@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define _pfConsole_h

 #include "hsTypes.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
+#include "pnKeyedObject/hsKeyedObject.h"


 class plPipeline;
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
@ -37,123 +37,123 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfConsoleCmd.h"
 #include "plgDispatch.h"

-#include "../plAgeLoader/plAgeLoader.h"
-#include "../plNetClient/plNetClientMgr.h"
-#include "../plPipeline/plDebugText.h"
-#include "../plPipeline/plPipeDebugFlags.h"
-#include "../plMessage/plMovieMsg.h"
-#include "../plDrawable/plDrawableSpans.h"
+#include "plAgeLoader/plAgeLoader.h"
+#include "plNetClient/plNetClientMgr.h"
+#include "plPipeline/plDebugText.h"
+#include "plPipeline/plPipeDebugFlags.h"
+#include "plMessage/plMovieMsg.h"
+#include "plDrawable/plDrawableSpans.h"
 #include "plPipeline.h"
-#include "../pfCamera/plCameraModifier.h"
-#include "../pfCamera/plVirtualCamNeu.h"
-#include "../pfCamera/plCameraBrain.h"
-#include "../plResMgr/plResManager.h"
-#include "../pnKeyedObject/plFixedKey.h"
-#include "../pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plKeyImp.h"
-#include "../pnModifier/plLogicModBase.h"
-#include "../plModifier/plSDLModifier.h"
-#include "../plSDL/plSDL.h"
-#include "../pfCharacter/plPlayerModifier.h"
-#include "../plSurface/plLayerDepth.h"
-#include "../plSurface/plLayerOr.h"
-#include "../plSurface/plLayerOr.h"
-#include "../plAudio/plAudioSystem.h"
-#include "../plAudio/plVoiceChat.h"
-#include "../plAudio/plWinMicLevel.h"
-#include "../plPipeline/plFogEnvironment.h"
-#include "../plPipeline/plPlates.h"
-#include "../plPipeline/plDynamicEnvMap.h"
-#include "../../NucleusLib/inc/hsTimer.h"
-#include "../pnMessage/plClientMsg.h"
-#include "../pnMessage/plEnableMsg.h"
-#include "../pnMessage/plAudioSysMsg.h"
-#include "../plMessage/plListenerMsg.h"
-#include "../pfAudio/plListener.h"
-#include "../plMessage/plAvatarMsg.h"
-#include "../plMessage/plOneShotMsg.h"
-#include "../plVault/plVault.h"
+#include "pfCamera/plCameraModifier.h"
+#include "pfCamera/plVirtualCamNeu.h"
+#include "pfCamera/plCameraBrain.h"
+#include "plResMgr/plResManager.h"
+#include "pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKeyImp.h"
+#include "pnModifier/plLogicModBase.h"
+#include "plModifier/plSDLModifier.h"
+#include "plSDL/plSDL.h"
+#include "pfCharacter/plPlayerModifier.h"
+#include "plSurface/plLayerDepth.h"
+#include "plSurface/plLayerOr.h"
+#include "plSurface/plLayerOr.h"
+#include "plAudio/plAudioSystem.h"
+#include "plAudio/plVoiceChat.h"
+#include "plAudio/plWinMicLevel.h"
+#include "plPipeline/plFogEnvironment.h"
+#include "plPipeline/plPlates.h"
+#include "plPipeline/plDynamicEnvMap.h"
+#include "hsTimer.h"
+#include "pnMessage/plClientMsg.h"
+#include "pnMessage/plEnableMsg.h"
+#include "pnMessage/plAudioSysMsg.h"
+#include "plMessage/plListenerMsg.h"
+#include "pfAudio/plListener.h"
+#include "plMessage/plAvatarMsg.h"
+#include "plMessage/plOneShotMsg.h"
+#include "plVault/plVault.h"
 #include "../../Apps/plClient/plClient.h"
 #include "pfConsole.h"
 #include "pfConsoleContext.h"
-#include "../plResMgr/plKeyFinder.h"
-#include "../plModifier/plSimpleModifier.h"
-#include "../plAvatar/plAvatarMgr.h"
-#include "../plAvatar/plAvatarTasks.h"
-#include "../plAvatar/plAvBrainGeneric.h"
+#include "plResMgr/plKeyFinder.h"
+#include "plModifier/plSimpleModifier.h"
+#include "plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAvatarTasks.h"
+#include "plAvatar/plAvBrainGeneric.h"
 //#include "../plHavok1/plSimulationMgr.h"

-#include "../plMessage/plConsoleMsg.h"
-#include "../plMessage/plAnimCmdMsg.h"
-#include "../pnMessage/plCameraMsg.h"
-#include "../pnMessage/plSoundMsg.h"
-#include "../pnMessage/plEventCallbackMsg.h"
-#include "../pnMessage/plNotifyMsg.h"
-#include "../pfAnimation/plAnimDebugList.h"
+#include "plMessage/plConsoleMsg.h"
+#include "plMessage/plAnimCmdMsg.h"
+#include "pnMessage/plCameraMsg.h"
+#include "pnMessage/plSoundMsg.h"
+#include "pnMessage/plEventCallbackMsg.h"
+#include "pnMessage/plNotifyMsg.h"
+#include "pfAnimation/plAnimDebugList.h"

-#include "../pnMessage/plNodeChangeMsg.h"
-#include "../pnMessage/plProxyDrawMsg.h"
-#include "../pnMessage/plObjRefMsg.h"
-#include "../pnMessage/plAttachMsg.h"
-#include "../plMessage/plSimInfluenceMsg.h"
-#include "../plMessage/plSimStateMsg.h"
-#include "../plMessage/plLinkToAgeMsg.h"
-#include "../pfMessage/pfKIMsg.h"
+#include "pnMessage/plNodeChangeMsg.h"
+#include "pnMessage/plProxyDrawMsg.h"
+#include "pnMessage/plObjRefMsg.h"
+#include "pnMessage/plAttachMsg.h"
+#include "plMessage/plSimInfluenceMsg.h"
+#include "plMessage/plSimStateMsg.h"
+#include "plMessage/plLinkToAgeMsg.h"
+#include "pfMessage/pfKIMsg.h"

-#include "../plInputCore/plInputInterfaceMgr.h"
-#include "../plInputCore/plInputManager.h"
-#include "../plInputCore/plInputDevice.h"
-#include "../plInputCore/plAvatarInputInterface.h"
-#include "../plMessage/plInputEventMsg.h"
-#include "../pnInputCore/plKeyMap.h"
+#include "plInputCore/plInputInterfaceMgr.h"
+#include "plInputCore/plInputManager.h"
+#include "plInputCore/plInputDevice.h"
+#include "plInputCore/plAvatarInputInterface.h"
+#include "plMessage/plInputEventMsg.h"
+#include "pnInputCore/plKeyMap.h"

-#include "../plParticleSystem/plParticleSystem.h"
-#include "../plParticleSystem/plConvexVolume.h"
-#include "../plParticleSystem/plParticleEffect.h"
-#include "../plParticleSystem/plParticleGenerator.h"
-#include "../plSurface/hsGMaterial.h"
-#include "../pnSceneObject/plDrawInterface.h"
-#include "../pnSceneObject/plCoordinateInterface.h"
-#include "../plScene/plSceneNode.h"
-#include "../plScene/plPageTreeMgr.h"
-#include "../plScene/plPostEffectMod.h"
-#include "../pnMessage/plNodeRefMsg.h"
+#include "plParticleSystem/plParticleSystem.h"
+#include "plParticleSystem/plConvexVolume.h"
+#include "plParticleSystem/plParticleEffect.h"
+#include "plParticleSystem/plParticleGenerator.h"
+#include "plSurface/hsGMaterial.h"
+#include "pnSceneObject/plDrawInterface.h"
+#include "pnSceneObject/plCoordinateInterface.h"
+#include "plScene/plSceneNode.h"
+#include "plScene/plPageTreeMgr.h"
+#include "plScene/plPostEffectMod.h"
+#include "pnMessage/plNodeRefMsg.h"
 //#include "../pnMessage/plWarpMsg.h"
 #include "hsResMgr.h"

-#include "../plParticleSystem/plParticleSystem.h"
-#include "../plMessage/plParticleUpdateMsg.h"
+#include "plParticleSystem/plParticleSystem.h"
+#include "plMessage/plParticleUpdateMsg.h"

-#include "../plDrawable/plDynaBulletMgr.h"
+#include "plDrawable/plDynaBulletMgr.h"

-#include "../plGImage/plMipmap.h"
-#include "../plGImage/plTGAWriter.h"
+#include "plGImage/plMipmap.h"
+#include "plGImage/plTGAWriter.h"

-#include "../plGLight/plShadowCaster.h"
-#include "../plGLight/plShadowMaster.h"
+#include "plGLight/plShadowCaster.h"
+#include "plGLight/plShadowMaster.h"

 // begin for agedefn test
 #include "hsStream.h"
-#include "../plAgeDescription/plAgeDescription.h"
-#include "../plUnifiedTime/plUnifiedTime.h"
+#include "plAgeDescription/plAgeDescription.h"
+#include "plUnifiedTime/plUnifiedTime.h"
 //end for agedefn test

-#include "../../PubUtilLib/plFile/hsFiles.h"
-#include "../../NucleusLib/pnSceneObject/plAudioInterface.h"
+#include "plFile/hsFiles.h"
+#include "pnSceneObject/plAudioInterface.h"

-#include "../plStatusLog/plStatusLog.h"
-#include "../pnTimer/pnBuildDates.h"
+#include "plStatusLog/plStatusLog.h"
+#include "pnTimer/pnBuildDates.h"

 #include "hsStlUtils.h"
 #include "hsTemplates.h"
-#include "../Corelib/hsUtils.h"
+#include "hsUtils.h"

-#include "../pfPython/cyPythonInterface.h"
-#include "../pfPython/plPythonSDLModifier.h"
+#include "pfPython/cyPythonInterface.h"
+#include "pfPython/plPythonSDLModifier.h"

-#include "../plResMgr/plResManagerHelper.h"
-#include "../plResMgr/plResMgrSettings.h"
-#include "../plResMgr/plLocalization.h"
+#include "plResMgr/plResManagerHelper.h"
+#include "plResMgr/plResMgrSettings.h"
+#include "plResMgr/plLocalization.h"


 #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
@ -436,7 +436,7 @@ PF_CONSOLE_BASE_CMD( SampleCmd3, "int, ...", "Sample command #3" )

 #ifndef LIMIT_CONSOLE_COMMANDS

-#include "../plMessage/plTransitionMsg.h"
+#include "plMessage/plTransitionMsg.h"

 PF_CONSOLE_BASE_CMD( FadeIn, "float len, bool hold", "Sample command #1" )
 {
@ -495,7 +495,7 @@ PF_CONSOLE_BASE_CMD( DumpLogs, "string folderName", "Dumps all current logs to t

 PF_CONSOLE_GROUP( Stats )

-#include "../plStatGather/plProfileManagerFull.h"
+#include "plStatGather/plProfileManagerFull.h"

 PF_CONSOLE_CMD( Stats, Show,	// Group name, Function name
 				"...",			// Params
@ -625,7 +625,7 @@ PF_CONSOLE_CMD(Stats, RemoveDetailVar, "string stat", "Removes the specified var
 	plProfileManagerFull::Instance().RemoveDetailVar(params[0]);
 }

-#include "../plStatGather/plAutoProfile.h"
+#include "plStatGather/plAutoProfile.h"

 PF_CONSOLE_CMD(Stats, AutoProfile, "...", "Performs an automated profile in all the ages. Optional: Specify an age name to do just that age")
 {
@ -1618,7 +1618,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeScreenshot, "...", "Takes a shot of the c
 	}
 }

-#include "../pfSurface/plGrabCubeMap.h"
+#include "pfSurface/plGrabCubeMap.h"

 PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeMap, 
 			   "string sceneObject, string prefix", 
@ -1652,7 +1652,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, GrabCubeCam,
 	grabCube.GrabCube(pfConsole::GetPipeline(), pos, pref, clearColor);
 }

-#include "../plJPEG/plJPEG.h"
+#include "plJPEG/plJPEG.h"

 PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of the current frame and saves it to the given file" )
 {
@ -1702,7 +1702,7 @@ PF_CONSOLE_CMD( Graphics_Renderer, TakeJPEGScreenshot, "...", "Takes a shot of t
 	}
 }

-#include "../plGImage/plAVIWriter.h"
+#include "plGImage/plAVIWriter.h"

 PF_CONSOLE_CMD( Graphics_Renderer, AVIWrite, "...", "Saves each frame to an AVI file" )
 {
@ -2484,7 +2484,7 @@ PF_CONSOLE_CMD( App,		// groupName
 	PrintString( str );
 }

-#include "../plInputCore/plSceneInputInterface.h"
+#include "plInputCore/plSceneInputInterface.h"

 PF_CONSOLE_CMD( App,		// groupName
 			   ShowLOS,		// fxnName
@ -3295,7 +3295,7 @@ PF_CONSOLE_CMD(Logic, ListResponders, "", "Prints the names of the loaded respon
 	}
 }

-#include "../plModifier/plResponderModifier.h"
+#include "plModifier/plResponderModifier.h"

 PF_CONSOLE_CMD(Logic, ResponderAnimCue, "", "Toggle box being drawn on screen when a responder starts an anim")
 {
@ -3310,7 +3310,7 @@ PF_CONSOLE_CMD(Logic, ResponderNoLog, "string prefix", "Don't log responders tha
 	plResponderModifier::NoLogString(params[0]);
 }

-#include "../plModifier/plDetectorLog.h"
+#include "plModifier/plDetectorLog.h"
 PF_CONSOLE_CMD(Logic, WriteDetectorLog, "", "Write detector log to logfile")
 {
 	DetectorDoLogfile();
@ -4268,7 +4268,7 @@ PF_CONSOLE_CMD( Quality,
 	PrintString(str);
 }

-#include "../plSurface/plShaderTable.h"
+#include "plSurface/plShaderTable.h"

 PF_CONSOLE_CMD( Quality,
 					Cap,
@ -4295,10 +4295,10 @@ PF_CONSOLE_CMD( Quality,

 #ifndef LIMIT_CONSOLE_COMMANDS

-#include "../plDrawable/plSharedMesh.h"
-#include "../plDrawable/plAccessGeometry.h"
-#include "../plDrawable/plMorphSequence.h"
-#include "../plAvatar/plAvatarClothing.h"
+#include "plDrawable/plSharedMesh.h"
+#include "plDrawable/plAccessGeometry.h"
+#include "plDrawable/plMorphSequence.h"
+#include "plAvatar/plAvatarClothing.h"

 PF_CONSOLE_GROUP( Access )

@ -4600,7 +4600,7 @@ PF_CONSOLE_CMD( Access,
 	PrintString(str);
 }

-#include "../pfSurface/plFadeOpacityMod.h"
+#include "pfSurface/plFadeOpacityMod.h"

 PF_CONSOLE_CMD( Access,
 					Fade,
@ -4644,7 +4644,7 @@ PF_CONSOLE_CMD( Access,

 }

-#include "../plDrawable/plVisLOSMgr.h"
+#include "plDrawable/plVisLOSMgr.h"

 static plSceneObject* losObj = nil;

@ -4731,7 +4731,7 @@ PF_CONSOLE_CMD( Access,

 }

-#include "../plMessage/plBulletMsg.h"
+#include "plMessage/plBulletMsg.h"

 plSceneObject* gunObj = nil;
 hsScalar gunRadius = 1.f;
@ -4851,8 +4851,8 @@ PF_CONSOLE_CMD( Access,

 #ifndef LIMIT_CONSOLE_COMMANDS

-#include "../plDrawable/plWaveSet7.h"
-#include "../plDrawable/plFixedWaterState7.h"
+#include "plDrawable/plWaveSet7.h"
+#include "plDrawable/plFixedWaterState7.h"
 PF_CONSOLE_GROUP( Wave )

 PF_CONSOLE_SUBGROUP( Wave, Set)		// Creates a sub-group under a given group
@ -5696,7 +5696,7 @@ PF_CONSOLE_CMD( SceneObject, Detach,			// Group name, Function name

 #ifndef LIMIT_CONSOLE_COMMANDS

-#include "../plPhysX/plPXPhysicalControllerCore.h"
+#include "plPhysX/plPXPhysicalControllerCore.h"

 PF_CONSOLE_GROUP( Physics )

@ -5932,7 +5932,7 @@ PF_CONSOLE_CMD( Physics, ClearLog, "", "Clear the physics log.")
 	plSimulationMgr::ClearLog();
 }
 */
-#include "../plPhysical/plPhysicalSDLModifier.h"
+#include "plPhysical/plPhysicalSDLModifier.h"

 PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state on or off. 0=off 1=send/receive only 2=any attempt")
 {
@ -5940,7 +5940,7 @@ PF_CONSOLE_CMD(Physics, LogSDL, "int level", "Turn logging of physics SDL state
 	plPhysicalSDLModifier::SetLogLevel(level);
 }

-#include "../plPhysX/plSimulationMgr.h"
+#include "plPhysX/plSimulationMgr.h"
 PF_CONSOLE_CMD(Physics, ExtraProfile, "", "Toggle extra simulation profiling")
 {
 	char str[256];
@ -6709,10 +6709,10 @@ PF_CONSOLE_CMD( Animation,
 ////////////////////////////////////////////////////////////////////////
 #ifndef LIMIT_CONSOLE_COMMANDS

-#include "../plAvatar/plArmatureMod.h"
-#include "../plAvatar/plAvatarClothing.h"
-#include "../plAvatar/plClothingLayout.h"
-#include "../pfMessage/plClothingMsg.h"
+#include "plAvatar/plArmatureMod.h"
+#include "plAvatar/plAvatarClothing.h"
+#include "plAvatar/plClothingLayout.h"
+#include "pfMessage/plClothingMsg.h"

 PF_CONSOLE_GROUP( Clothing ) // Defines a main command group

@ -7013,7 +7013,7 @@ PF_CONSOLE_CMD( Python,							// Group name
 }


-#include "../pfPython/cyMisc.h"
+#include "pfPython/cyMisc.h"

 PF_CONSOLE_CMD( Python,							// Group name
 				SetLoggingLevel,				// Function name
@ -7035,7 +7035,7 @@ PF_CONSOLE_CMD( Python,
 #endif


-#include "../pfMessage/pfBackdoorMsg.h"
+#include "pfMessage/pfBackdoorMsg.h"
 PF_CONSOLE_CMD( Python,
 			    Backdoor,
 				"string target, ...",	// Params
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
@ -37,52 +37,52 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfConsoleCmd.h"
 #include "plgDispatch.h"

-#include "../plAgeLoader/plAgeLoader.h"
-#include "../plNetClient/plNetObjectDebugger.h"
-#include "../plNetClient/plNetClientMgr.h"
-#include "../plNetClient/plNetLinkingMgr.h"
-#include "../plAgeLoader/plResPatcher.h"
-#include "../../NucleusLib/inc/hsResMgr.h"
-#include "../pnKeyedObject/plFixedKey.h"
-#include "../pnKeyedObject/plKey.h"
-#include "../pnKeyedObject/plKeyImp.h"
-#include "../pnModifier/plLogicModBase.h"
-#include "../pfCharacter/plPlayerModifier.h"
-#include "../../NucleusLib/inc/hsTimer.h"
-#include "../pnMessage/plClientMsg.h"
-#include "../pnMessage/plEnableMsg.h"
-#include "../pnMessage/plAudioSysMsg.h"
-#include "../plNetMessage/plNetMessage.h"
-#include "../plMessage/plAvatarMsg.h"
-#include "../plMessage/plOneShotMsg.h"
-#include "../plMessage/plConsoleMsg.h"
+#include "plAgeLoader/plAgeLoader.h"
+#include "plNetClient/plNetObjectDebugger.h"
+#include "plNetClient/plNetClientMgr.h"
+#include "plNetClient/plNetLinkingMgr.h"
+#include "plAgeLoader/plResPatcher.h"
+#include "hsResMgr.h"
+#include "pnKeyedObject/plFixedKey.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnKeyedObject/plKeyImp.h"
+#include "pnModifier/plLogicModBase.h"
+#include "pfCharacter/plPlayerModifier.h"
+#include "hsTimer.h"
+#include "pnMessage/plClientMsg.h"
+#include "pnMessage/plEnableMsg.h"
+#include "pnMessage/plAudioSysMsg.h"
+#include "plNetMessage/plNetMessage.h"
+#include "plMessage/plAvatarMsg.h"
+#include "plMessage/plOneShotMsg.h"
+#include "plMessage/plConsoleMsg.h"
 #include "../../Apps/plClient/plClient.h"
 #include "pfConsole.h"
-#include "../plResMgr/plKeyFinder.h"
+#include "plResMgr/plKeyFinder.h"
 #include "hsResMgr.h"

 // begin for agedefn test
 #include "hsStream.h"
-#include "../plAgeDescription/plAgeDescription.h"
-#include "../plUnifiedTime/plUnifiedTime.h"
+#include "plAgeDescription/plAgeDescription.h"
+#include "plUnifiedTime/plUnifiedTime.h"
 //end for agedefn test

-#include "../../PubUtilLib/plFile/hsFiles.h"
+#include "plFile/hsFiles.h"

-#include "../plStatusLog/plStatusLog.h"
+#include "plStatusLog/plStatusLog.h"

 #include "hsStlUtils.h"
 #include "hsTemplates.h"

-#include "../plVault/plVault.h"
+#include "plVault/plVault.h"

-#include "../plNetCommon/plSpawnPointInfo.h"
+#include "plNetCommon/plSpawnPointInfo.h"

-#include "../plSDL/plSDL.h"
+#include "plSDL/plSDL.h"

-#include "../plNetGameLib/plNetGameLib.h"
+#include "plNetGameLib/plNetGameLib.h"

-#include "../pfGameMgr/pfGameMgr.h"
+#include "pfGameMgr/pfGameMgr.h"


 #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
@ -624,7 +624,7 @@ PF_CONSOLE_CMD( Net_DebugObject,		// groupName
 		plNetObjectDebugger::GetInstance()->ClearAllDebugObjects();
 }

-#include "../pfPython/plPythonSDLModifier.h"
+#include "pfPython/plPythonSDLModifier.h"
 PF_CONSOLE_CMD( Net_DebugObject,		// groupName
 			   DumpAgeSDLHook,		// fxnName
 			   "bool dirtyOnly", // paramList
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCreatable.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCreatable.h
@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pfConsoleCreatable_inc
 #define pfConsoleCreatable_inc

-#include "../pnFactory/plCreator.h"
+#include "pnFactory/plCreator.h"

 #include "pfConsole.h"

--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleEngine.cpp
@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfConsoleCmd.h"
 #include "pfConsoleContext.h"

-#include "../plFile/plEncryptedStream.h"
+#include "plFile/plEncryptedStream.h"


 const Int32		pfConsoleEngine::fMaxNumParams = 16;
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
@ -25,9 +25,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "hsTimer.h"
 #include "pfDispatchLog.h"
-#include "../plStatusLog/plStatusLog.h"
-#include "../pnMessage/plMessage.h"
-#include "../pnKeyedObject/plKey.h"
+#include "plStatusLog/plStatusLog.h"
+#include "pnMessage/plMessage.h"
+#include "pnKeyedObject/plKey.h"
 #include "hsWindows.h"

 bool DumpSpecificMsgInfo(plMessage* msg, std::string& info);
@ -171,11 +171,11 @@ void plDispatchLog::RemoveFilterExactType(UInt16 type)
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////

-#include "../pnMessage/plClientMsg.h"
-#include "../pfMessage/pfKIMsg.h"
-#include "../pnKeyedObject/hsKeyedObject.h"
-#include "../plResMgr/plKeyFinder.h"
-#include "../plResMgr/plPageInfo.h"
+#include "pnMessage/plClientMsg.h"
+#include "pfMessage/pfKIMsg.h"
+#include "pnKeyedObject/hsKeyedObject.h"
+#include "plResMgr/plKeyFinder.h"
+#include "plResMgr/plPageInfo.h"

 static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info)
 {
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.h
@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pfDispatchLog_inc
 #define pfDispatchLog_inc

-#include "../pnDispatch/plDispatchLogBase.h"
+#include "pnDispatch/plDispatchLogBase.h"
 #include "hsBitVector.h"

 class plStatusLog;
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfGameConsoleCommands.cpp
@ -58,17 +58,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com

 #include "plPipeline.h"
 #include "plgDispatch.h"
-#include "../plGImage/plMipmap.h"
-#include "../plGImage/plTGAWriter.h"
-#include "../pfMessage/pfGameGUIMsg.h"
-#include "../../NucleusLib/inc/hsResMgr.h"
-#include "../pfGameGUIMgr/pfGUICtrlGenerator.h"
-#include "../plAvatar/plAvatarMgr.h"
-#include "../plAvatar/plAnimStage.h"
-#include "../plAvatar/plAvBrainGeneric.h"
-#include "../plAvatar/plAvBrainHuman.h"
-#include "../plMessage/plAvatarMsg.h"
-#include "../pnKeyedObject/plFixedKey.h"
+#include "plGImage/plMipmap.h"
+#include "plGImage/plTGAWriter.h"
+#include "pfMessage/pfGameGUIMsg.h"
+#include "hsResMgr.h"
+#include "pfGameGUIMgr/pfGUICtrlGenerator.h"
+#include "plAvatar/plAvatarMgr.h"
+#include "plAvatar/plAnimStage.h"
+#include "plAvatar/plAvBrainGeneric.h"
+#include "plAvatar/plAvBrainHuman.h"
+#include "plMessage/plAvatarMsg.h"
+#include "pnKeyedObject/plFixedKey.h"


 #define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
@ -218,7 +218,7 @@ PF_CONSOLE_CMD( Game, SwitchDialog, "string olddlgName, string newdlgName", "Hid

 PF_CONSOLE_SUBGROUP( Game, GUI )

-#include "../pfGameGUIMgr/pfGUICtrlGenerator.h"
+#include "pfGameGUIMgr/pfGUICtrlGenerator.h"

 static hsColorRGBA	sDynCtrlColor = hsColorRGBA().Set( 1, 1, 1, 1 ), sDynCtrlTextColor = hsColorRGBA().Set( 0, 0, 0, 1 );

@ -259,7 +259,7 @@ PF_CONSOLE_CMD( Game_GUI, CreateDialog, "string name", "" )


 //#include "../pfKI/pfKI.h"
-#include "../pfMessage/pfKIMsg.h"
+#include "pfMessage/pfKIMsg.h"

 PF_CONSOLE_CMD( Game, EnterChatMode, "", "Enters in-game chat mode" )
 {
@ -377,7 +377,7 @@ PF_CONSOLE_CMD( Game, SetChatFadeDelay, "float delayInSecs", "Sets the time in s
 	plgDispatch::MsgSend( msg );
 }

-#include "../plAvatar/plArmatureMod.h"
+#include "plAvatar/plArmatureMod.h"

 PF_CONSOLE_CMD( Game, LimitAvatarLOD, "int newLOD", "Zero is (always) highest detail; 2 is (currently) lowest." )
 {
@ -442,7 +442,7 @@ PF_CONSOLE_CMD( Game, SetLocalClientAsAdmin, "bool enable", "Makes chat messages
 }
 #endif

-#include "../pfConditional/plObjectInBoxConditionalObject.h"
+#include "pfConditional/plObjectInBoxConditionalObject.h"

 PF_CONSOLE_CMD( Game, BreakVolumeSensors, "bool break", "reverts to old broken volume sensor logic" )
 {