diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt index ffdf8b1612..15399ffb54 100644 --- a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -207,6 +207,7 @@ set(pfPython_GLUE pyGameScoreGlue.cpp pyGameScoreMsgGlue.cpp pyGeometry3Glue.cpp + pyGlueDefinitions.h pyGlueHelpers.h pyGmBlueSpiralGlue.cpp pyGmMarkerGlue.cpp diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp index f7d5c5c314..3e43266040 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp @@ -46,12 +46,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Python wrapper for account management functions // -#include - -#include "pyGlueHelpers.h" #include "cyAccountManagement.h" + #include "plNetClientComm/plNetClientComm.h" +#include "pyGlueHelpers.h" + PyObject* cyAccountManagement::GetPlayerList() { const std::vector& playerList = NetCommGetPlayerList(); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp index 9c3d615260..e113c5eba7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp @@ -40,15 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include - #include "cyAccountManagement.h" -#include "pyGlueHelpers.h" -#include "pyEnum.h" + +#include #include "plMessage/plAccountUpdateMsg.h" +#include "pyEnum.h" +#include "pyGlueHelpers.h" + PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtGetAccountPlayerList, "Returns list of players associated with the current account") { return cyAccountManagement::GetPlayerList(); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp index 2e6aed18fe..e8822c9a97 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp @@ -46,12 +46,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper to map animation functions to plasma2 message // +#include "cyAnimation.h" + #include "plgDispatch.h" -#include "pyKey.h" -#include "cyAnimation.h" #include "plMessage/plAnimCmdMsg.h" +#include "pyKey.h" + cyAnimation::cyAnimation() : fAnimName(), fNetForce() { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h index 56b394ca59..bde2d9ddf3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h @@ -51,7 +51,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include -#include "pyGlueHelpers.h" +#include "pnKeyedObject/plKey.h" + +#include "pyGlueDefinitions.h" + +class pyKey; class cyAnimation { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAnimationGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAnimationGlue.cpp index c900cf8818..0d7f86bf8b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAnimationGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAnimationGlue.cpp @@ -40,11 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "cyAnimation.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptAnimation, cyAnimation); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp index bd977aa77d..9661fa3204 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp @@ -40,42 +40,39 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "cyAvatar.h" + #include #include "plFileSystem.h" #include "plgDispatch.h" -#include "pyKey.h" #include "plPhysical.h" -#include "cyAvatar.h" - -#include "plAvatar/plAvatarMgr.h" -#include "plMessage/plAvatarMsg.h" -#include "plMessage/plOneShotMsg.h" -#include "plMessage/plMultistageMsg.h" #include "pnMessage/plNotifyMsg.h" -#include "plGImage/plMipmap.h" -#include "pySceneObject.h" -#include "pyColor.h" -#include "pyImage.h" +#include "pnSceneObject/plSceneObject.h" -#include "plAvatar/plOneShotMod.h" -#include "plAvatar/plMultistageBehMod.h" +#include "plAnimation/plAGAnim.h" // to get the BodyUsage enum +#include "plAvatar/plArmatureMod.h" #include "plAvatar/plAvatarClothing.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plAvBrainHuman.h" // needed to call the emote #include "plAvatar/plClothingLayout.h" -#include "plAvatar/plArmatureMod.h" -#include "plAvatar/plAvBrainHuman.h" // needed to call the emote -#include "plAnimation/plAGAnim.h" // to get the BodyUsage enum +#include "plAvatar/plMultistageBehMod.h" +#include "plAvatar/plOneShotMod.h" +#include "plDrawable/plMorphSequence.h" +#include "plDrawable/plSharedMesh.h" #include "plInputCore/plAvatarInputInterface.h" +#include "plMessage/plAvatarMsg.h" +#include "plMessage/plMultistageMsg.h" +#include "plMessage/plOneShotMsg.h" #include "plMessage/plSimStateMsg.h" - #include "plVault/plVault.h" -#include "plDrawable/plSharedMesh.h" - -#include "pnSceneObject/plSceneObject.h" -#include "plDrawable/plMorphSequence.h" +#include "pyColor.h" +#include "pyGlueHelpers.h" +#include "pyImage.h" +#include "pyKey.h" +#include "pySceneObject.h" /////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h index bf88d0cb42..e23a29ab3d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h @@ -53,15 +53,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnKeyedObject/plKey.h" -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" +class plArmatureMod; +class plClothingItem; class plFileName; -class pySceneObject; -class pyColor; class plMipmap; -class plClothingItem; -class plArmatureMod; class plMorphSequence; +class pyColor; +class pyKey; +class pySceneObject; namespace ST { class string; } class cyAvatar diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp index 5373e8786c..b08aedf3aa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp @@ -40,20 +40,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "cyAvatar.h" + #include #include "plFileSystem.h" -#include "pyKey.h" +#include "plAvatar/plAvBrainHuman.h" -#include "cyAvatar.h" #include "pyColor.h" #include "pyEnum.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" #include "pySceneObject.h" -#include "plAvatar/plAvBrainHuman.h" - // glue functions PYTHON_CLASS_DEFINITION(ptAvatar, cyAvatar); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp b/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp index 1ecf4f246c..b9dbe1007d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp @@ -40,20 +40,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "plgDispatch.h" -#include "pyKey.h" -#include "hsResMgr.h" - #include "cyCamera.h" -#include "pnMessage/plCameraMsg.h" -#include "plMessage/plInputEventMsg.h" +#include "hsResMgr.h" +#include "plgDispatch.h" + #include "pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plUoid.h" +#include "pnMessage/plCameraMsg.h" + +#include "plMessage/plInputEventMsg.h" -#include "pfCamera/plVirtualCamNeu.h" -#include "pfCamera/plCameraModifier.h" #include "pfCamera/plCameraBrain.h" +#include "pfCamera/plCameraModifier.h" +#include "pfCamera/plVirtualCamNeu.h" + +#include "pyKey.h" cyCamera::cyCamera() { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCamera.h b/Sources/Plasma/FeatureLib/pfPython/cyCamera.h index 63c626553e..78e9289770 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCamera.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyCamera.h @@ -50,9 +50,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "HeadSpin.h" -#include "pyGlueHelpers.h" + #include "pnKeyedObject/plKey.h" -#include "pfCamera/plVirtualCamNeu.h" + +#include "pfCamera/plVirtualCamNeu.h" + +#include "pyGlueDefinitions.h" + +class pyKey; class cyCamera { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCameraGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyCameraGlue.cpp index e10d05184f..cb38e3a5bd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCameraGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyCameraGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "cyCamera.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptCamera, cyCamera); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp b/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp index fb5321031d..dbbf86be8e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp @@ -40,9 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include "cyDraw.h" + #include "plgDispatch.h" -#include "cyDraw.h" #include "pnMessage/plEnableMsg.h" cyDraw::cyDraw(plKey sender, plKey recvr) diff --git a/Sources/Plasma/FeatureLib/pfPython/cyDraw.h b/Sources/Plasma/FeatureLib/pfPython/cyDraw.h index f3b8c995d9..4b0560a346 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDraw.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyDraw.h @@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnKeyedObject/plKey.h" -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" class cyDraw { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp index 285ad2696f..eedb558c3c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "cyDraw.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptDraw, cyDraw); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp index e3e38d7446..7eb2df7618 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp @@ -41,8 +41,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "cyInputInterface.h" -#include "plMessage/plInputIfaceMgrMsg.h" + #include "plInputCore/plTelescopeInputInterface.h" +#include "plMessage/plInputIfaceMgrMsg.h" cyInputInterface::cyInputInterface() : fTelescopeInterface() diff --git a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.h b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.h index b794812526..35e61eef0e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper to map InputInterface functions to plasma2 message // -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" class plInputInterface; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp index d9447078cf..18013e8890 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "cyInputInterface.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptInputInterface, cyInputInterface); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp index 86f1bde52a..a11ab62979 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp @@ -40,70 +40,68 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include "cyMisc.h" + #include #include #include -#include "plgDispatch.h" #include "hsResMgr.h" -#include "pyKey.h" - -#include "cyMisc.h" +#include "plgDispatch.h" +#include "plTimerCallbackManager.h" -#include "plResMgr/plKeyFinder.h" +#include "pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKeyImp.h" -#include "pnKeyedObject/plFixedKey.h" -#include "plMessage/plLinkToAgeMsg.h" -#include "plMessage/plAnimCmdMsg.h" -#include "plMessage/plExcludeRegionMsg.h" -#include "plMessage/plInputEventMsg.h" -#include "plMessage/plInputIfaceMgrMsg.h" -#include "plMessage/plLoadCloneMsg.h" -#include "pnMessage/plCmdIfaceModMsg.h" #include "pnMessage/plAttachMsg.h" -#include "plMessage/plTimerCallbackMsg.h" -#include "plMessage/plNetVoiceListMsg.h" -#include "pnMessage/plClientMsg.h" #include "pnMessage/plCameraMsg.h" -#include "plTimerCallbackManager.h" -#include "plVault/plVault.h" -#include "pnNetCommon/pnNetCommon.h" +#include "pnMessage/plClientMsg.h" +#include "pnMessage/plCmdIfaceModMsg.h" #include "plNetClient/plNetClientMgr.h" #include "plNetClient/plNetLinkingMgr.h" +#include "pnNetCommon/pnNetCommon.h" #include "plNetTransport/plNetTransport.h" #include "plNetTransport/plNetTransportMember.h" -#include "plAvatar/plAvatarMgr.h" -#include "plAvatar/plMultistageBehMod.h" -#include "plAvatar/plAvBrainCritter.h" -#include "pyCritterBrain.h" -#include "pySceneObject.h" -#include "pyPlayer.h" -#include "pyColor.h" -#include "pyAgeInfoStruct.h" -#include "pyAlarm.h" -#include "pyGeometry3.h" -#include "pfMessage/pfKIMsg.h" -#include "pfCamera/plVirtualCamNeu.h" -#include "plPipeline/plDynamicEnvMap.h" - -#include "pfGameGUIMgr/pfGameGUIMgr.h" -#include "pfGameGUIMgr/pfGUIDialogMod.h" -#include "pyGUIDialog.h" -#include "pnSceneObject/plSceneObject.h" #include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" -#include "plMessage/plCCRMsg.h" - -#include "plResMgr/plLocalization.h" +#include "plAvatar/plAvatarMgr.h" +#include "plAvatar/plAvBrainCritter.h" +#include "plAvatar/plMultistageBehMod.h" #include "plGLight/plLightInfo.h" - #include "plInputCore/plAvatarInputInterface.h" #include "plInputCore/plInputDevice.h" +#include "plMessage/plAnimCmdMsg.h" +#include "plMessage/plCCRMsg.h" +#include "plMessage/plExcludeRegionMsg.h" +#include "plMessage/plInputEventMsg.h" +#include "plMessage/plInputIfaceMgrMsg.h" +#include "plMessage/plLinkToAgeMsg.h" +#include "plMessage/plLoadCloneMsg.h" +#include "plMessage/plNetVoiceListMsg.h" +#include "plMessage/plTimerCallbackMsg.h" +#include "plPipeline/plDynamicEnvMap.h" +#include "plResMgr/plKeyFinder.h" +#include "plResMgr/plLocalization.h" +#include "plStatusLog/plStatusLog.h" +#include "plVault/plVault.h" +#include "pfCamera/plVirtualCamNeu.h" +#include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pfLocalizationMgr/pfLocalizationMgr.h" +#include "pfMessage/pfKIMsg.h" -#include "plStatusLog/plStatusLog.h" +#include "pyAgeInfoStruct.h" +#include "pyAlarm.h" +#include "pyColor.h" +#include "pyCritterBrain.h" +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" +#include "pyGUIDialog.h" +#include "pyKey.h" +#include "pyPlayer.h" +#include "pySceneObject.h" //// Static Class Stuff ////////////////////////////////////////////////////// plPipeline* cyMisc::fPipeline = nullptr; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.h b/Sources/Plasma/FeatureLib/pfPython/cyMisc.h index 0205b10200..2359f8a3be 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.h @@ -48,22 +48,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper to map misc functions, such as the console // -class pyKey; -class pySceneObject; -class pyPlayer; -class pyColor; -class pyAgeInfoStruct; -class pyPoint3; #include "HeadSpin.h" #include -class pyGUIDialog; -class plPipeline; +struct PipelineParams; class plDisplayMode; -class plUUID; class plFileName; -struct PipelineParams; +class plPipeline; +class plUUID; +class pyAgeInfoStruct; +class pyColor; +class pyGUIDialog; +class pyKey; +class pyPlayer; +class pyPoint3; +class pySceneObject; namespace ST { class string; } typedef struct _object PyObject; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp index a6fa1ad1c6..3aab3a215f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp @@ -42,7 +42,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyMisc.h" -#include #include #include #include diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp index 8c52696a62..fe9f703868 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp @@ -42,23 +42,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyMisc.h" -#include #include #include #include -#include "pyEnum.h" +#include "plMessage/plConfirmationMsg.h" +#include "plMessage/plLOSRequestMsg.h" +#include "plNetCommon/plNetCommon.h" +#include "plResMgr/plLocalization.h" + +#include "plPythonCallable.h" +#include "plPythonConvert.h" #include "pyColor.h" +#include "pyEnum.h" #include "pyGlueHelpers.h" #include "pyKey.h" #include "pyPlayer.h" -#include "plPythonCallable.h" -#include "plPythonConvert.h" - -#include "plMessage/plConfirmationMsg.h" -#include "plNetCommon/plNetCommon.h" -#include "plResMgr/plLocalization.h" -#include "plMessage/plLOSRequestMsg.h" namespace plPython { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp index ba53f60b92..e4df581709 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp @@ -40,17 +40,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "cyMisc.h" + #include #include -#include "pyKey.h" -#include "cyMisc.h" -#include "pyGlueHelpers.h" -#include "pySceneObject.h" #include "plFileSystem.h" + #include "pnUUID/pnUUID.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" +#include "pySceneObject.h" + PYTHON_GLOBAL_METHOD_DEFINITION(PtSendPetitionToCCR, args, "Params: message,reason=0,title=\"\"\nSends a petition with a message to the CCR group") { ST::string message; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp index 070c27e69e..79bae09838 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp @@ -40,19 +40,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "cyMisc.h" + #include #include -#include "pyGeometry3.h" -#include "pyKey.h" #include "plPipeline.h" -#include "cyMisc.h" +#include "pnNetBase/pnNetBase.h" + +#include "pyAgeInfoStruct.h" +#include "pyGeometry3.h" #include "pyGlueHelpers.h" +#include "pyKey.h" #include "pySceneObject.h" -#include "pyAgeInfoStruct.h" -#include "pnNetBase/pnNetBase.h" PYTHON_GLOBAL_METHOD_DEFINITION(PtRequestLOSScreen, args, "Params: selfKey,ID,xPos,yPos,distance,what,reportType\nRequest a LOS check from a point on the screen") { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp index 54904a6c19..1bb0faf800 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp @@ -40,10 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include "cyParticleSys.h" + #include "plgDispatch.h" -#include "cyParticleSys.h" #include "pnMessage/plMessage.h" + #include "plMessage/plParticleUpdateMsg.h" cyParticleSys::cyParticleSys(plKey sender, plKey recvr) diff --git a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h index 680665592b..56675bf1e7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h @@ -52,7 +52,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "pnKeyedObject/plKey.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" class cyParticleSys { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp index 408714f042..562e7f8a0d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp @@ -40,11 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "cyParticleSys.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptParticle, cyParticleSys); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp index a74c924a62..22083a2cb7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp @@ -40,27 +40,28 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include "cyPhysics.h" + #include +#include + #include "plgDispatch.h" -#include "pyGeometry3.h" -#include "pnKeyedObject/plKey.h" -#include "pyKey.h" #include "hsQuat.h" -#include "pyMatrix44.h" - -#include "cyPhysics.h" -#include +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plEnableMsg.h" +#include "pnMessage/plWarpMsg.h" +#include "pnSceneObject/plCoordinateInterface.h" +#include "pnSceneObject/plSceneObject.h" #include "plMessage/plAngularVelocityMsg.h" #include "plMessage/plDampMsg.h" -#include "pnMessage/plEnableMsg.h" #include "plMessage/plImpulseMsg.h" #include "plMessage/plLinearVelocityMsg.h" -#include "pnMessage/plWarpMsg.h" -#include "pnSceneObject/plSceneObject.h" -#include "pnSceneObject/plCoordinateInterface.h" +#include "pyGeometry3.h" +#include "pyKey.h" +#include "pyMatrix44.h" cyPhysics::cyPhysics(plKey sender, plKey recvr) { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h index 26ba2779cc..37a1a6e988 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h @@ -52,11 +52,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "pnKeyedObject/plKey.h" -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" + +class pyKey; +class pyMatrix44; class pyPoint3; class pyVector3; -class pyMatrix44; class cyPhysics { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp index aa083cd394..e701d6c5ad 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp @@ -40,13 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "cyPhysics.h" + #include "pyGeometry3.h" +#include "pyGlueHelpers.h" #include "pyKey.h" #include "pyMatrix44.h" -#include "cyPhysics.h" - // glue functions PYTHON_CLASS_DEFINITION(ptPhysics, cyPhysics); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonModule451.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPythonModule451.cpp index 2136a711cc..e3a7291bc2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPythonModule451.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPythonModule451.cpp @@ -40,16 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyGlueHelpers.h" -#include "pyObjectRef.h" #include #include +#include "plStatusLog/plStatusLog.h" + #include "cyPythonInterface.h" #include "plPythonPack.h" - -#include "plStatusLog/plStatusLog.h" +#include "pyGlueHelpers.h" +#include "pyObjectRef.h" // ========================================================================== diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonCallable.h b/Sources/Plasma/FeatureLib/pfPython/plPythonCallable.h index 78bfcfe509..a950aa6834 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonCallable.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonCallable.h @@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include -#include #include #include "HeadSpin.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonConvert.h b/Sources/Plasma/FeatureLib/pfPython/plPythonConvert.h index 1a6ed53f31..ec752dfa9f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonConvert.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonConvert.h @@ -43,7 +43,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plPythonConvert_h_ #define _plPythonConvert_h_ -#include #include #include #include diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp index 960119aa2d..9d68513abf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp @@ -40,25 +40,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "plPythonSDLModifier.h" -#include "cyPythonInterface.h" - -#include "plPythonFileMod.h" -#include "pyObjectRef.h" -#include "cyMisc.h" #include #include "pnNetCommon/plNetApp.h" #include "pnSceneObject/plSceneObject.h" -#include "plResMgr/plKeyFinder.h" -#include "plAgeDescription/plAgeDescription.h" +#include "plAgeDescription/plAgeDescription.h" +#include "plResMgr/plKeyFinder.h" #include "plSDL/plSDL.h" +#include "cyMisc.h" +#include "cyPythonInterface.h" +#include "plPythonFileMod.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" +#include "pyObjectRef.h" + plStateDataRecord * GetAgeSDL() { const plPythonSDLModifier * mod = plPythonSDLModifier::FindAgeSDL(); diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h index 06b8d7cd61..75f36ff339 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h @@ -42,16 +42,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPythonSDLModifier_h_inc #define plPythonSDLModifier_h_inc -class plPythonFileMod; -class plStateDataRecord; -class plSimpleStateVariable; -class pyKey; - #include + #include "plModifier/plSDLModifier.h" -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" +class plPythonFileMod; +class plSimpleStateVariable; +class plStateDataRecord; +class pyKey; // hack for plNetClientVNodeMgr single-player mode SDLHook stuff. plStateDataRecord * GetAgeSDL(); diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifierGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifierGlue.cpp index 18c88e0eca..a0983ae698 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifierGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifierGlue.cpp @@ -40,13 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "plPythonSDLModifier.h" + #include +#include "pyGlueHelpers.h" #include "pyKey.h" -#include "plPythonSDLModifier.h" - // glue functions PYTHON_CLASS_DEFINITION(ptSDL, pySDLModifier); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp index 0b0b48ec12..72baed6d2c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include "pyAgeInfoStruct.h" + #include #include -#include "pyAgeInfoStruct.h" - #include "pnEncryption/plChecksum.h" #include "pnUUID/pnUUID.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h index baf869d463..0148c0f551 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h @@ -46,7 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetCommon/plNetServerSessionInfo.h" -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" ////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStructGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStructGlue.cpp index 6d2c898ae5..0fd32130ed 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStructGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStructGlue.cpp @@ -40,10 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyAgeInfoStruct.h" + #include -#include "pyAgeInfoStruct.h" +#include "pyGlueHelpers.h" // glue functions PYTHON_CLASS_DEFINITION(ptAgeInfoStruct, pyAgeInfoStruct); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp index 97f1795111..6830517699 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp @@ -40,10 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include "pyAgeLinkStruct.h" + #include #include -#include "pyAgeLinkStruct.h" #include "pyAgeInfoStruct.h" #include "pySpawnPointInfo.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h index cf11f4036f..b38067fe28 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h @@ -43,7 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define pyAgeLinkStruct_h_inc #include "plNetCommon/plNetServerSessionInfo.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" ////////////////////////////////////////////////////////////////////// // @@ -51,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +class pyAgeInfoStruct; +class pyAgeLinkStructRef; class pySpawnPointInfo; class pySpawnPointInfoRef; -class pyAgeLinkStructRef; -class pyAgeInfoStruct; class pyAgeLinkStruct { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStructGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStructGlue.cpp index 2bbc7e569f..0ad89d3fcc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStructGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStructGlue.cpp @@ -40,12 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyAgeLinkStruct.h" + #include #include -#include "pyAgeLinkStruct.h" #include "pyAgeInfoStruct.h" +#include "pyGlueHelpers.h" #include "pySpawnPointInfo.h" // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp index 51b32d9cd4..cd83825af6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp @@ -45,23 +45,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include +#include "pyAgeVault.h" + #include #include "pnNetBase/pnNbError.h" -#include "pyAgeVault.h" -#include "pyVaultFolderNode.h" +#include "plSDL/plSDL.h" +#include "plVault/plVault.h" + +#include "pyAgeInfoStruct.h" +#include "pyGlueHelpers.h" +#include "pySDL.h" #include "pyVaultAgeInfoNode.h" #include "pyVaultAgeLinkNode.h" #include "pyVaultChronicleNode.h" +#include "pyVaultFolderNode.h" #include "pyVaultTextNoteNode.h" -#include "pyAgeInfoStruct.h" -#include "pySDL.h" - - -#include "plVault/plVault.h" -#include "plSDL/plSDL.h" pyAgeVault::pyAgeVault() { } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h index 749e7e85da..ec3066ea5d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h @@ -53,18 +53,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" -class pyVaultNode; -class pyVaultFolderNode; -class pyVaultPlayerInfoListNode; -class pyVaultAgeLinkNode; -class pyVaultAgeInfoNode; +#include "pyGlueDefinitions.h" + +class plUUID; class pyAgeInfoStruct; -class pyVaultChronicleNode; class pySDLStateDataRecord; +class pyVaultAgeInfoNode; +class pyVaultAgeLinkNode; +class pyVaultChronicleNode; +class pyVaultFolderNode; +class pyVaultNode; +class pyVaultPlayerInfoListNode; class pyVaultTextNoteNode; -class plUUID; namespace ST { class string; } class pyAgeVault diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp index 8d6cb75b37..e64e6dd328 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp @@ -40,11 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyAgeVault.h" + #include -#include "pyAgeVault.h" #include "pyAgeInfoStruct.h" +#include "pyGlueHelpers.h" #include "pySDL.h" // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h index 49b1ab02c9..cbba936c18 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h @@ -49,10 +49,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" + #include #include +#include "pyGlueDefinitions.h" + class pyAudioControl { protected: diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAudioControlGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAudioControlGlue.cpp index 44b7397226..817482de52 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAudioControlGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAudioControlGlue.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "pyAudioControl.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptAudioControl, pyAudioControl); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp index 29b6504df3..f3b0a33760 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp @@ -40,11 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "pyKey.h" - #include "pyCluster.h" + #include "plDrawable/plClusterGroup.h" +#include "pyKey.h" + pyCluster::pyCluster(plKey key) { fClusterKey = std::move(key); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCluster.h b/Sources/Plasma/FeatureLib/pfPython/pyCluster.h index 50af82c0b6..296bf54980 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCluster.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyCluster.h @@ -43,7 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define pyCluster_h #include "pnKeyedObject/plKey.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" ////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/pyClusterGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyClusterGlue.cpp index 08fe4c3e6f..2852ed5b68 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyClusterGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyClusterGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyCluster.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptCluster, pyCluster); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyColor.h b/Sources/Plasma/FeatureLib/pfPython/pyColor.h index 4ed4424a34..29f536db28 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyColor.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyColor.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsColorRGBA.h" -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" class pyColor { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyColorGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyColorGlue.cpp index d7b8d82f9f..3aadc1a739 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyColorGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyColorGlue.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "pyColor.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptColor, pyColor); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp index 9bf9e3b125..2585c90bbf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp @@ -40,18 +40,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyCritterBrain.h" + #include +#include "plAvatar/plAvBrainCritter.h" +#include "pnSceneObject/plSceneObject.h" + #include "pyGeometry3.h" +#include "pyGlueHelpers.h" #include "pyKey.h" - -#include "pyCritterBrain.h" #include "pySceneObject.h" -#include "plAvatar/plAvBrainCritter.h" -#include "pnSceneObject/plSceneObject.h" - pyCritterBrain::pyCritterBrain() : fBrain() { } bool pyCritterBrain::operator==(const pyCritterBrain& other) const diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.h b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.h index 6646cd46d4..078b4e6b15 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.h @@ -42,11 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pyCritterBrain_h_ #define _pyCritterBrain_h_ -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" +struct hsPoint3; class plAvBrainCritter; class pyKey; -struct hsPoint3; namespace ST { class string; } // simply here so we can pass our message types on to python diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp index 76c9d84e6a..4e2f03df0a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp @@ -40,16 +40,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyCritterBrain.h" + #include -#include "pyGeometry3.h" -#include "pyKey.h" +#include "plMessage/plAIMsg.h" -#include "pyCritterBrain.h" #include "pyEnum.h" - -#include "plMessage/plAIMsg.h" +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp index a7ed93cc14..66ac3278e2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp @@ -40,13 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include "pyDniCoordinates.h" + #include "hsGeometry3.h" -#include "pyDniCoordinates.h" -#include "plVault/plDniCoordinateInfo.h" #ifndef BUILDING_PYPLASMA #include "plAvatar/plAvatarMgr.h" #endif +#include "plVault/plDniCoordinateInfo.h" pyDniCoordinates::pyDniCoordinates(plDniCoordinateInfo* coord) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h index c0e85ea146..75dd39a2ac 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h @@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" -class plDniCoordinateInfo; struct hsPoint3; +class plDniCoordinateInfo; class pyDniCoordinates { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp index 334fc1fca2..4d3c044d39 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp @@ -40,12 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyGeometry3.h" - #include "pyDniCoordinates.h" + #include "plVault/plDniCoordinateInfo.h" +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptDniCoordinates, pyDniCoordinates); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp index f8dc520e7b..f60e50dd67 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp @@ -40,14 +40,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyDniInfoSource.h" + #include -#include "pyDniInfoSource.h" -#include "pnUUID/pnUUID.h" #include "plUnifiedTime/plUnifiedTime.h" +#include "pnUUID/pnUUID.h" #include "plVault/plVault.h" + #include "pyDniCoordinates.h" +#include "pyGlueHelpers.h" PyObject* pyDniInfoSource::GetAgeCoords() { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h index 87b87cb19c..3fdd6e3867 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h @@ -43,10 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define pyDniInfoSource_h_inc #include "HeadSpin.h" -#include "pyGlueHelpers.h" -class pyDniCoordinates; +#include "pyGlueDefinitions.h" + class plUUID; +class pyDniCoordinates; namespace ST { class string; } class pyDniInfoSource diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSourceGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSourceGlue.cpp index 989662d226..fedfc8fa09 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSourceGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSourceGlue.cpp @@ -40,12 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyDniInfoSource.h" + #include -#include "pyDniInfoSource.h" #include "pnUUID/pnUUID.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptDniInfoSource, pyDniInfoSource); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp index dfb8e75f5e..1a6c983632 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp @@ -45,19 +45,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "plgDispatch.h" -#include "hsResMgr.h" - #include "pyDrawControl.h" #include +#include "hsResMgr.h" +#include "plgDispatch.h" + #ifndef BUILDING_PYPLASMA +# include "pnMessage/plClientMsg.h" + # include "plAvatar/plArmatureMod.h" # include "plGLight/plShadowCaster.h" # include "plGLight/plShadowMaster.h" # include "plInputCore/plInputDevice.h" -# include "pnMessage/plClientMsg.h" # include "plMessage/plInputEventMsg.h" #endif diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h index 5b143e2836..7850597db5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" class pyDrawControl { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDrawControlGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDrawControlGlue.cpp index 90f53bef6e..8385bbffa4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDrawControlGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDrawControlGlue.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "pyDrawControl.h" +#include "pyGlueHelpers.h" + PYTHON_GLOBAL_METHOD_DEFINITION(PtSetGamma2, args, "Params: gamma\nSet the gamma with gamma2 rules") { float gamma; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp index a80e48833d..5e63757842 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp @@ -46,17 +46,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // ////////////////////////////////////////////////////////////////////////////// +#include "pyDynamicText.h" + #include #include + #include "plgDispatch.h" -#include "pyKey.h" -#include "pyDynamicText.h" +#include "plGImage/plDynamicTextMap.h" #include "plMessage/plDynamicTextMsg.h" + #include "pyColor.h" #include "pyImage.h" -#include "plGImage/plDynamicTextMap.h" - +#include "pyKey.h" pyDynamicText::pyDynamicText() : fClipLeft(), fClipTop(), fClipRight(), fClipBottom(), fWrapWidth(), fWrapHeight(), diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h index ac53253112..5107d01856 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h @@ -48,15 +48,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include + +#include "pnKeyedObject/plKey.h" + +#include "pyGlueDefinitions.h" + class plDynamicTextMsg; class pyColor; class pyImage; class pyKey; namespace ST { class string; } -#include "pyGlueHelpers.h" -#include "pnKeyedObject/plKey.h" - class pyDynamicText { private: diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp index 83952d6350..95d5ddba39 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp @@ -40,16 +40,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyDynamicText.h" + #include #include -#include "pyKey.h" -#include "pyDynamicText.h" -#include "pyEnum.h" +#include "plGImage/plDynamicTextMap.h" + #include "pyColor.h" +#include "pyEnum.h" +#include "pyGlueHelpers.h" #include "pyImage.h" -#include "plGImage/plDynamicTextMap.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptDynamicMap, pyDynamicText); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp index 85937d9e6e..290adfe3aa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp @@ -40,17 +40,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGUIControl.h" #include "pfGameGUIMgr/pfGUIControlMod.h" #include "pfGameGUIMgr/pfGUIDialogMod.h" -#include "pyGUIDialog.h" #include "pyColor.h" #include "pyGeometry3.h" +#include "pyGlueHelpers.h" +#include "pyGUIDialog.h" +#include "pyKey.h" pyGUIControl::pyGUIControl(pyKey& gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h index 852c335c83..ba8feb8859 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h @@ -49,9 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" #include "pnKeyedObject/plKey.h" +#include "pyGlueDefinitions.h" + class pyKey; class pyPoint3; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp index ba2ba85f98..1d5f2a0788 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp @@ -40,11 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "pyKey.h" - #include "pyGUIControlButton.h" + #include "pfGameGUIMgr/pfGUIButtonMod.h" +#include "pyKey.h" + pyGUIControlButton::pyGUIControlButton(pyKey& gckey) : pyGUIControl(gckey) { } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h index d019e8bb31..a9140d55f3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp index 9608efb117..ed28ceb810 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp @@ -40,13 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" +#include "pyGUIControlButton.h" #include "pfGameGUIMgr/pfGUIButtonMod.h" #include "pyEnum.h" -#include "pyGUIControlButton.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlButton, pyGUIControlButton); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp index 5e32e5d1d3..a847bf4812 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp @@ -40,13 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "pyKey.h" +#include "pyGUIControlCheckBox.h" #include "pfGameGUIMgr/pfGUICheckBoxCtrl.h" #include "pfGameGUIMgr/pfGUIDialogMod.h" -#include "pyGUIControlCheckBox.h" -#include "pyGUIDialog.h" +#include "pyKey.h" pyGUIControlCheckBox::pyGUIControlCheckBox(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h index 2c6c5796ce..a3569891cc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBoxGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBoxGlue.cpp index 16cc279956..03779dcf57 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBoxGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBoxGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGUIControlCheckBox.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlCheckBox, pyGUIControlCheckBox); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp index 1eb130bbdc..16b878d892 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp @@ -40,15 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" +#include "pyGUIControlClickMap.h" #include "pfGameGUIMgr/pfGUIClickMapCtrl.h" #include "pfGameGUIMgr/pfGUIDialogMod.h" -#include "pyGUIControlClickMap.h" -#include "pyGUIDialog.h" #include "pyGeometry3.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" pyGUIControlClickMap::pyGUIControlClickMap(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h index 9840721ab9..f13bdaf2e2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMapGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMapGlue.cpp index a8b3adca45..216f797239 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMapGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMapGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGUIControlClickMap.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlClickMap, pyGUIControlClickMap); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp index 5c319b9bf3..4cbf1aa13c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp @@ -44,10 +44,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // /////////////////////////////////////////////// -#include "pyKey.h" +#include "pyGUIControlDragBar.h" #include "pfGameGUIMgr/pfGUIDragBarCtrl.h" -#include "pyGUIControlDragBar.h" + +#include "pyKey.h" pyGUIControlDragBar::pyGUIControlDragBar(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h index 7072509220..c4474c1dc6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBarGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBarGlue.cpp index 472785d846..7d045769c3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBarGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBarGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGUIControlDragBar.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlDragBar, pyGUIControlDragBar); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp index e1816cec8c..cc4e3c719d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp @@ -40,13 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" +#include "pyGUIControlDraggable.h" #include "pfGameGUIMgr/pfGUIDraggableMod.h" -#include "pyGUIControlDraggable.h" #include "pyGeometry3.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" pyGUIControlDraggable::pyGUIControlDraggable(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.h index 09f5a14a25..03d0291f54 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.h @@ -49,8 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" - +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggableGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggableGlue.cpp index 99f44b48ff..d0036fd8c0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggableGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggableGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGUIControlDraggable.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlDraggable, pyGUIControlDraggable); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp index 855df866d4..10b686fbf1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp @@ -40,14 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" +#include "pyGUIControlDynamicText.h" -#include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h" #include "plGImage/plDynamicTextMap.h" -#include "pyDynamicText.h" -#include "pyGUIControlDynamicText.h" +#include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h" + +#include "pyDynamicText.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" pyGUIControlDynamicText::pyGUIControlDynamicText(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h index 6e1594bd76..7a036acc1d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h @@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" -#include "pyGlueHelpers.h" -class pyKey; class plKey; +class pyKey; class pyGUIControlDynamicText : public pyGUIControl { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicTextGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicTextGlue.cpp index 00bdca8f5c..c99e2ef041 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicTextGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicTextGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGUIControlDynamicText.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlDynamicText, pyGUIControlDynamicText); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp index a302e1b26f..5438bcb941 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp @@ -40,14 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyGUIControlEditBox.h" -#include "pyKey.h" +#include #include "pfGameGUIMgr/pfGUIEditBoxMod.h" -#include "pyGUIControlEditBox.h" #include "pyColor.h" +#include "pyKey.h" pyGUIControlEditBox::pyGUIControlEditBox(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h index 5155724f1c..fa044ea429 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBoxGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBoxGlue.cpp index ecbe4b48c2..1692302a27 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBoxGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBoxGlue.cpp @@ -40,13 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include +#include "pyGUIControlEditBox.h" -#include "pyKey.h" +#include -#include "pyGUIControlEditBox.h" #include "pyColor.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlEditBox, pyGUIControlEditBox); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp index 3ea5e1790e..b45a20f704 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGUIControl.h" + #include "pyGeometry3.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptGUIControl, pyGUIControl); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp index a820a83bbf..bbec9db4e4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp @@ -40,18 +40,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyGUIControlListBox.h" + #include -#include "pyKey.h" +#include "plGImage/plDynamicTextMap.h" #include "pfGameGUIMgr/pfGUIListBoxMod.h" #include "pfGameGUIMgr/pfGUIListElement.h" -#include "plGImage/plDynamicTextMap.h" -#include "pyGUIControlListBox.h" #include "pyColor.h" +#include "pyGlueHelpers.h" #include "pyImage.h" +#include "pyKey.h" // a special class for different coloured list items // diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h index 0c78513864..1881f0b205 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h @@ -51,15 +51,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" -#include "pyGlueHelpers.h" +class pfGUIListTreeRoot; class plKey; class pyColor; class pyImage; class pyKey; - -class pfGUIListTreeRoot; namespace ST { class string; } class pyGUIControlListBox : public pyGUIControl diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBoxGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBoxGlue.cpp index f3b1f9ef45..c96c29c44f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBoxGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBoxGlue.cpp @@ -40,15 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include - -#include "pyKey.h" - #include "pyGUIControlListBox.h" +#include + #include "pyColor.h" +#include "pyGlueHelpers.h" #include "pyImage.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlListBox, pyGUIControlListBox); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp index 509a22bafb..852ca8e10b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp @@ -40,15 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" +#include "pyGUIControlMultiLineEdit.h" #include #include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" -#include "pyGUIControlMultiLineEdit.h" #include "pyColor.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" pyGUIControlMultiLineEdit::pyGUIControlMultiLineEdit(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h index caf958b084..87a5d6e92e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h @@ -49,8 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" -#include "pyGlueHelpers.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp index 67acaabdbe..a453580e65 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp @@ -40,16 +40,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyGUIControlMultiLineEdit.h" + #include -#include "pyKey.h" +#include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" -#include "pyGUIControlMultiLineEdit.h" -#include "pyEnum.h" #include "pyColor.h" - -#include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" +#include "pyEnum.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlMultiLineEdit, pyGUIControlMultiLineEdit); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp index 0d439f76af..3dbd219d92 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "pyKey.h" +#include "pyGUIControlRadioGroup.h" #include "pfGameGUIMgr/pfGUIRadioGroupCtrl.h" -#include "pyGUIControlRadioGroup.h" +#include "pyKey.h" pyGUIControlRadioGroup::pyGUIControlRadioGroup(pyKey& gckey) :pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.h index 6e10f7f3dc..9de3faac01 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.h @@ -49,10 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" -#include "pyGlueHelpers.h" - class plKey; class pyKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroupGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroupGlue.cpp index d24696b159..89ab8841c2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroupGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroupGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGUIControlRadioGroup.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlRadioGroup, pyGUIControlRadioGroup); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp index 6b1b9c9868..3c1daf2019 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp @@ -40,15 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyGUIControlTextBox.h" -#include "pyKey.h" +#include -#include "pfGameGUIMgr/pfGUITextBoxMod.h" #include "pfGameGUIMgr/pfGUIListElement.h" +#include "pfGameGUIMgr/pfGUITextBoxMod.h" -#include "pyGUIControlTextBox.h" #include "pyColor.h" +#include "pyKey.h" pyGUIControlTextBox::pyGUIControlTextBox(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h index 1dc576d43e..50a43d5745 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h @@ -49,14 +49,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" -#include "pyGlueHelpers.h" +class pfGUIColorScheme; class plKey; class pyColor; class pyKey; -class pfGUIColorScheme; - namespace ST { class string; } class pyGUIControlTextBox : public pyGUIControl diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBoxGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBoxGlue.cpp index a0aee89396..1ea0af1694 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBoxGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBoxGlue.cpp @@ -40,13 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include +#include "pyGUIControlTextBox.h" -#include "pyKey.h" +#include -#include "pyGUIControlTextBox.h" #include "pyColor.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlTextBox, pyGUIControlTextBox); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp index aa1533e44a..71c326bccc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp @@ -40,14 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "pyKey.h" +#include "pyGUIControlValue.h" -#include "pfGameGUIMgr/pfGUIValueCtrl.h" #include "pfGameGUIMgr/pfGUIKnobCtrl.h" -#include "pfGameGUIMgr/pfGUIUpDownPairMod.h" #include "pfGameGUIMgr/pfGUIProgressCtrl.h" +#include "pfGameGUIMgr/pfGUIUpDownPairMod.h" +#include "pfGameGUIMgr/pfGUIValueCtrl.h" -#include "pyGUIControlValue.h" +#include "pyKey.h" pyGUIControlValue::pyGUIControlValue(pyKey& gckey) : pyGUIControl(gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.h index 523dd85a9a..ad92299089 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.h @@ -49,8 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include "pyGlueDefinitions.h" #include "pyGUIControl.h" -#include "pyGlueHelpers.h" class plKey; class pyKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValueGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValueGlue.cpp index 9246f03918..cb3c10bc52 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValueGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValueGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGUIControlValue.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlValue, pyGUIControlValue); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp index f1ce8ccab3..4638464dc4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp @@ -40,35 +40,30 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include - -#include "pyKey.h" +#include "pyGUIDialog.h" -#include "pyColor.h" +#include #include "pfGameGUIMgr/pfGameGUIMgr.h" #include "pfGameGUIMgr/pfGUIDialogMod.h" +#include "pfGameGUIMgr/pfGUIKnobCtrl.h" +#include "pfGameGUIMgr/pfGUIProgressCtrl.h" +#include "pfGameGUIMgr/pfGUIUpDownPairMod.h" -#include "pyGUIDialog.h" - -// the rest of the controls +#include "pyColor.h" +#include "pyGlueHelpers.h" #include "pyGUIControlButton.h" #include "pyGUIControlCheckBox.h" +#include "pyGUIControlClickMap.h" +#include "pyGUIControlDynamicText.h" #include "pyGUIControlEditBox.h" #include "pyGUIControlListBox.h" +#include "pyGUIControlMultiLineEdit.h" #include "pyGUIControlRadioGroup.h" #include "pyGUIControlTextBox.h" #include "pyGUIControlValue.h" -#include "pyGUIControlDynamicText.h" -#include "pyGUIControlMultiLineEdit.h" #include "pyGUIPopUpMenu.h" -#include "pyGUIControlClickMap.h" - -// specific value controls -#include "pfGameGUIMgr/pfGUIKnobCtrl.h" -#include "pfGameGUIMgr/pfGUIProgressCtrl.h" -#include "pfGameGUIMgr/pfGUIUpDownPairMod.h" +#include "pyKey.h" pyGUIDialog::pyGUIDialog(pyKey& gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h index 874d533c1e..0dba4a6cdf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h @@ -49,10 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include + #include "pnKeyedObject/plKey.h" -#include "pyGlueHelpers.h" -#include +#include "pyGlueDefinitions.h" class pyColor; class pyKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp index fa816c91a4..7ca87342ec 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp @@ -40,13 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyGUIDialog.h" + #include +#include "pyGlueHelpers.h" #include "pyKey.h" -#include "pyGUIDialog.h" - // glue functions PYTHON_CLASS_DEFINITION(ptGUIDialog, pyGUIDialog); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp index 4cdd085a3e..6233d09399 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp @@ -40,18 +40,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - -#include "pyKey.h" +#include "pyGUIPopUpMenu.h" -#include "pyColor.h" +#include +#include "pfGameGUIMgr/pfGUIControlHandlers.h" #include "pfGameGUIMgr/pfGUIControlMod.h" #include "pfGameGUIMgr/pfGUIPopUpMenu.h" -#include "pyGUIPopUpMenu.h" - -#include "pfGameGUIMgr/pfGUIControlHandlers.h" +#include "pyColor.h" +#include "pyKey.h" #define kGetMenuPtr(ret) \ if (fGCkey == nullptr) \ diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h index 00bf0c8d18..b48b241313 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h @@ -50,9 +50,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "pnKeyedObject/plKey.h" -#include "pyGlueHelpers.h" #include "pnKeyedObject/plUoid.h" +#include "pyGlueDefinitions.h" + class pfGUIPopUpMenu; class pyColor; class pyKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenuGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenuGlue.cpp index 99a5c52e39..7581ba9028 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenuGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenuGlue.cpp @@ -40,13 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyGUIPopUpMenu.h" + #include +#include "pyGlueHelpers.h" #include "pyKey.h" -#include "pyGUIPopUpMenu.h" - // glue functions PYTHON_CLASS_DEFINITION(ptGUIPopUpMenu, pyGUIPopUpMenu); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp index 00d3767e06..d4d5db945a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "pyKey.h" +#include "pyGUISkin.h" #include "pfGameGUIMgr/pfGUIPopUpMenu.h" -#include "pyGUISkin.h" +#include "pyKey.h" pyGUISkin::pyGUISkin(pyKey& gckey) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.h b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.h index bd799179d2..7aa54d3e18 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.h @@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "pnKeyedObject/plKey.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" class pyColor; class pyKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUISkinGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUISkinGlue.cpp index 0eb390ac88..a834a27043 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUISkinGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUISkinGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGUISkin.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptGUISkin, pyGUISkin); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameCli.h b/Sources/Plasma/FeatureLib/pfPython/pyGameCli.h index 4a5a9ff9ea..70fd9f8e35 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameCli.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameCli.h @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" // =========================================================================== diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameCliGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameCliGlue.cpp index 7618888a43..6d1e8fb70c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameCliGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameCliGlue.cpp @@ -40,11 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include #include "pyGameCli.h" #include "plPythonConvert.h" - +#include "pyGlueHelpers.h" // =========================================================================== diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameMgr.h b/Sources/Plasma/FeatureLib/pfPython/pyGameMgr.h index cbcb9517f5..25c13a5be8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameMgr.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameMgr.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pyGameMgr_h_ #define _pyGameMgr_h_ -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" class pyGameMgr { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameMgrGlue.cpp index 0e83db4434..7c7d17c020 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameMgrGlue.cpp @@ -42,10 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGameMgr.h" -#include "pyEnum.h" - #include "pnGameMgr/pnGameMgrConst.h" +#include "pyEnum.h" + // =========================================================================== void pyGameMgr::AddPlasmaGameConstantsClasses(PyObject* m) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp index c30a630b29..3c82ca30a7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp @@ -40,13 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include "pyGameScore.h" + #include -#include "pyKey.h" +#include "plVault/plVault.h" -#include "pyGameScore.h" #include "pfGameScoreMgr/pfGameScoreMgr.h" -#include "plVault/plVault.h" + +#include "pyKey.h" pyGameScore::pyGameScore() : fScore() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h index 82c38632ab..1bc874925c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h @@ -50,7 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include "HeadSpin.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" class pfGameScore; class pyKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp index 3e30a96cf0..97db348c6a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp @@ -40,14 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyGameScore.h" + #include -#include "pyKey.h" +#include "pfGameScoreMgr/pfGameScoreMgr.h" -#include "pyGameScore.h" #include "pyEnum.h" -#include "pfGameScoreMgr/pfGameScoreMgr.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptGameScore, pyGameScore); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.cpp index 2e7a8b5a12..caa096ce7e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.cpp @@ -45,6 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "pfMessage/pfGameScoreMsg.h" + #include "pyGameScore.h" PyObject* pyGameScoreMsg::CreateFinal(pfGameScoreMsg* msg) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.h b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.h index 7f1f9f4b8a..3c6c203522 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.h @@ -43,7 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pyGameScoreMsg_h_ #include "pfMessage/pfGameScoreMsg.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" namespace ST { class string; } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsgGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsgGlue.cpp index f427adb0bf..87fafc4553 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsgGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsgGlue.cpp @@ -40,10 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyGameScoreMsg.h" + #include -#include "pyGameScoreMsg.h" +#include "pyGlueHelpers.h" // Maybe we need a better exception? Seems to be the best built in one though #define PFGS_PYERR PyExc_RuntimeError diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h index 69111497e1..3df550b7a1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsGeometry3.h" -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" class pyPoint3 { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp index 97a8b865fa..18ef48b452 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp @@ -40,9 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include #include "pyGeometry3.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptPoint3, pyPoint3); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGlueDefinitions.h b/Sources/Plasma/FeatureLib/pfPython/pyGlueDefinitions.h new file mode 100644 index 0000000000..1aec46c3f1 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfPython/pyGlueDefinitions.h @@ -0,0 +1,68 @@ +/*==LICENSE==* + +CyanWorlds.com Engine - MMOG client, server and tools +Copyright (C) 2011 Cyan Worlds, Inc. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . + +Additional permissions under GNU GPL version 3 section 7 + +If you modify this Program, or any covered work, by linking or +combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, +NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent +JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK +(or a modified version of those libraries), +containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, +PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG +JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the +licensors of this Program grant you additional +permission to convey the resulting work. Corresponding Source for a +non-source form of such a combination shall include the source code for +the parts of OpenSSL and IJG JPEG Library used as well as that of the covered +work. + +You can contact Cyan Worlds, Inc. by email legal@cyan.com + or by snail mail at: + Cyan Worlds, Inc. + 14617 N Newport Hwy + Mead, WA 99021 + +*==LICENSE==*/ +#ifndef _pyGlueDefinitions_h_ +#define _pyGlueDefinitions_h_ + +// Macros for use in Python glue header files. +// This header MUST NOT depend on any Python headers. +// Any macros and functions that require Python headers +// should go into pyGlueHelpers.h instead. + +typedef struct _object PyObject; +typedef struct _typeobject PyTypeObject; + +// This makes sure that our python new function can access our constructors +#define PYTHON_CLASS_NEW_FRIEND(pythonClassName) friend PyObject *pythonClassName##_new(PyTypeObject *type, PyObject *args, PyObject *keywords) + +// This defines the basic new function for a class +#define PYTHON_CLASS_NEW_DEFINITION static PyObject *New() + +// This defines the basic check function for a class +#define PYTHON_CLASS_CHECK_DEFINITION static bool Check(PyObject *obj) + +// This defines the basic convert from function for a class +#define PYTHON_CLASS_CONVERT_FROM_DEFINITION(glueClassName) static glueClassName *ConvertFrom(PyObject *obj) + +// small macros so that the type object can be accessed outside the glue file (for subclassing) +#define PYTHON_EXPOSE_TYPE static PyTypeObject* type_ptr + +#endif // _pyGlueDefinitions_h_ diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.cpp index 816ee1548b..b5eaa63bc7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.cpp @@ -40,12 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include #include -#include "pyGlueHelpers.h" #include "plFileSystem.h" +#include "pyGlueHelpers.h" + ST::string PyUnicode_AsSTString(PyObject* obj) { if (PyUnicode_Check(obj)) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.h b/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.h index 989fed270f..648cdd3af0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.h @@ -42,10 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pyGlueHelpers_h_ #define _pyGlueHelpers_h_ +#include "pyGlueDefinitions.h" + +#include + namespace ST { class string; } -typedef struct _object PyObject; -typedef struct _typeobject PyTypeObject; -typedef struct PyMethodDef PyMethodDef; // Useful string functions ST::string PyUnicode_AsSTString(PyObject* obj); @@ -69,15 +70,7 @@ struct pythonClassName \ glueClassName *fThis; \ }; -// This makes sure that our python new function can access our constructors -#define PYTHON_CLASS_NEW_FRIEND(pythonClassName) friend PyObject *pythonClassName##_new(PyTypeObject *type, PyObject *args, PyObject *keywords) - -#define PYTHON_CLASS_VAULT_NODE_NEW_DEFINITION \ - static PyObject* New(hsRef vaultNode=nullptr); - // This defines the basic new function for a class -#define PYTHON_CLASS_NEW_DEFINITION static PyObject *New() - #define PYTHON_CLASS_NEW_IMPL(pythonClassName, glueClassName) \ PyObject *glueClassName::New() \ { \ @@ -86,8 +79,6 @@ PyObject *glueClassName::New() \ } // This defines the basic check function for a class -#define PYTHON_CLASS_CHECK_DEFINITION static bool Check(PyObject *obj) - #define PYTHON_CLASS_CHECK_IMPL(pythonClassName, glueClassName) \ bool glueClassName::Check(PyObject *obj) \ { \ @@ -95,8 +86,6 @@ bool glueClassName::Check(PyObject *obj) \ } // This defines the basic convert from function for a class -#define PYTHON_CLASS_CONVERT_FROM_DEFINITION(glueClassName) static glueClassName *ConvertFrom(PyObject *obj) - #define PYTHON_CLASS_CONVERT_FROM_IMPL(pythonClassName, glueClassName) \ glueClassName *glueClassName::ConvertFrom(PyObject *obj) \ { \ @@ -375,7 +364,6 @@ PYTHON_TYPE_START(pythonClassName) \ PYTHON_TYPE_END // small macros so that the type object can be accessed outside the glue file (for subclassing) -#define PYTHON_EXPOSE_TYPE static PyTypeObject* type_ptr #define PYTHON_EXPOSE_TYPE_DEFINITION(pythonClass, glueClass) PyTypeObject* glueClass::type_ptr = &pythonClass##_type ///////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGmBlueSpiral.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGmBlueSpiral.cpp index 03b9512cb5..8e35fcdc79 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGmBlueSpiral.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGmBlueSpiral.cpp @@ -42,13 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGmBlueSpiral.h" -#include "pyGameHandler.h" -#include "plPythonConvert.h" - #include #include "pfGameMgr/pfGmBlueSpiral.h" +#include "plPythonConvert.h" +#include "pyGameHandler.h" + // =========================================================================== void pyGmBlueSpiral::StartGame() const diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGmBlueSpiralGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGmBlueSpiralGlue.cpp index e225c26301..1466e0ac86 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGmBlueSpiralGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGmBlueSpiralGlue.cpp @@ -40,12 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "pyGmBlueSpiral.h" -#include "pyGameCli.h" #include "plPythonConvert.h" +#include "pyGameCli.h" +#include "pyGlueHelpers.h" // =========================================================================== diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGmMarker.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGmMarker.cpp index e38b087804..fc0959708d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGmMarker.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGmMarker.cpp @@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyGmMarker.h" -#include "pyGameHandler.h" +#include "pfGameMgr/pfGmMarker.h" + #include "plPythonCallable.h" +#include "pyGameHandler.h" #include "pyObjectRef.h" -#include "pfGameMgr/pfGmMarker.h" - // =========================================================================== void pyGmMarker::StartGame() const diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGmMarker.h b/Sources/Plasma/FeatureLib/pfPython/pyGmMarker.h index 082749d2d8..63395c2f5f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGmMarker.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGmMarker.h @@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com class pfGmMarker; class pyGmMarkerHandler; +namespace ST { class string; } class pyGmMarker : public pyGameCli { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGmMarkerGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGmMarkerGlue.cpp index 96dc352fa3..744d67b451 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGmMarkerGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGmMarkerGlue.cpp @@ -40,14 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include - #include "pyGmMarker.h" +#include + +#include "plPythonConvert.h" #include "pyEnum.h" #include "pyGameCli.h" -#include "plPythonConvert.h" +#include "pyGlueHelpers.h" // =========================================================================== diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp index 22b8dd485f..9de0bcd4aa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp @@ -40,12 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGrassShader.h" + #include "plSurface/plGrassShaderMod.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + pyGrassShader::pyGrassShader() { } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h index 87e1c01ac5..44626a92dd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h @@ -42,10 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pyGrassShader_h #define pyGrassShader_h -#include "pnKeyedObject/plKey.h" -#include "pyGlueHelpers.h" #include +#include "pnKeyedObject/plKey.h" + +#include "pyGlueDefinitions.h" + ////////////////////////////////////////////////////////////////////// // // pyGrassShader - a wrapper class to provide interface to the grass diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGrassShaderGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGrassShaderGlue.cpp index 3aaf859eba..a13fee9c97 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGrassShaderGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGrassShaderGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyGrassShader.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptGrassShader, pyGrassShader); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp index 6b31c40397..4ba2c0d012 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp @@ -40,22 +40,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include +#include "pyImage.h" -#include "pyKey.h" +#include -#include "plFileSystem.h" #include "hsResMgr.h" +#include "plFileSystem.h" -#include "pyColor.h" +#include "pnKeyedObject/plUoid.h" -#include "pyImage.h" -#include "pyGeometry3.h" #include "plGImage/plJPEG.h" #include "plGImage/plMipmap.h" #include "plGImage/plPNG.h" -#include "pnKeyedObject/plUoid.h" + +#include "pyColor.h" +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" void pyImage::setKey(pyKey& mipmapKey) // only for python glue, do NOT call { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.h b/Sources/Plasma/FeatureLib/pfPython/pyImage.h index f648d97f71..73fe2559e4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.h @@ -49,8 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for Python to a plMipMap image // -#include "pyGlueHelpers.h" - #include #include "pnKeyedObject/plKey.h" @@ -59,6 +57,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com # include "plGImage/plMipmap.h" #endif +#include "pyGlueDefinitions.h" + class plFileName; class pyColor; class pyKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp index eb01380d5b..a0183fc0f0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp @@ -40,16 +40,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyImage.h" + #include #include "plFileSystem.h" #include "pyColor.h" +#include "pyGlueHelpers.h" #include "pyKey.h" -#include "pyImage.h" - // glue functions PYTHON_CLASS_DEFINITION(ptImage, pyImage); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp index 4aa8d807d7..5768f61495 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp @@ -45,18 +45,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // /////////////////////////////////////////////// -#include +#include "pyJournalBook.h" + #include -#include "pyKey.h" #include "hsResMgr.h" -#include "pyJournalBook.h" +#include "pnKeyedObject/plUoid.h" + #include "pfJournalBook/pfJournalBook.h" #include "cyAnimation.h" +#include "pyGlueHelpers.h" #include "pyImage.h" -#include "pnKeyedObject/plUoid.h" +#include "pyKey.h" uint32_t pyJournalBook::fNextKeyID = 0; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h index 76bab40836..c057f835bd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h @@ -48,13 +48,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include + +#include "HeadSpin.h" + +#include "pnKeyedObject/plKey.h" + +#include "pyGlueDefinitions.h" -class pyImage; class pfJournalBook; -class plKey; +class pyImage; class pyKey; -namespace ST { class string; } class pyJournalBook { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp index e24af37cf2..d2ee649597 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp @@ -40,16 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include +#include "pyJournalBook.h" -#include "pyKey.h" +#include "pfJournalBook/pfJournalBook.h" -#include "pyJournalBook.h" #include "pyEnum.h" +#include "pyGlueHelpers.h" #include "pyImage.h" - -#include "pfJournalBook/pfJournalBook.h" +#include "pyKey.h" // glue functions PYTHON_CLASS_DEFINITION(ptBook, pyJournalBook); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp index 084cef1fc1..9c8ce84d32 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp @@ -48,15 +48,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "plgDispatch.h" -#include "pyKey.h" -#include "hsResMgr.h" +#include "pnMessage/plEnableMsg.h" #include "pnModifier/plModifier.h" +#include "pnSceneObject/plSceneObject.h" #include "plPythonFileMod.h" -#include "pnMessage/plEnableMsg.h" +#include "pyKey.h" #include "pySceneObject.h" -#include "pnSceneObject/plSceneObject.h" pyKey::pyKey() { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKey.h b/Sources/Plasma/FeatureLib/pfPython/pyKey.h index e815e5abb0..de2d9d8f7b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKey.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyKey.h @@ -48,12 +48,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pnKeyedObject/plKey.h" -#include "pyGlueHelpers.h" #include -class plPythonFileMod; +#include "pnKeyedObject/plKey.h" + +#include "pyGlueDefinitions.h" + class plPipeline; +class plPythonFileMod; namespace ST { class string; } class pyKey diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKeyGlue.cpp index 20a1106293..43967501bb 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyGlue.cpp @@ -40,10 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyKey.h" + #include -#include "pyKey.h" +#include "pyGlueHelpers.h" // glue functions PYTHON_CLASS_DEFINITION(ptKey, pyKey); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp index 68206d0bdc..bead28df99 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp @@ -50,9 +50,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include -#include "plInputCore/plInputInterfaceMgr.h" #include "pnInputCore/plKeyMap.h" +#include "plInputCore/plInputInterfaceMgr.h" + // conversion functions ST::string pyKeyMap::ConvertVKeyToChar(uint32_t vk, uint32_t flags) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h index 3d70d61d7e..45404f86d8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h @@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" namespace ST { class string; } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMapGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKeyMapGlue.cpp index e767872b6e..266aefe289 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMapGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMapGlue.cpp @@ -40,10 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyKeyMap.h" + #include -#include "pyKeyMap.h" +#include "pyGlueHelpers.h" // glue functions PYTHON_CLASS_DEFINITION(ptKeyMap, pyKeyMap); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp index 00c78a8d94..cf48a68a58 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp @@ -47,6 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyMarkerMgr.h" + #include "pfCharacter/pfMarkerMgr.h" #include "pyGeometry3.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h index 4c3c630a07..72668782d6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h @@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" class pyPoint3; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp index 3fb449ec83..8c825459b0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp @@ -40,13 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "pyMarkerMgr.h" + #include "pfMessage/pfMarkerMsg.h" -#include "pyGeometry3.h" #include "pyEnum.h" +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" // glue functions PYTHON_CLASS_DEFINITION(ptMarkerMgr, pyMarkerMgr); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp index 9fdf335bee..cbdf7c144d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp @@ -40,10 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyGeometry3.h" #include "pyMatrix44.h" +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" + PyObject* pyMatrix44::operator*(const pyVector3& p) const { return pyVector3::New(fMatrix * p.fVector); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h index fd2dbdcef2..ee5b2895d0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h @@ -43,8 +43,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define pyMatrix44_h_inc #include + #include "hsMatrix44.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" class pyPoint3; class pyVector3; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp index 73899309c4..631b515636 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyMatrix44.h" #include "pyGeometry3.h" -#include "pyMatrix44.h" +#include "pyGlueHelpers.h" // glue functions PYTHON_CLASS_DEFINITION(ptMatrix44, pyMatrix44); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp index 2a6ad2dfac..ca5b770bf1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp @@ -45,14 +45,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyKey.h" - #include "pyMoviePlayer.h" -#include "pyColor.h" #include "plMessage/plMovieMsg.h" + #include "pfMessage/pfMovieEventMsg.h" +#include "pyColor.h" +#include "pyKey.h" + pyMoviePlayer::pyMoviePlayer(const ST::string& movieName, pyKey& selfKey) { fMovieName = movieName; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h index 8ed577594c..2ec6ca7f7f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h @@ -50,9 +50,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include -#include "pyGlueHelpers.h" #include "pnKeyedObject/plKey.h" +#include "pyGlueDefinitions.h" + class pyColor; class pyKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp index 4b11b0e584..a6958a3c9e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp @@ -40,15 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyMoviePlayer.h" -#include "pyEnum.h" -#include "pyColor.h" #include "pfMessage/pfMovieEventMsg.h" +#include "pyColor.h" +#include "pyEnum.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptMoviePlayer, pyMoviePlayer); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp index 7aeb8cd082..f136b8fca3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp @@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include -#include "plNetClient/plNetLinkingMgr.h" -#include "plAvatar/plAvatarMgr.h" #include "plAvatar/plArmatureMod.h" +#include "plAvatar/plAvatarMgr.h" +#include "plNetClient/plNetLinkingMgr.h" #include "pyAgeLinkStruct.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h index 0f3ae51d5e..cafbb15d28 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h @@ -43,7 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define pyNetLinkingMgr_h_inc #include "HeadSpin.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" ////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp index fc0c157bcc..b144c8c910 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp @@ -40,15 +40,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include - #include "pyNetLinkingMgr.h" -#include "pyEnum.h" -#include "pyAgeLinkStruct.h" + +#include #include "plNetCommon/plNetCommon.h" +#include "pyAgeLinkStruct.h" +#include "pyEnum.h" +#include "pyGlueHelpers.h" + #ifndef BUILDING_PYPLASMA // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp index 71588e12d7..f5202a630e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp @@ -45,15 +45,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include "pyNotify.h" + #include #include "plgDispatch.h" + #include "pyGeometry3.h" #include "pyKey.h" -#include "pyNotify.h" - - pyNotify::pyNotify() : fNetPropagate(true), fNetForce(false) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h index 590cfb512b..7384152609 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h @@ -52,7 +52,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnKeyedObject/plKey.h" #include "pnMessage/plNotifyMsg.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" class pyKey; class pyPoint3; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp index 5ae68b6a89..43ac83ec5f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp @@ -40,15 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyNotify.h" + #include +#include "pyEnum.h" #include "pyGeometry3.h" +#include "pyGlueHelpers.h" #include "pyKey.h" -#include "pyNotify.h" -#include "pyEnum.h" - // glue functions PYTHON_CLASS_DEFINITION(ptNotify, pyNotify); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyPlayer.cpp b/Sources/Plasma/FeatureLib/pfPython/pyPlayer.cpp index 1108ec8706..966f859d3b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyPlayer.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyPlayer.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "pyKey.h" - #include "pyPlayer.h" +#include "pyKey.h" + pyPlayer::pyPlayer() // only used by python glue, do NOT call : fPlayerID(), fDistSq(-1), fIsCCR(), fIsServer() { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h b/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h index 5521f50bdd..cc71e06962 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h @@ -49,10 +49,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for Python to the player data // -#include "pyGlueHelpers.h" -#include "pnKeyedObject/plKey.h" #include +#include "pnKeyedObject/plKey.h" + +#include "pyGlueDefinitions.h" + class pyKey; class pyPlayer diff --git a/Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp index e2897728ea..f5df3ed00c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pyPlayer.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptPlayer, pyPlayer); diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp b/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp index 8d106b9c30..f29aef0b8b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp @@ -42,13 +42,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pySDL.h" -#include #include #include "pnKeyedObject/plKey.h" #include "plSDL/plSDL.h" +#include "pyGlueHelpers.h" + /////////////////////////////////////////////////////////////////////////// pySDLStateDataRecord::pySDLStateDataRecord() diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDL.h b/Sources/Plasma/FeatureLib/pfPython/pySDL.h index 236bb628f1..6856e743dd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDL.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySDL.h @@ -48,14 +48,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "HeadSpin.h" #include -#include "pyGlueHelpers.h" +#include "HeadSpin.h" + +#include "pyGlueDefinitions.h" -class plStateDataRecord; -class plSimpleStateVariable; class plKey; +class plSimpleStateVariable; +class plStateDataRecord; namespace ST { class string; } // pySDL -- this thing really only exists for the constants diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp index f37d0245b3..94d464750d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp @@ -40,14 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include +#include "pySDL.h" -#include "pyKey.h" +#include -#include "pySDL.h" #include "plSDL/plSDL.h" + #include "pyEnum.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" void pySDL::AddPlasmaConstantsClasses(PyObject *m) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp index cc30773cf0..f09b4d5ef6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp @@ -40,35 +40,35 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pySceneObject.h" + #include #include "plAudible.h" #include "plgDispatch.h" -#include "pyGeometry3.h" -#include "pyKey.h" -#include "pyMatrix44.h" -#include "pySceneObject.h" - -#include "cyAvatar.h" -#include "cyDraw.h" -#include "cyParticleSys.h" -#include "cyPhysics.h" - -#include "plMessage/plAnimCmdMsg.h" #include "pnMessage/plCameraMsg.h" #include "pnMessage/plNotifyMsg.h" +#include "pnSceneObject/plAudioInterface.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "plAvatar/plArmatureMod.h" -#include "pnSceneObject/plAudioInterface.h" #include "plAvatar/plAvBrainHuman.h" -#include "pfCamera/plCameraModifier.h" -#include "pnSceneObject/plCoordinateInterface.h" +#include "plMessage/plAnimCmdMsg.h" #include "plModifier/plLogicModifier.h" -#include "plPythonFileMod.h" #include "plModifier/plResponderModifier.h" +#include "pfCamera/plCameraModifier.h" + +#include "cyAvatar.h" +#include "cyDraw.h" +#include "cyParticleSys.h" +#include "cyPhysics.h" +#include "plPythonFileMod.h" +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" +#include "pyMatrix44.h" + void pySceneObject::IAddObjKeyToAll(const plKey& key) { // set the sender and the receiver to the same thing diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h index b0e376971e..7a311994e6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h @@ -49,11 +49,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" -#include "pnKeyedObject/plKey.h" #include -class pyKey; +#include "pnKeyedObject/plKey.h" + +#include "pyGlueDefinitions.h" +#include "pyKey.h" + class pyMatrix44; namespace ST { class string; } diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp index 37f2a211e5..83260e154c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp @@ -40,15 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pySceneObject.h" + #include #include "pyGeometry3.h" -#include "pyKey.h" +#include "pyGlueHelpers.h" #include "pyMatrix44.h" -#include "pySceneObject.h" - // glue functions PYTHON_CLASS_DEFINITION(ptSceneobject, pySceneObject); diff --git a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h index 57c5adc698..fc9c55b8a3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h @@ -45,7 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "plNetCommon/plSpawnPointInfo.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" ////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfoGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfoGlue.cpp index 53a94a536c..47e468f85a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfoGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfoGlue.cpp @@ -40,10 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "pySpawnPointInfo.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptSpawnPointInfo, pySpawnPointInfo); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp index df2dd6d56e..4d6f04f63b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp @@ -46,12 +46,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // and interface to the ChatLog (ptChatStatusLog) ////////////////////////////////////////////////////////////////////// +#include "pyStatusLog.h" + #include -#include "pyColor.h" -#include "pyStatusLog.h" #include "plStatusLog/plStatusLog.h" +#include "pyColor.h" + pyStatusLog::pyStatusLog(plStatusLog* log/*=nullptr */) : fLog( log ) , fICreatedLog( false ) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h index befd745bb3..864553512c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h @@ -50,10 +50,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" -class pyColor; +#include "pyGlueDefinitions.h" + class plStatusLog; +class pyColor; namespace ST { class string; } class pyStatusLog diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp index 8d709405c3..63a0431dc7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp @@ -40,13 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyStatusLog.h" + #include +#include "plStatusLog/plStatusLog.h" + #include "pyColor.h" #include "pyEnum.h" -#include "plStatusLog/plStatusLog.h" -#include "pyStatusLog.h" +#include "pyGlueHelpers.h" // glue functions PYTHON_CLASS_DEFINITION(ptStatusLog, pyStatusLog); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStream.h b/Sources/Plasma/FeatureLib/pfPython/pyStream.h index 2de9476bce..a2fe636472 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStream.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyStream.h @@ -48,13 +48,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#include #include "HeadSpin.h" #include "hsStream.h" -#include "pyGlueHelpers.h" -#include -#include +#include "pyGlueDefinitions.h" class plFileName; namespace ST { class string; } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStreamGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStreamGlue.cpp index 7296830bfc..7e51a3bb0a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStreamGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStreamGlue.cpp @@ -40,12 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyStream.h" + #include -#include "pyStream.h" #include "plFileSystem.h" +#include "pyGlueHelpers.h" // glue functions PYTHON_CLASS_DEFINITION(ptStream, pyStream); diff --git a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp index 7d2c651337..c66fbf9e96 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp @@ -40,11 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "pyKey.h" - #include "pySwimCurrentInterface.h" + #include "plAvatar/plSwimRegion.h" +#include "pyKey.h" + pySwimCurrentInterface::pySwimCurrentInterface(plKey key) { fSwimCurrentKey = std::move(key); diff --git a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h index 2735b2608f..630cb80465 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h @@ -42,9 +42,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pySwimCurrentInterface_h #define pySwimCurrentInterface_h -#include "pyGlueHelpers.h" #include "pnKeyedObject/plKey.h" +#include "pyGlueDefinitions.h" + class pyKey; class pySwimCurrentInterface diff --git a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterfaceGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterfaceGlue.cpp index e6bbab4cfa..e84fd0c6ae 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterfaceGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterfaceGlue.cpp @@ -40,11 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" - #include "pySwimCurrentInterface.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" + // glue functions PYTHON_CLASS_DEFINITION(ptSwimCurrentInterface, pySwimCurrentInterface); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp index 60f0eb6e71..3fa69f8876 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp @@ -45,32 +45,32 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include "pyVault.h" + #include -#include #include #ifdef BUILDING_PYPLASMA # error "pyVault is not compatible with pyPlasma.pyd. Use BUILDING_PYPLASMA macro to ifdef out unwanted headers." #endif -#include "pyVault.h" -#include "pyVaultNode.h" -#include "pyVaultAgeInfoNode.h" +#include "plNetClient/plNetClientMgr.h" +#include "plNetCommon/plNetCommon.h" +#include "plSDL/plSDL.h" +#include "plVault/plVault.h" + +#include "pyAgeInfoStruct.h" +#include "pyAgeLinkStruct.h" +#include "pyGlueHelpers.h" +#include "pySDL.h" #include "pyVaultAgeInfoListNode.h" +#include "pyVaultAgeInfoNode.h" #include "pyVaultAgeLinkNode.h" +#include "pyVaultChronicleNode.h" #include "pyVaultFolderNode.h" +#include "pyVaultNode.h" #include "pyVaultPlayerInfoListNode.h" #include "pyVaultPlayerInfoNode.h" -#include "pyVaultChronicleNode.h" -#include "pyAgeInfoStruct.h" -#include "pyAgeLinkStruct.h" -#include "pySDL.h" - -#include "plVault/plVault.h" -#include "plNetClient/plNetClientMgr.h" -#include "plNetCommon/plNetCommon.h" - -#include "plSDL/plSDL.h" //============================================================================ static PyObject * GetFolder (unsigned folderType) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVault.h b/Sources/Plasma/FeatureLib/pfPython/pyVault.h index b2094f31c7..fd120968f4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVault.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVault.h @@ -49,14 +49,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" -class pyVaultNode; -class pyVaultAgeInfoNode; +#include "pyGlueDefinitions.h" + class pyAgeInfoStruct; class pyAgeLinkStruct; - class pySDLStateDataRecord; +class pyVaultAgeInfoNode; +class pyVaultNode; namespace ST { class string; } class pyVault diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h index 4e8a35ca35..0201a202f5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h @@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" #include "pyVaultFolderNode.h" class pyVaultAgeInfoListNode : public pyVaultFolderNode diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp index 6de00912d6..8ca55cf983 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp @@ -40,11 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "pyVaultAgeInfoListNode.h" + #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultAgeInfoListNode, pyVaultAgeInfoListNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp index f59afebcb8..52ac2747d1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp @@ -45,19 +45,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include +#include "pyVaultAgeInfoNode.h" + #include #include -#include "pyVaultAgeInfoNode.h" +#include "pnUUID/pnUUID.h" +#include "plVault/plVault.h" + +#include "pyAgeInfoStruct.h" +#include "pyGlueHelpers.h" #include "pyVaultAgeInfoListNode.h" -#include "pyVaultPlayerInfoListNode.h" #include "pyVaultAgeLinkNode.h" -#include "pyAgeInfoStruct.h" - -#include "pnUUID/pnUUID.h" -#include "plVault/plVault.h" +#include "pyVaultPlayerInfoListNode.h" pyVaultAgeInfoNode::pyVaultAgeInfoNode() : pyVaultNode() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h index fd81780237..f97c5b1237 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h @@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" #include "pyVaultNode.h" class plUUID; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp index 00146b791f..89b651a066 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp @@ -40,12 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyVaultAgeInfoNode.h" + #include -#include "pyVaultAgeInfoNode.h" #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultAgeInfoNode, pyVaultAgeInfoNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp index 1234dc4fa4..a2b5eec924 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp @@ -45,17 +45,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include -#include - #include "pyVaultAgeLinkNode.h" -#include "pyVaultAgeInfoNode.h" -#include "pyAgeLinkStruct.h" -#include "pySpawnPointInfo.h" + +#include #include "plVault/plVault.h" -#include "plNetCommon/plSpawnPointInfo.h" +#include "pyAgeLinkStruct.h" +#include "pyGlueHelpers.h" +#include "pySpawnPointInfo.h" +#include "pyVaultAgeInfoNode.h" //create from the Python side pyVaultAgeLinkNode::pyVaultAgeLinkNode() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h index ec65dc77fa..ace1899548 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h @@ -49,10 +49,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" -#include "pyVaultNode.h" + #include "plNetCommon/plNetServerSessionInfo.h" // for plAgeLinkStruct +#include "pyGlueDefinitions.h" +#include "pyVaultNode.h" + class pySpawnPointInfo; class pySpawnPointInfoRef; namespace ST { class string; } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp index ca115d19fc..e69de44330 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp @@ -40,14 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include - #include "pyVaultAgeLinkNode.h" -#include "pySpawnPointInfo.h" + +#include #include "plVault/plVault.h" +#include "pyGlueHelpers.h" +#include "pySpawnPointInfo.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultAgeLinkNode, pyVaultAgeLinkNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h index 1dec9ca176..c4e8afbc62 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h @@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" #include "pyVaultNode.h" namespace ST { class string; } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp index e6368e9a5e..54540ef28b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp @@ -40,12 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyVaultChronicleNode.h" + #include -#include "pyVaultChronicleNode.h" #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultChronicleNode, pyVaultChronicleNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h index a2c8d806ce..60f6f782ef 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" #include "pyVaultNode.h" namespace ST { class string; } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp index 4b621ee9b1..fc48d609dc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp @@ -40,13 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include - #include "pyVaultFolderNode.h" +#include + #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultFolderNode, pyVaultFolderNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp index 4c370591b7..512fdc5857 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp @@ -40,19 +40,20 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyVault.h" + #include -#include "pyVault.h" -#include "pyEnum.h" +#include "plMessage/plVaultNotifyMsg.h" +#include "plVault/plVault.h" + #include "pyAgeInfoStruct.h" -#include "pyVaultNode.h" -#include "pyVaultAgeInfoNode.h" -#include "pySDL.h" #include "pyAgeLinkStruct.h" - -#include "plVault/plVault.h" -#include "plMessage/plVaultNotifyMsg.h" +#include "pyEnum.h" +#include "pyGlueHelpers.h" +#include "pySDL.h" +#include "pyVaultAgeInfoNode.h" +#include "pyVaultNode.h" #ifndef BUILDING_PYPLASMA diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp index 9b2bfe3325..4bce7aea0c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp @@ -45,24 +45,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include +#include "pyVaultImageNode.h" + #include -#include "plPipeline.h" #include "hsResMgr.h" +#include "plPipeline.h" -#include "pyVaultImageNode.h" -#ifndef BUILDING_PYPLASMA -# include "pyVault.h" -#endif -#include "pyImage.h" -#include "cyMisc.h" +#include "pnMessage/plRefMsg.h" #include "plGImage/plMipmap.h" -#include "plVault/plVault.h" -#include "pnMessage/plRefMsg.h" #include "plNetClient/plNetClientMgr.h" +#include "plVault/plVault.h" +#include "cyMisc.h" +#include "pyGlueHelpers.h" +#include "pyImage.h" static unsigned s_keyseq; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h index 111a4a3e81..42fe3c90e9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h @@ -48,8 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" #include "pnKeyedObject/plKey.h" + +#include "pyGlueDefinitions.h" #include "pyVaultNode.h" class plMipmap; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp index 558a13d95f..36ca04dcbe 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp @@ -40,14 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include - #include "pyVaultImageNode.h" -#include "pyImage.h" + +#include #include "plVault/plVault.h" +#include "pyGlueHelpers.h" +#include "pyImage.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultImageNode, pyVaultImageNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp index 38931457d6..bf597dcf3b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp @@ -45,14 +45,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include -#include +#include "pyVaultMarkerGameNode.h" -#include "pyGeometry3.h" +#include -#include "pyVaultMarkerGameNode.h" #include "plVault/plVault.h" +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" + //create from the Python side pyVaultMarkerGameNode::pyVaultMarkerGameNode() : pyVaultNode() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h index 9b4d9809bf..9666221b56 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" #include "pyVaultNode.h" #include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp index 4587d7a94c..c47e90e1e5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp @@ -40,14 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include +#include "pyVaultMarkerGameNode.h" -#include "pyGeometry3.h" +#include -#include "pyVaultMarkerGameNode.h" #include "plVault/plVault.h" +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultMarkerGameNode, pyVaultMarkerGameNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp index 733c697aac..151db504e0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp @@ -45,37 +45,38 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include +#include "pyVaultNode.h" + #include -#include "pyVaultNode.h" +#include "pnUUID/pnUUID.h" -#ifndef BUILDING_PYPLASMA -# include "pyVault.h" -# include "pyVaultSystemNode.h" -# include "plNetClientComm/plNetClientComm.h" -#endif +#include "plVault/plVault.h" +#include "plPythonCallable.h" #include "pyDniCoordinates.h" +#include "pyGlueHelpers.h" #include "pyObjectRef.h" -#include "plPythonCallable.h" -#include "pyVaultNodeRef.h" -#include "pyVaultFolderNode.h" -#include "pyVaultPlayerInfoListNode.h" -#include "pyVaultImageNode.h" -#include "pyVaultTextNoteNode.h" +#include "pyVaultAgeInfoListNode.h" +#include "pyVaultAgeInfoNode.h" #include "pyVaultAgeLinkNode.h" #include "pyVaultChronicleNode.h" -#include "pyVaultPlayerInfoNode.h" +#include "pyVaultFolderNode.h" +#include "pyVaultImageNode.h" #include "pyVaultMarkerGameNode.h" -#include "pyVaultAgeInfoNode.h" -#include "pyVaultAgeInfoListNode.h" +#include "pyVaultNodeRef.h" +#include "pyVaultPlayerInfoListNode.h" +#include "pyVaultPlayerInfoNode.h" #include "pyVaultPlayerNode.h" #include "pyVaultSDLNode.h" +#include "pyVaultTextNoteNode.h" -#include "pnUUID/pnUUID.h" -#include "plVault/plVault.h" +#ifndef BUILDING_PYPLASMA +# include "plNetClientComm/plNetClientComm.h" +# include "pyVault.h" +# include "pyVaultSystemNode.h" +#endif /////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h index 436bfd3700..24a652c555 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h @@ -49,14 +49,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" -#include "pyObjectRef.h" #include "hsRefCnt.h" #include "pnNetBase/pnNbError.h" +#include "pyGlueDefinitions.h" +#include "pyObjectRef.h" + struct RelVaultNode; class plUUID; +namespace ST { class string; } + +#define PYTHON_CLASS_VAULT_NODE_NEW_DEFINITION \ + static PyObject* New(hsRef vaultNode=nullptr); class pyVaultNode { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp index 30f3e9154a..d503b3447d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp @@ -40,12 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyVaultNode.h" + #include -#include "pyVaultNode.h" #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultNode, pyVaultNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp index 23471c62b5..b0c6068421 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp @@ -45,12 +45,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include - #include "pyVaultNodeRef.h" + +#include "plVault/plVault.h" + +#include "pyGlueHelpers.h" #include "pyVaultNode.h" #include "pyVaultPlayerInfoNode.h" -#include "plVault/plVault.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h index d4047e1879..849e7adda6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h @@ -49,9 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" #include "hsRefCnt.h" +#include "pyGlueDefinitions.h" + struct RelVaultNode; class pyVaultNodeRef diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp index 1b170c3960..d4a2b260a0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp @@ -40,12 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "pyVaultNodeRef.h" #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + // glue functions // glue functions PYTHON_CLASS_DEFINITION(ptVaultNodeRef, pyVaultNodeRef); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp index e194791ae8..1ea2f9f0ef 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp @@ -45,12 +45,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include - #include "pyVaultPlayerInfoListNode.h" + +#include "plVault/plVault.h" + +#include "pyGlueHelpers.h" #include "pyVaultFolderNode.h" #include "pyVaultPlayerInfoNode.h" -#include "plVault/plVault.h" //create from the Python side pyVaultPlayerInfoListNode::pyVaultPlayerInfoListNode() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h index e0ffe412e5..0dc080c1c4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h @@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" #include "pyVaultFolderNode.h" class pyVaultPlayerInfoListNode : public pyVaultFolderNode diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp index d895772040..d6f5ffe635 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp @@ -40,11 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "pyVaultPlayerInfoListNode.h" + #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultPlayerInfoListNode, pyVaultPlayerInfoListNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp index b0b87cb87a..4d75ed7456 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp @@ -50,9 +50,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include -#include "plVault/plVault.h" #include "pnUUID/pnUUID.h" +#include "plVault/plVault.h" + //create from the Python side pyVaultPlayerInfoNode::pyVaultPlayerInfoNode() : pyVaultNode() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h index 1df57c251c..3eef3fd13a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h @@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include "pyGlueDefinitions.h" #include "pyVaultNode.h" -#include "pyGlueHelpers.h" class plUUID; namespace ST { class string; } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp index 8e6fa231cc..41a0a386c9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp @@ -40,12 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyVaultPlayerInfoNode.h" + #include -#include "pyVaultPlayerInfoNode.h" #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultPlayerInfoNode, pyVaultPlayerInfoNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp index 35519cfcde..cb8becd454 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp @@ -45,17 +45,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include +#include "pyVaultPlayerNode.h" + #include -#include "pyVaultPlayerNode.h" +#include "plVault/plVault.h" + #include "pyAgeInfoStruct.h" +#include "pyAgeLinkStruct.h" +#include "pyGlueHelpers.h" #include "pyVaultAgeLinkNode.h" -#include "pyVaultPlayerInfoNode.h" -#include "pyVaultFolderNode.h" #include "pyVaultChronicleNode.h" -#include "pyAgeLinkStruct.h" -#include "plVault/plVault.h" +#include "pyVaultFolderNode.h" +#include "pyVaultPlayerInfoNode.h" //============================================================================ static PyObject * GetPlayerVaultFolder (unsigned folderType) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h index d1dc8e7765..ed8f1162d7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h @@ -48,7 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" #include "pyVaultNode.h" class pyAgeInfoStruct; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp index 2fc758c04c..89f783c0bb 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp @@ -40,13 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyVaultPlayerNode.h" + #include -#include "pyVaultPlayerNode.h" -#include "pyAgeInfoStruct.h" #include "plVault/plVault.h" +#include "pyAgeInfoStruct.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultPlayerNode, pyVaultPlayerNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp index f27c8fa46a..6a602df7d6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp @@ -45,14 +45,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include +#include "pyVaultSDLNode.h" + #include -#include "pyVaultSDLNode.h" #include "plSDL/plSDL.h" -#include "pySDL.h" #include "plVault/plVault.h" +#include "pyGlueHelpers.h" +#include "pySDL.h" + //create from the Python side pyVaultSDLNode::pyVaultSDLNode() : pyVaultNode() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h index f532e8c7fe..afcaf3b76d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" #include "pyVaultNode.h" class pySDLStateDataRecord; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp index 04ea24ba91..8f8928bcef 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp @@ -40,13 +40,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyVaultSDLNode.h" + #include -#include "pyVaultSDLNode.h" -#include "pySDL.h" #include "plVault/plVault.h" +#include "pyGlueHelpers.h" +#include "pySDL.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultSDLNode, pyVaultSDLNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp index 53b68738ec..9c81ac09d5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp @@ -45,8 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// - #include "pyVaultSystemNode.h" + #include "plVault/plVault.h" //create from the Python side diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h index 66c71293bf..743bf51013 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyGlueHelpers.h" +#include "pyGlueDefinitions.h" #include "pyVaultNode.h" class pyVaultSystemNode : public pyVaultNode diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp index b5fe28bdab..a2aeef516a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp @@ -40,11 +40,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include - #include "pyVaultSystemNode.h" + #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultSystemNode, pyVaultSystemNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp index 65c9bc8454..425ad08efc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp @@ -45,13 +45,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include +#include "pyVaultTextNoteNode.h" + #include -#include "pyVaultTextNoteNode.h" #include "pnNetBase/pnNbError.h" + #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + //create from the Python side pyVaultTextNoteNode::pyVaultTextNoteNode() : pyVaultNode() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h index 3f1d59d4fc..72f99d2cf9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h @@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "pyGlueHelpers.h" + +#include "pyGlueDefinitions.h" #include "pyVaultNode.h" namespace ST { class string; } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp index c6e16a6b98..7b00657bb7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp @@ -40,12 +40,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include +#include "pyVaultTextNoteNode.h" + #include -#include "pyVaultTextNoteNode.h" #include "plVault/plVault.h" +#include "pyGlueHelpers.h" + // glue functions PYTHON_CLASS_DEFINITION(ptVaultTextNoteNode, pyVaultTextNoteNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp index fda4ceb705..921b3069b2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp @@ -40,13 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyKey.h" +#include "pyWaveSet.h" + +#include "plDrawable/plWaveSet7.h" #include "pyColor.h" #include "pyGeometry3.h" -#include "pyWaveSet.h" -#include "plDrawable/plWaveSet7.h" +#include "pyGlueHelpers.h" pyWaveSet::pyWaveSet(plKey key) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h index 21d4f67c44..31e9092f90 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h @@ -42,11 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pyWaveSet_h #define pyWaveSet_h -#include "pyGlueHelpers.h" #include "pnKeyedObject/plKey.h" +#include "pyGlueDefinitions.h" +#include "pyKey.h" + class pyColor; -class pyKey; class pyPoint3; class pyVector3; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp index f180e47812..abf44c5e68 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp @@ -40,12 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include -#include "pyGeometry3.h" -#include "pyKey.h" +#include "pyWaveSet.h" #include "pyColor.h" -#include "pyWaveSet.h" +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" // glue functions PYTHON_CLASS_DEFINITION(ptWaveSet, pyWaveSet); diff --git a/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h b/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h index 9ad41e042d..a5b09efd33 100644 --- a/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h +++ b/Sources/Plasma/PubUtilLib/plMessage/plMovieMsg.h @@ -45,9 +45,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include +#include "hsColorRGBA.h" +#include "hsPoint2.h" + #include "pnMessage/plMessage.h" #include "pnKeyedObject/plFixedKey.h" -#include "hsPoint2.h" class plMovieMsg : public plMessage { diff --git a/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h b/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h index 4cad5bf076..003e8f007a 100644 --- a/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h +++ b/Sources/Plasma/PubUtilLib/plVault/plDniCoordinateInfo.h @@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com class hsStream; class hsResMgr; - +namespace ST { class string; } class plDniCoordinateInfo : public plCreatable {