diff --git a/CMakeLists.txt b/CMakeLists.txt index 11abb4c3..4e8dcf39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,7 @@ endif(WIN32) find_package(MaxSDK) #TODO: Only find this if we are building PlasmaMax find_package(Bink) #TODO: Find Bink, but don't require it if plPipeline isn't built... # Or better yet, just eliminate bink altogether +include(PrecompiledHeader) #Precompiled Header helper macros # libCurl isn't smart enough to detect this for us, so we have to configure it ourselves option(CURL_IS_STATIC "Using the static version of libcurl?" ON) diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt index e0881746..0d0385ff 100644 --- a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt @@ -19,6 +19,7 @@ set(pfPython_SOURCES cyParticleSys.cpp cyPhysics.cpp cyPythonInterface.cpp + Pch.cpp plPythonFileMod.cpp plPythonPack.cpp plPythonSDLModifier.cpp @@ -104,6 +105,7 @@ set(pfPython_HEADERS cyParticleSys.h cyPhysics.h cyPythonInterface.h + Pch.h pfPythonCreatable.h plPythonFileMod.h plPythonHelpers.h @@ -340,6 +342,7 @@ set(pfPython_GAMES ${pfPython_VSYNC} ) +use_precompiled_header(Pch.h Pch.cpp) add_library(pfPython STATIC ${pfPython_SOURCES} ${pfPython_HEADERS} ${pfPython_GLUE} ${pfPython_GAME_GLUE} ${pfPython_GAMES}) source_group("Source Files" FILES ${pfPython_SOURCES}) diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.cpp index dea647ee..3406c43a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include "../../pyKey.h" +#pragma hdrstop + #include "pyBlueSpiralGame.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h index 0ca9484a..2a6fa7a4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h @@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for the BlueSpiral game client // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" -#include "../../pyKey.h" class pyBlueSpiralGame : public pyGameCli { diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGameGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGameGlue.cpp index 579777ca..b08fd931 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGameGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGameGlue.cpp @@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyBlueSpiralGame.h" #include +#include "../../pyKey.h" +#pragma hdrstop + +#include "pyBlueSpiralGame.h" #include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.cpp index cc5517fe..4d4d407b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyBlueSpiralMsg.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h index fc992b51..848673f2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h @@ -48,9 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for BlueSpiral game messages // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp index a1c6cb4a..4ac85907 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyBlueSpiralMsg.h" -#include "../../pyEnum.h" #include +#pragma hdrstop + +#include "pyBlueSpiralMsg.h" +#include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.cpp index 57a1a365..87b4bdb1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include "../../pyKey.h" +#pragma hdrstop + #include "pyClimbingWallGame.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h index 0ce90a89..2552d7b3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h @@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for the climbing wall game client // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" -#include "../../pyKey.h" class pyClimbingWallGame : public pyGameCli { diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGameGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGameGlue.cpp index a364f59c..e67284e9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGameGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGameGlue.cpp @@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyClimbingWallGame.h" #include +#include "../../pyKey.h" +#pragma hdrstop + +#include "pyClimbingWallGame.h" #include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.cpp index 0f331deb..882a4abf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyClimbingWallMsg.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h index 5b111d9f..c5cf568b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h @@ -48,9 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for ClimbingWall game messages // -#include -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsgGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsgGlue.cpp index 3be38006..1accf95a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsgGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsgGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyClimbingWallMsg.h" -#include "../../pyEnum.h" #include +#pragma hdrstop + +#include "pyClimbingWallMsg.h" +#include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.cpp index f8e74a8f..ec3071fe 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include "../../pyKey.h" +#pragma hdrstop + #include "pyHeekGame.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h index ebd6073c..8db63168 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h @@ -49,12 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the Heek game client // -#include -#include "pfGameMgr/pfGameMgr.h" - #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" -#include "../../pyKey.h" class pyHeekGame : public pyGameCli { diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGameGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGameGlue.cpp index 3dd23419..604c18f9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGameGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGameGlue.cpp @@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyHeekGame.h" #include +#include "../../pyKey.h" +#pragma hdrstop + +#include "pyHeekGame.h" #include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.cpp index 97a87323..36f6619e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyHeekMsg.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h index f87cc1d1..589e77ae 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h @@ -48,9 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for Heek game messages // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsgGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsgGlue.cpp index cfe078c4..060a75df 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsgGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsgGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyHeekMsg.h" -#include "../../pyEnum.h" #include +#pragma hdrstop + +#include "pyHeekMsg.h" +#include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.cpp index e56c106b..f715fd47 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.cpp @@ -39,7 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "../../pyKey.h" +#pragma hdrstop + #include "pyMarkerGame.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h index 2f02005f..f86173f5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h @@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for the Marker game client // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" -#include "../../pyKey.h" class pyMarkerGame : public pyGameCli { diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGameGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGameGlue.cpp index 7f7fd702..4b321bc4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGameGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGameGlue.cpp @@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyMarkerGame.h" #include +#include "../../pyKey.h" +#pragma hdrstop + +#include "pyMarkerGame.h" #include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.cpp index fc8f5713..48bc2819 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyMarkerMsg.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h index 8671dbb5..b2ce74ca 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h @@ -48,9 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for Marker game messages // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsgGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsgGlue.cpp index e7846d8c..3a935929 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsgGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsgGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyMarkerMsg.h" -#include "../../pyEnum.h" #include +#pragma hdrstop + +#include "pyMarkerMsg.h" +#include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.cpp index 003c852c..97f290e2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include "../../pyKey.h" +#pragma hdrstop + #include "pyTTTGame.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h index 40653dc7..740859b0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h @@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for the TTT game client // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" -#include "../../pyKey.h" class pyTTTGame : public pyGameCli { diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGameGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGameGlue.cpp index 74ad5b98..4be01e71 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGameGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGameGlue.cpp @@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyTTTGame.h" #include +#include "../../pyKey.h" +#pragma hdrstop + +#include "pyTTTGame.h" #include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.cpp index 19dd92ea..f231a3dd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyTTTMsg.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h index 2f512fca..94a9df26 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h @@ -48,9 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for TTT game messages // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsgGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsgGlue.cpp index 15736964..31d5db2f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsgGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsgGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyTTTMsg.h" -#include "../../pyEnum.h" #include +#pragma hdrstop + +#include "pyTTTMsg.h" +#include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.cpp index 03c707b4..8728bf58 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include "../../pyKey.h" +#pragma hdrstop + #include "pyVarSyncGame.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h index a5b25fc3..b83e543c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h @@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for the VarSync game client // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" -#include "../../pyKey.h" class pyVarSyncGame : public pyGameCli { diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGameGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGameGlue.cpp index d0bc4080..5434e55a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGameGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGameGlue.cpp @@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyVarSyncGame.h" #include +#include "../../pyKey.h" +#pragma hdrstop + +#include "pyVarSyncGame.h" #include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.cpp index 38482c9e..29e4a3c7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyVarSyncMsg.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h index 8c173e48..481ff126 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h @@ -48,9 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for VarSync game messages // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsgGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsgGlue.cpp index 61bc9ccd..ea1169bd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsgGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsgGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyVarSyncMsg.h" -#include "../../pyEnum.h" #include +#pragma hdrstop + +#include "pyVarSyncMsg.h" +#include "../../pyEnum.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp index 2eff51e3..b810777f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp @@ -39,7 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "../pyKey.h" +#pragma hdrstop + #include "pyGameCli.h" +#include "pfGameMgr/pfGameMgr.h" #include "TicTacToe/pyTTTGame.h" #include "Heek/pyHeekGame.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h index 51d53684..b3f4999c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h @@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for the game client base class // -#include -#include "pfGameMgr/pfGameMgr.h" - #include "../pyGlueHelpers.h" -#include "../pyKey.h" +#include +#include + +class pfGameCli; class pyGameCli { diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp index c71a73bd..9cb7e7d0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGameCli.h" -#include "../pyEnum.h" #include +#include "../pyKey.h" +#pragma hdrstop + +#include "pyGameCli.h" +#include "../pyEnum.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp index c840e939..53c0f2aa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp @@ -39,9 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyGameCliMsg.h" #include "pyGameCli.h" +#include "pfGameMgr/pfGameMgr.h" #include "TicTacToe/pyTTTMsg.h" #include "Heek/pyHeekMsg.h" #include "Marker/pyMarkerMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h index 4b5ec2ce..83ee4414 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h @@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for game client messages // -#include - -#include "pfGameMgr/pfGameMgr.h" #include "../pyGlueHelpers.h" +#include "pnGameMgr/pnGameMgr.h" // :( + +class pfGameCliMsg; class pyGameCliMsg { diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsgGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsgGlue.cpp index 6a43b682..09ff8245 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsgGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsgGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGameCliMsg.h" -#include "../pyEnum.h" #include +#pragma hdrstop + +#include "pfGameMgr/pfGameMgr.h" +#include "pyGameCliMsg.h" +#include "../pyEnum.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp index 3dcf50e9..67d2fc81 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp @@ -39,7 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyGameMgrMsg.h" +#include "pfGameMgr/pfGameMgr.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h index 5906df9d..288eb117 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h @@ -49,11 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for game manager messages // -#include -#include "hsStlUtils.h" -#include "pfGameMgr/pfGameMgr.h" - #include "../pyGlueHelpers.h" +#include + +class pfGameMgrMsg; class pyGameMgrMsg { diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsgGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsgGlue.cpp index bb19326b..fd0ade26 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsgGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsgGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGameMgrMsg.h" -#include "../pyEnum.h" #include +#pragma hdrstop + +#include "pyGameMgrMsg.h" +#include "pfGameMgr/pfGameMgr.h" +#include "../pyEnum.h" /////////////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/Pch.cpp b/Sources/Plasma/FeatureLib/pfPython/Pch.cpp new file mode 100644 index 00000000..e0496da4 --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfPython/Pch.cpp @@ -0,0 +1,43 @@ +/*==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==*/ + +#include "Pch.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Pch.h b/Sources/Plasma/FeatureLib/pfPython/Pch.h new file mode 100644 index 00000000..4a41f08b --- /dev/null +++ b/Sources/Plasma/FeatureLib/pfPython/Pch.h @@ -0,0 +1,91 @@ +/*==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 _pfPython_Pch_inc_ +#define _pfPython_Pch_inc_ + +/** + * \file Pch.h + * \brief Precompiled Header for pfPython + */ + +// Standard Library Includes +#include +#include +#include + +// Platform Library Includes +#include +#include +#include + +// Python Library Includes +#include +#include +#include + +// Plasma Components (except for those from pfPython) +// You'll want to strike a careful balance between enough components and slow iteration +#include "HeadSpin.h" +#include "hsGeometry3.h" +#include "hsQuat.h" +#include "hsResMgr.h" +#include "hsStlSortUtils.h" +#include "hsStlUtils.h" +#include "hsStream.h" +#include "hsTemplates.h" +#include "hsTimer.h" +#include "plAudible.h" +#include "plgDispatch.h" +#include "plPhysical.h" +#include "plPipeline.h" +#include "plString.h" +#include "pnKeyedObject/plKey.h" + +// pfPython Components +// Be very careful to include only isolated components here +#include "pyGeometry3.h" +#include "pyGlueHelpers.h" +#include "pyKey.h" +#include "pyMatrix44.h" + +#endif diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp index 738dca11..f8d42fdf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp @@ -46,8 +46,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Python wrapper for account management functions // -#include "cyAccountManagement.h" +#include +#pragma hdrstop +#include "cyAccountManagement.h" #include "plNetClientComm/plNetClientComm.h" bool cyAccountManagement::IsSubscriptionActive() diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h index fbc87968..4d41ae55 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h @@ -49,9 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Python wrapper for account management functions // -#include -#include "HeadSpin.h" -#include "hsStlUtils.h" +#include + +typedef struct _object PyObject; +typedef struct PyMethodDef PyMethodDef; class cyAccountManagement { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp index a3deab97..d52dc8fc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagementGlue.cpp @@ -39,8 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyAccountManagement.h" +#include +#pragma hdrstop + +#include "cyAccountManagement.h" #include "pyGlueHelpers.h" #include "pyEnum.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp index 56498b9c..277521ae 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp @@ -46,8 +46,12 @@ 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 #include "plgDispatch.h" +#include "pyKey.h" +#pragma hdrstop + +#include "cyAnimation.h" #include "plMessage/plAnimCmdMsg.h" #include "pnMessage/plEventCallbackMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h index d0ce9fb5..8e8afe92 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h @@ -48,11 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper to map animation functions to plasma2 message // -#include -#include "pyKey.h" #include "hsTemplates.h" - #include "pyGlueHelpers.h" class cyAnimation diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAnimationGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAnimationGlue.cpp index 0d7e8def..31c40e7b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAnimationGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAnimationGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyAnimation.h" - #include +#include "pyKey.h" +#pragma hdrstop + +#include "cyAnimation.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 252040f7..c69f1acf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp @@ -39,12 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyAvatar.h" - +#include #include "plgDispatch.h" -#include "plAvatar/plAvatarMgr.h" +#include "pyKey.h" +#include "plPhysical.h" +#pragma hdrstop + +#include "cyAvatar.h" +#include "plAvatar/plAvatarMgr.h" #include "plMessage/plAvatarMsg.h" #include "plMessage/plLinkToAgeMsg.h" #include "plMessage/plOneShotCallbacks.h" @@ -53,12 +57,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnMessage/plNotifyMsg.h" #include "pnKeyedObject/plFixedKey.h" #include "plGImage/plMipmap.h" -#include "pyKey.h" #include "pySceneObject.h" #include "pyColor.h" #include "pyImage.h" -#include "cyPythonInterface.h" -#include "cyMisc.h" #include "plAvatar/plOneShotMod.h" #include "plAvatar/plMultistageBehMod.h" @@ -68,10 +69,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatar/plAvBrainHuman.h" // needed to call the emote #include "plAvatar/plAGAnim.h" // to get the BodyUsage enum #include "plInputCore/plAvatarInputInterface.h" -#include "plPhysical.h" #include "plMessage/plSimStateMsg.h" -#include "pnNetCommon/plNetApp.h" #include "plVault/plVault.h" #include "plDrawable/plSharedMesh.h" @@ -79,6 +78,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnSceneObject/plSceneObject.h" #include "pnSceneObject/plCoordinateInterface.h" #include "plDrawable/plMorphSequence.h" +#include "pnNetCommon/plNetApp.h" /////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h index db666f3d..5f02686d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h @@ -48,17 +48,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper to map animation functions to plasma2 message // -#include #include "hsStlUtils.h" #include "hsTemplates.h" -#include "hsBitVector.h" #include "pnKeyedObject/plKey.h" #include "pyGlueHelpers.h" -class plKey; -class pyKey; class pySceneObject; class pyColor; class plMipmap; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp index 498424a0..ac8c1e18 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp @@ -39,16 +39,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyAvatar.h" + +#include #include "pyKey.h" -#include "pyEnum.h" +#pragma hdrstop + +#include "cyAvatar.h" #include "pyColor.h" +#include "pyEnum.h" #include "pySceneObject.h" #include "plAvatar/plAvBrainHuman.h" -#include - // glue functions PYTHON_CLASS_DEFINITION(ptAvatar, cyAvatar); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp b/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp index 7b198cb8..2df57fe9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyCamera.cpp @@ -39,15 +39,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "plgDispatch.h" +#include "pyKey.h" +#include "hsResMgr.h" +#pragma hdrstop + #include "cyCamera.h" #include "pnMessage/plCameraMsg.h" #include "plMessage/plInputEventMsg.h" #include "pnKeyedObject/plFixedKey.h" #include "pnKeyedObject/plUoid.h" -#include "hsResMgr.h" -#include "pyKey.h" -#include "plgDispatch.h" #include "pfCamera/plVirtualCamNeu.h" #include "pfCamera/plCameraModifier.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCamera.h b/Sources/Plasma/FeatureLib/pfPython/cyCamera.h index 6c438c4e..f8098824 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCamera.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyCamera.h @@ -48,13 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper to map camera functions to plasma2 message // -#include -#include "HeadSpin.h" - -#include "pnKeyedObject/plKey.h" -class pyKey; +#include "HeadSpin.h" #include "pyGlueHelpers.h" +#include "pnKeyedObject/plKey.h" class cyCamera { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCameraGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyCameraGlue.cpp index 7573bf5e..9ac76bd7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCameraGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyCameraGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyCamera.h" -#include "pyKey.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "cyCamera.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 c1eb50f4..9af722ff 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyDraw.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyDraw.h" +#include #include "plgDispatch.h" -#include "hsBitVector.h" +#pragma hdrstop + +#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 fb0dfb4f..0dca4ddc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDraw.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyDraw.h @@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper to map draw functions to plasma2 message // -#include #include "hsTemplates.h" #include "pnKeyedObject/plKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp index 93daa9a4..f631eaab 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyDraw.h" -#include "pyKey.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "cyDraw.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 d98d5856..cf513412 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.cpp @@ -39,11 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyInputInterface.h" +#include +#include "plgDispatch.h" +#pragma hdrstop + +#include "cyInputInterface.h" #include "plMessage/plInputIfaceMgrMsg.h" #include "plInputCore/plTelescopeInputInterface.h" -#include "plgDispatch.h" cyInputInterface::cyInputInterface() : fTelescopeInterface(nil) diff --git a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.h b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.h index a1afa81b..b7948125 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyInputInterface.h @@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper to map InputInterface functions to plasma2 message // -#include #include "pyGlueHelpers.h" class plInputInterface; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp index 9d5ed431..63a1c5eb 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp @@ -39,9 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include +#pragma hdrstop + #include "cyInputInterface.h" -#include "HeadSpin.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 613662e6..76484250 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp @@ -39,12 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyMisc.h" +#include #include "plgDispatch.h" -#include "hsResMgr.h" -#include "plResMgr/plKeyFinder.h" +#include "pyKey.h" +#pragma hdrstop +#include "cyMisc.h" + +#include "plResMgr/plKeyFinder.h" #include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plFixedKey.h" #include "plMessage/plLinkToAgeMsg.h" @@ -72,7 +75,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAvatar/plAvBrainCritter.h" #include "pyCritterBrain.h" #include "cyPythonInterface.h" -#include "pyKey.h" #include "pySceneObject.h" #include "pyPlayer.h" #include "pyImage.h" @@ -106,6 +108,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plVault/plAgeInfoSource.h" #include "pfLocalizationMgr/pfLocalizationMgr.h" +#include "pnUtils/pnUtils.h" //// Static Class Stuff ////////////////////////////////////////////////////// plPipeline* cyMisc::fPipeline = nil; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.h b/Sources/Plasma/FeatureLib/pfPython/cyMisc.h index 4cc5385d..e7b388b4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.h @@ -57,15 +57,17 @@ class pyColor; class pyAgeInfoStruct; class pyPoint3; -#include #include "HeadSpin.h" -#include "hsStlUtils.h" -#include "pnUtils/pnUtils.h" +#include class pyGUIDialog; class plPipeline; class plDisplayMode; struct PipelineParams; +struct Uuid; + +typedef struct _object PyObject; +typedef struct PyMethodDef PyMethodDef; class cyMisc { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp index 35fd9c05..8fcf12f4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp @@ -39,15 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyKey.h" +#pragma hdrstop + #include "cyMisc.h" #include "pyGlueHelpers.h" -#include "pyKey.h" #include "pyPlayer.h" - -#include - PYTHON_BASIC_GLOBAL_METHOD_DEFINITION(PtFlashWindow, cyMisc::FlashWindow, "Flashes the client window if it is not focused"); PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtGetAgeName, "DEPRECIATED - use ptDniInfoSource instead") diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp index 34bc8efa..53baabf8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include +#include "pyKey.h" +#pragma hdrstop + #include "cyMisc.h" #include "pyGlueHelpers.h" -#include "pyKey.h" #include "pyColor.h" #include "pyPlayer.h" #include "pyEnum.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp index 1c85c139..689302b0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp @@ -39,12 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyKey.h" +#pragma hdrstop + #include "cyMisc.h" #include "pyGlueHelpers.h" -#include "pyKey.h" #include "pySceneObject.h" - -#include +#include "pnUtils/pnUtils.h" PYTHON_GLOBAL_METHOD_DEFINITION(PtSendPetitionToCCR, args, "Params: message,reason=0,title=\"\"\nSends a petition with a message to the CCR group") { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp index 561af055..c77a8d0e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp @@ -39,16 +39,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyGeometry3.h" +#include "pyKey.h" +#include "plPipeline.h" +#pragma hdrstop + #include "cyMisc.h" #include "pyGlueHelpers.h" -#include "pyKey.h" #include "pySceneObject.h" #include "pyAgeInfoStruct.h" -#include "pyGeometry3.h" -#include "NucleusLib/inc/plPipeline.h" #include "pnNetBase/pnNetBase.h" - -#include +#include "pnUtils/pnUtils.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 cdf617dd..e115cc34 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.cpp @@ -39,12 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyParticleSys.h" -#include "hsStream.h" -#include "pnMessage/plMessage.h" -#include "hsResMgr.h" #include "plgDispatch.h" +#pragma hdrstop + +#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 60f3a7f7..8ef1c71f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h @@ -48,12 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper to for Particle System // -#include -#include "hsTemplates.h" +#include "hsTemplates.h" #include "pnKeyedObject/plKey.h" -class pyKey; - #include "pyGlueHelpers.h" class cyParticleSys @@ -63,7 +60,7 @@ protected: hsTArray fRecvr; hsBool fNetForce; - virtual void ISendParticleSysMsg(uint32_t param, float value); + void ISendParticleSysMsg(uint32_t param, float value); cyParticleSys(const plKey sender=nil,const plKey recvr=nil); @@ -77,22 +74,22 @@ public: static void AddPlasmaClasses(PyObject *m); // setters - virtual void SetSender(plKey &sender); - virtual void AddRecvr(plKey &recvr); - virtual void SetNetForce(hsBool state); - - virtual void SetParticlesPerSecond(float value); - virtual void SetInitPitchRange(float value); - virtual void SetInitYawRange(float value); - virtual void SetVelMin(float value); - virtual void SetVelMax(float value); - virtual void SetXSize(float value); - virtual void SetYSize(float value); - virtual void SetScaleMin(float value); - virtual void SetScaleMax(float value); - virtual void SetGenLife(float value); - virtual void SetPartLifeMin(float value); - virtual void SetPartLifeMax(float value); + void SetSender(plKey &sender); + void AddRecvr(plKey &recvr); + void SetNetForce(hsBool state); + + void SetParticlesPerSecond(float value); + void SetInitPitchRange(float value); + void SetInitYawRange(float value); + void SetVelMin(float value); + void SetVelMax(float value); + void SetXSize(float value); + void SetYSize(float value); + void SetScaleMin(float value); + void SetScaleMax(float value); + void SetGenLife(float value); + void SetPartLifeMin(float value); + void SetPartLifeMax(float value); }; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp index de65bbc9..afc0707a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyParticleSys.h" -#include "pyKey.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "cyParticleSys.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 f0181543..3790570c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.cpp @@ -39,9 +39,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyPhysics.h" +#include #include "plgDispatch.h" +#include "pyGeometry3.h" +#include "pnKeyedObject/plKey.h" +#include "pyKey.h" +#include "hsQuat.h" +#include "pyMatrix44.h" +#pragma hdrstop + +#include "cyPhysics.h" + #include "pnMessage/plEnableMsg.h" #include "pnMessage/plWarpMsg.h" #include "plMessage/plSimInfluenceMsg.h" @@ -49,13 +58,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plMessage/plLinearVelocityMsg.h" #include "plMessage/plAngularVelocityMsg.h" -#include "pyGeometry3.h" -#include "pyMatrix44.h" -#include "pyKey.h" -#include "hsQuat.h" #include "pnSceneObject/plSceneObject.h" #include "pnSceneObject/plCoordinateInterface.h" -#include "pnKeyedObject/plKey.h" cyPhysics::cyPhysics(plKey sender, plKey recvr) { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h index c953ee63..6a511779 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h @@ -48,17 +48,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper to map animation functions to plasma2 message // -#include #include "hsTemplates.h" #include "pnKeyedObject/plKey.h" - #include "pyGlueHelpers.h" class pyPoint3; class pyVector3; class pyMatrix44; -class pyKey; class cyPhysics { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp index ac0b7f0c..b4b18117 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp @@ -39,12 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "cyPhysics.h" -#include "pyKey.h" + +#include #include "pyGeometry3.h" +#include "pyKey.h" #include "pyMatrix44.h" +#pragma hdrstop -#include +#include "cyPhysics.h" // glue functions PYTHON_CLASS_DEFINITION(ptPhysics, cyPhysics); diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp index 045eaee8..1aba52bf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp @@ -46,25 +46,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // NOTE: Eventually, this will be made into a separate dll, because there should // only be one instance of this interface. // + +#include +#include +#include "pyGeometry3.h" +#include "pyKey.h" +#include "pyMatrix44.h" +#pragma hdrstop + #include "cyPythonInterface.h" #include "plPythonPack.h" -#include "compile.h" -#include "marshal.h" -#include "eval.h" - #include "pyEnum.h" - -#include "pyKey.h" #include "cyDraw.h" +#include "cyParticleSys.h" #include "cyPhysics.h" #include "pySceneObject.h" #include "cyMisc.h" #include "cyCamera.h" #include "pyNotify.h" #include "cyAvatar.h" -#include "pyGeometry3.h" -#include "pyMatrix44.h" #include "pyColor.h" #include "pyDynamicText.h" #include "cyAnimation.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h index 9e16611e..16defbd2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h @@ -46,7 +46,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // NOTE: Eventually, this will be made into a separate dll, because there should // only be one instance of this interface. // -#include #include "HeadSpin.h" #include "hsStlUtils.h" @@ -56,6 +55,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com class plStatusLog; class pyKey; +typedef struct _object PyObject; +typedef struct PyMethodDef PyMethodDef; class PythonInterface { diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp index 6e4438eb..cf299dd0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp @@ -46,12 +46,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // This modifier will handle the interface to python code that has been file-ized. // ////////////////////////////////////////////////////////////////////////// -#include "plPythonFileMod.h" +#include +#include #include "HeadSpin.h" -#include "hsStream.h" #include "plgDispatch.h" +#include "pyGeometry3.h" +#include "pyKey.h" #include "hsResMgr.h" +#include "hsStream.h" +#pragma hdrstop + +#include "plPythonFileMod.h" + #include "plResMgr/plKeyFinder.h" #include "pnKeyedObject/plKeyImp.h" #include "pnKeyedObject/plUoid.h" @@ -100,7 +107,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plProfile.h" #include "cyPythonInterface.h" -#include "pyKey.h" #include "cyDraw.h" #include "cyPhysics.h" #include "pySceneObject.h" @@ -108,7 +114,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "cyCamera.h" #include "pyNotify.h" #include "cyAvatar.h" -#include "pyGeometry3.h" #include "pyVault.h" #include "pyVaultNode.h" #include "pyVaultNodeRef.h" @@ -139,8 +144,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "Games/pyGameCliMsg.h" #include "pyGameScoreMsg.h" -#include - #include "plPythonSDLModifier.h" #include "plMessage/plTimerCallbackMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h index bb7ed26d..4f05bf97 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h @@ -49,13 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // This modifier will handle the interface to python code that has been file-ized. // ////////////////////////////////////////////////////////////////////// -#include #include "pnModifier/plMultiModifier.h" -#include "hsGeometry3.h" -#include "hsResMgr.h" - - #include "plPythonParameter.h" class PythonVaultCallback; @@ -65,6 +60,8 @@ class pfPythonKeyCatcher; class plKeyEventMsg; class plPipeline; +typedef struct _object PyObject; + class plPythonFileMod : public plMultiModifier { protected: diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp index f672fbb4..4a3ff88d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp @@ -39,15 +39,24 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "plPythonPack.h" + +#include +#include +#include +#include +#include + #include "HeadSpin.h" #include "hsStlUtils.h" #include "hsStream.h" +#include "hsStlSortUtils.h" +#pragma hdrstop + +#include "plPythonPack.h" + #include "plFile/hsFiles.h" #include "plFile/plSecureStream.h" #include "plFile/plStreamSource.h" -#include "hsStlSortUtils.h" -#include "marshal.h" static const char* kPackFilePath = ".\\Python\\"; @@ -105,10 +114,6 @@ plPythonPack& plPythonPack::Instance() return theInstance; } -#include -#include -#include - bool plPythonPack::Open() { if (fPackStreams.size() > 0) diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.h b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.h index 9a35c547..ec67a4b0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.h @@ -42,8 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPythonPack_h_inc #define plPythonPack_h_inc -#include -#include "HeadSpin.h" +typedef struct _object PyObject; namespace PythonPack { diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h b/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h index e22febc8..58650f68 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonParameter.h @@ -43,6 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plPythonParameter_h_inc #include "pnKeyedObject/plKey.h" +#include "hsResMgr.h" // // This is the data for the parameters (or attributes) for the PythonFile components diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp index 058ada79..fcd32646 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp @@ -39,11 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyKey.h" +#pragma hdrstop + #include "plPythonSDLModifier.h" #include "cyPythonInterface.h" #include "plPythonFileMod.h" -#include "pyKey.h" #include "cyMisc.h" #include "pnSceneObject/plSceneObject.h" @@ -51,7 +55,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAgeDescription/plAgeDescription.h" #include "plSDL/plSDL.h" -#include "pnNetCommon/plNetApp.h" #include "plNetClient/plNetClientMgr.h" plStateDataRecord * GetAgeSDL() diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h index 604d0ae8..765e1969 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h @@ -46,9 +46,6 @@ class plPythonFileMod; class plStateDataRecord; class plSimpleStateVariable; -#include - -#include "HeadSpin.h" #include "hsStlUtils.h" #include "plModifier/plSDLModifier.h" @@ -58,7 +55,6 @@ class plSimpleStateVariable; // hack for plNetClientVNodeMgr single-player mode SDLHook stuff. plStateDataRecord * GetAgeSDL(); -class pyKey; // // The fields of a SDL record in Python format. // If the Python code changes a value an update is sent automatically diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifierGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifierGlue.cpp index f7370f44..be102ee1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifierGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifierGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "plPythonSDLModifier.h" -#include "pyKey.h" #include +#include "pyKey.h" +#pragma hdrstop + +#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 43f5805e..4e76ff5c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp @@ -39,8 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyAgeInfoStruct.h" -#include "hsStlUtils.h" #include "pnUtils/pnUtCrypt.h" #include "pnEncryption/plChecksum.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h index e7a33887..c240675b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h @@ -41,9 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #ifndef pyAgeInfoStruct_h_inc #define pyAgeInfoStruct_h_inc -#include -#include "HeadSpin.h" #include "hsStlUtils.h" #include "plNetCommon/plNetServerSessionInfo.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStructGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStructGlue.cpp index a117c148..1b03f826 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStructGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStructGlue.cpp @@ -39,9 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyAgeInfoStruct.h" #include +#pragma hdrstop + +#include "pyAgeInfoStruct.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 744a89db..af3a66a2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyAgeLinkStruct.h" -#include "hsStlUtils.h" +#include +#pragma hdrstop + +#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 ca6528c0..83a5fd83 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h @@ -42,12 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pyAgeLinkStruct_h_inc #define pyAgeLinkStruct_h_inc -#include -#include "HeadSpin.h" -#include "hsStlUtils.h" #include "plNetCommon/plNetServerSessionInfo.h" -#include "pyAgeInfoStruct.h" - #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// @@ -60,6 +55,7 @@ class pyVaultAgeLinkNode; 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 2c6fc492..5337e463 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStructGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStructGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyAgeLinkStruct.h" -#include "pySpawnPointInfo.h" #include +#pragma hdrstop + +#include "pyAgeLinkStruct.h" +#include "pyAgeInfoStruct.h" +#include "pySpawnPointInfo.h" // glue functions PYTHON_CLASS_DEFINITION(ptAgeLinkStruct, pyAgeLinkStruct); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp index 64f429e7..6f41e6b3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp @@ -45,6 +45,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#include "pnNetCommon/plNetApp.h" +#pragma hdrstop + #include "pyAgeVault.h" #include "pyVault.h" #include "pyVaultNodeRef.h" @@ -66,7 +70,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetTransport/plNetTransport.h" #include "plNetTransport/plNetTransportMember.h" #include "plSDL/plSDL.h" -#include "pnNetCommon/plNetApp.h" pyAgeVault::pyAgeVault() { } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h index 8560c0fa..d2aed275 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h @@ -51,11 +51,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyAgeVault - a wrapper class to provide interface to the plVaultAgeNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" class pyVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp index 5d162d27..1b96dc93 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp @@ -39,12 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyAgeVault.h" #include "pyAgeInfoStruct.h" #include "pySDL.h" -#include - // glue functions PYTHON_CLASS_DEFINITION(ptAgeVault, pyAgeVault); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAlarm.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAlarm.cpp index 27d14185..bf2dd91e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAlarm.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAlarm.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyAlarm.h" + +#include #include "hsTimer.h" -#include "hsStlUtils.h" +#pragma hdrstop + +#include "pyAlarm.h" //////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAlarm.h b/Sources/Plasma/FeatureLib/pfPython/pyAlarm.h index 0f86310c..c8df4486 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAlarm.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAlarm.h @@ -42,11 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pyAlarm_h_inc #define pyAlarm_h_inc -#include #include "HeadSpin.h" -#include "hsStlUtils.h" +#include struct pyAlarm; +typedef struct _object PyObject; class pyAlarmMgr { typedef std::list Alarms; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp index 92c70f0f..f812553c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.cpp @@ -45,6 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#pragma hdrstop + #include "pyAudioControl.h" #include "plAudio/plAudioSystem.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h index 382a2851..025bfd56 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h @@ -48,9 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" - #include "pyGlueHelpers.h" class pyAudioControl diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAudioControlGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAudioControlGlue.cpp index 56d5adba..f8f7e6e4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAudioControlGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAudioControlGlue.cpp @@ -39,9 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyAudioControl.h" #include +#pragma hdrstop + +#include "pyAudioControl.h" // glue functions PYTHON_CLASS_DEFINITION(ptAudioControl, pyAudioControl); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.cpp index d197cffa..e8b74063 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.cpp @@ -45,5 +45,5 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// - +#pragma hdrstop #include "pfCCR/plCCRMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp index cca82970..b26d582e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp @@ -39,7 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include +#pragma hdrstop + #include "pyCCRMgr.h" #include "pyAgeLinkStruct.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp index 2dc8cdc8..a554abf0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp @@ -39,6 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include +#pragma hdrstop + #include "pyCCRMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp index fec916b7..6b9dba37 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCluster.cpp @@ -39,6 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include "pyKey.h" +#pragma hdrstop + #include "pyCluster.h" #include "plDrawable/plClusterGroup.h" @@ -61,3 +65,8 @@ void pyCluster::SetVisible(bool visible) clusterGroup->SetVisible(visible); } } + +void pyCluster::SetKey(pyKey& key) +{ + fClusterKey = key.getKey(); +} diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCluster.h b/Sources/Plasma/FeatureLib/pfPython/pyCluster.h index 311e82a2..728453b8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCluster.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyCluster.h @@ -42,9 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pyCluster_h #define pyCluster_h -#include -#include "pyKey.h" - +#include "pnKeyedObject/plKey.h" #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// @@ -73,7 +71,7 @@ public: static void AddPlasmaClasses(PyObject *m); - void SetKey(pyKey& key) {fClusterKey = key.getKey();} // for python glue only, do NOT call + void SetKey(pyKey& key); // for python glue only, do NOT call void SetVisible(bool visible); }; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyClusterGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyClusterGlue.cpp index 49149722..a55649ea 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyClusterGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyClusterGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyCluster.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyCluster.h" // glue functions PYTHON_CLASS_DEFINITION(ptCluster, pyCluster); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyColor.cpp b/Sources/Plasma/FeatureLib/pfPython/pyColor.cpp index 06f68e84..71914819 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyColor.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyColor.cpp @@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#pragma hdrstop #include "pyColor.h" pyColor::pyColor(float r, float g, float b, float a) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyColor.h b/Sources/Plasma/FeatureLib/pfPython/pyColor.h index 4452e0c2..debcc12f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyColor.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyColor.h @@ -47,7 +47,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyColor - the wrapper class for hsColorRGBA structure // ////////////////////////////////////////////////////////////////////// -#include #include "hsColorRGBA.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyColorGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyColorGlue.cpp index 9c95fe1a..2124a73b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyColorGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyColorGlue.cpp @@ -39,9 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyColor.h" #include +#pragma hdrstop + +#include "pyColor.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 3ac6a550..9f6103b2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.cpp @@ -39,8 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyCritterBrain.h" + +#include #include "pyGeometry3.h" +#include "pyKey.h" +#pragma hdrstop + +#include "pyCritterBrain.h" #include "pySceneObject.h" #include "plAvatar/plAvBrainCritter.h" @@ -48,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com pyCritterBrain::pyCritterBrain(): fBrain(nil) {} -hsBool pyCritterBrain::operator==(const pyCritterBrain& other) const +bool pyCritterBrain::operator==(const pyCritterBrain& other) const { // pointer compare return fBrain == other.fBrain; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.h b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.h index d6566b26..ecd0fe46 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.h @@ -42,15 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pyCritterBrain_h_ #define _pyCritterBrain_h_ -#include #include "pyGlueHelpers.h" - -#include "pyKey.h" - #include -#include "hsGeometry3.h" class plAvBrainCritter; +struct hsPoint3; // simply here so we can pass our message types on to python class pyAIMsg @@ -77,8 +73,8 @@ public: static void AddPlasmaClasses(PyObject *m); - hsBool operator==(const pyCritterBrain& other) const; - hsBool operator!=(const pyCritterBrain& other) const {return !(*this == other);} + bool operator==(const pyCritterBrain& other) const; + bool operator!=(const pyCritterBrain& other) const {return !(*this == other);} void AddReceiver(pyKey& newReceiver); void RemoveReceiver(pyKey& oldReceiver); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp index 8bf16494..d18eabcc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp @@ -39,14 +39,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyGeometry3.h" +#include "pyKey.h" +#pragma hdrstop + #include "pyCritterBrain.h" #include "pyEnum.h" -#include "pyGeometry3.h" #include "plMessage/plAIMsg.h" -#include - /////////////////////////////////////////////////////////////////////////////// // // AddPlasmaConstantsClasses diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp index c3f30e19..3406ffdb 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.cpp @@ -39,6 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "hsGeometry3.h" +#pragma hdrstop + #include "pyDniCoordinates.h" #include "plVault/plDniCoordinateInfo.h" #ifndef BUILDING_PYPLASMA diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h index 4370a2d6..c0e85ea1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h @@ -48,13 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include -#include "HeadSpin.h" -#include "hsGeometry3.h" - #include "pyGlueHelpers.h" class plDniCoordinateInfo; +struct hsPoint3; class pyDniCoordinates { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp index 96dcea77..2ebdb7a5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp @@ -39,11 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyDniCoordinates.h" -#include "pyGeometry3.h" -#include "plVault/plDniCoordinateInfo.h" #include +#include "pyGeometry3.h" +#pragma hdrstop + +#include "pyDniCoordinates.h" +#include "plVault/plDniCoordinateInfo.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 4fbd03ca..c3a2bc1f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp @@ -39,6 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyDniInfoSource.h" #include "pnUtils/pnUtils.h" #include "plUnifiedTime/plUnifiedTime.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h index e22a31f3..a716aec4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h @@ -41,11 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #ifndef pyDniInfoSource_h_inc #define pyDniInfoSource_h_inc -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" class pyDniCoordinates; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSourceGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSourceGlue.cpp index 34604643..e36b77c0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSourceGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSourceGlue.cpp @@ -39,9 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyDniInfoSource.h" #include +#pragma hdrstop + +#include "pyDniInfoSource.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 9c9ec3c8..75845fe6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.cpp @@ -45,17 +45,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyDrawControl.h" - #include "plgDispatch.h" #include "hsResMgr.h" +#pragma hdrstop - +#include "pyDrawControl.h" #ifndef BUILDING_PYPLASMA -#include "plMessage/plInputEventMsg.h" -#include "pnMessage/plClientMsg.h" -#include "plInputCore/plInputDevice.h" -#include "plAvatar/plArmatureMod.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 void pyDrawControl::SetGamma2(float gamma) @@ -74,7 +75,7 @@ void pyDrawControl::SetGamma2(float gamma) } #ifndef BUILDING_PYPLASMA -#include "plGLight/plShadowMaster.h" + #endif void pyDrawControl::SetShadowVisDistance(float distance) @@ -93,10 +94,6 @@ float pyDrawControl::GetShadowVisDistance() #endif } -#ifndef BUILDING_PYPLASMA -#include "plGLight/plShadowCaster.h" -#endif - void pyDrawControl::EnableShadows() { #ifndef BUILDING_PYPLASMA diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h index 18b535a6..61ea2b07 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h @@ -47,13 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyDrawControl - a wrapper class all the draw/pipeline control functions // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - - #include "pyGlueHelpers.h" +#include class pyDrawControl { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDrawControlGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDrawControlGlue.cpp index 93c10f7c..932b655a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDrawControlGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDrawControlGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyDrawControl.h" -#include "pyEnum.h" #include +#pragma hdrstop + +#include "pyDrawControl.h" +#include "pyEnum.h" PYTHON_GLOBAL_METHOD_DEFINITION(PtSetGamma2, args, "Params: gamma\nSet the gamma with gamma2 rules") { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp index 3ad7aa99..8cc14fad 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp @@ -46,11 +46,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // ////////////////////////////////////////////////////////////////////////////// -#include "pyDynamicText.h" +#include #include "plgDispatch.h" -#include "plMessage/plDynamicTextMsg.h" #include "pyKey.h" -#include "plPythonFileMod.h" +#pragma hdrstop + +#include "pyDynamicText.h" +#include "plMessage/plDynamicTextMsg.h" #include "pyColor.h" #include "pyImage.h" #include "plGImage/plDynamicTextMap.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h index 665f495c..7c9757dd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h @@ -49,17 +49,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// class plDynamicTextMsg; -class pyKey; class pyColor; class pyImage; -#include -#include "hsTemplates.h" -#include "hsStlUtils.h" -#include "hsResMgr.h" - #include "pyGlueHelpers.h" - +#include "pnKeyedObject/plKey.h" +#include +#include "hsTemplates.h" class pyDynamicText { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp index 83c42c49..ab7319b1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp @@ -39,15 +39,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include #include "pyKey.h" +#pragma hdrstop + #include "pyDynamicText.h" #include "pyEnum.h" #include "pyColor.h" #include "pyImage.h" #include "plGImage/plDynamicTextMap.h" -#include - // glue functions PYTHON_CLASS_DEFINITION(ptDynamicMap, pyDynamicText); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp b/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp index 3d3e3762..99b23128 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp @@ -47,11 +47,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // class // -#include "pyEnum.h" - #include -#include "structmember.h" +#include +#include "hsStlUtils.h" #include "pyGlueHelpers.h" +#pragma hdrstop + +#include "pyEnum.h" struct EnumValue { PyObject_HEAD diff --git a/Sources/Plasma/FeatureLib/pfPython/pyEnum.h b/Sources/Plasma/FeatureLib/pfPython/pyEnum.h index bba0a0aa..f1177b55 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyEnum.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyEnum.h @@ -42,6 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pyEnum_h #define pyEnum_h +#include +#include + +typedef struct _object PyObject; + ///////////////////////////////////////////////////////////////////////////// // // NAME: pyEnum @@ -49,12 +54,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Base class stuff for enumeration support (you don't instance this // class // - -#include -#include "hsStlUtils.h" -#include "pyGlueHelpers.h" - - class pyEnum { public: diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp index 543e2457..fb258da5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp @@ -39,16 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// + +#include +#include "pyKey.h" +#pragma hdrstop + #include "pyGUIControl.h" #include "pfGameGUIMgr/pfGUIControlMod.h" #include "pfGameGUIMgr/pfGUIDialogMod.h" -#include "pyKey.h" #include "pyGUIDialog.h" #include "pyColor.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h index 36be2c94..6cf52cd8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h @@ -49,11 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include -#include "pyKey.h" -#include "pyGeometry3.h" - #include "pyGlueHelpers.h" +#include "pnKeyedObject/plKey.h" class pyGUIDialog; class pyColor; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp index 5150559e..2c37b11b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.cpp @@ -39,12 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// #include "pyKey.h" +#pragma hdrstop #include "pyGUIControlButton.h" #include "pfGameGUIMgr/pfGUIButtonMod.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h index c27b9a25..171ac8d5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h @@ -48,13 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // attached to a GUIControlButton // ////////////////////////////////////////////////////////////////////// -#include -#include "pyKey.h" -#include "pyGeometry3.h" #include "pyGlueHelpers.h" - #include "pyGUIControl.h" class pyGUIControlButton : public pyGUIControl diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp index c7b22b0e..25db9cd6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButtonGlue.cpp @@ -39,11 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlButton.h" -#include "pyEnum.h" -#include "pfGameGUIMgr/pfGUIButtonMod.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pfGameGUIMgr/pfGUIButtonMod.h" + +#include "pyEnum.h" +#include "pyGUIControlButton.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 83405285..f597651e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.cpp @@ -39,12 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUICheckBoxCtrl.h" #include "pfGameGUIMgr/pfGUIDialogMod.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h index 8e13fa7b..4f1f6cd3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h @@ -49,13 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include -#include "pyKey.h" #include "pyGlueHelpers.h" - #include "pyGUIControl.h" +class plKey; class pyGUIControlCheckBox : public pyGUIControl { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBoxGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBoxGlue.cpp index 0d916175..9996d4c3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBoxGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBoxGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlCheckBox.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControlCheckBox.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 31c8e99a..3d2947a9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.cpp @@ -39,12 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// +#include #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUIClickMapCtrl.h" #include "pfGameGUIMgr/pfGUIDialogMod.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h index c27d0502..05691950 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h @@ -49,16 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include -#include "pyKey.h" - #include "pyGlueHelpers.h" - #include "pyGUIControl.h" class pyPoint3; - class pyGUIControlClickMap : public pyGUIControl { protected: diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMapGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMapGlue.cpp index ccb91a34..c08cb633 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMapGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMapGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlClickMap.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControlClickMap.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 391ae8ab..2f8d9be0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.cpp @@ -45,9 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com /////////////////////////////////////////////// #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUIDragBarCtrl.h" - #include "pyGUIControlDragBar.h" pyGUIControlDragBar::pyGUIControlDragBar(pyKey& gckey) : pyGUIControl(gckey) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h index 89b65d56..ac19b56a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h @@ -49,13 +49,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include -#include "pyKey.h" #include "pyGlueHelpers.h" - #include "pyGUIControl.h" +class plKey; +class pyKey; + class pyGUIControlDragBar : public pyGUIControl { protected: diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBarGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBarGlue.cpp index 34496e0c..9521813e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBarGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBarGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlDragBar.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControlDragBar.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 f568bcd9..a2c65627 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.cpp @@ -39,12 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUIDraggableMod.h" #include "pfGameGUIMgr/pfGUIDialogMod.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggableGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggableGlue.cpp index be50c999..a0fb5d97 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggableGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggableGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlDraggable.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControlDraggable.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 35ab6ab6..9feb0346 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.cpp @@ -39,12 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// +#include #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUIDynDisplayCtrl.h" #include "plGImage/plDynamicTextMap.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h index a4f9f2f0..b605540e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h @@ -48,15 +48,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // attached to a GUIControlDynamicText // ////////////////////////////////////////////////////////////////////// -#include -#include "pyKey.h" #include "pyGUIControl.h" - #include "pyGlueHelpers.h" class pyDynamicText; - +class pyKey; +class plKey; class pyGUIControlDynamicText : public pyGUIControl { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicTextGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicTextGlue.cpp index 8b6ced2a..6ba9b182 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicTextGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicTextGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlDynamicText.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControlDynamicText.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 6db5506d..c0faedaf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.cpp @@ -39,12 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// +#include #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUIEditBoxMod.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h index 56c6a495..118812e0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h @@ -48,14 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // attached to a GUIControlEditBox // ////////////////////////////////////////////////////////////////////// -#include - -#include "hsStlUtils.h" -#include "pyKey.h" #include "pyGlueHelpers.h" - #include "pyGUIControl.h" +#include class pyColor; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBoxGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBoxGlue.cpp index 67e1f387..809637d7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBoxGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBoxGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlEditBox.h" -#include "pyColor.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControlEditBox.h" +#include "pyColor.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 9e8f849d..f760d640 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp @@ -39,11 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControl.h" -#include "pyKey.h" -#include "pyGeometry3.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControl.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 083cbc87..ac77ed75 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp @@ -39,12 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// +#include #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUIListBoxMod.h" #include "pfGameGUIMgr/pfGUIListElement.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h index ce813ef8..fb2bc4d1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h @@ -48,15 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // attached to a GUIControl (such as Button, ListBox, etc.) // ////////////////////////////////////////////////////////////////////// -#include #include "hsTemplates.h" - -#include "hsStlUtils.h" -#include "pyKey.h" #include "pyGUIControl.h" - #include "pyGlueHelpers.h" +#include class pyColor; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBoxGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBoxGlue.cpp index cdafecd6..ccaa7cdb 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBoxGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBoxGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlListBox.h" -#include "pyImage.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControlListBox.h" +#include "pyImage.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 8b928671..db110f60 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp @@ -39,12 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// +#include #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h index d0d2799b..e820740a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h @@ -48,11 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // attached to a GUIControlMultiLineEdit // ////////////////////////////////////////////////////////////////////// -#include -#include "pyKey.h" #include "pyGUIControl.h" - #include "pyGlueHelpers.h" class pyColor; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp index deb8b542..d1a6e141 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp @@ -39,12 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyKey.h" +#pragma hdrstop + #include "pyGUIControlMultiLineEdit.h" #include "pyEnum.h" #include "pyColor.h" #include "pfGameGUIMgr/pfGUIMultiLineEditCtrl.h" -#include // glue functions PYTHON_CLASS_DEFINITION(ptGUIControlMultiLineEdit, pyGUIControlMultiLineEdit); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp index 7799c033..b3443e6d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.cpp @@ -39,12 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUIRadioGroupCtrl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroupGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroupGlue.cpp index 41cd5f74..35147450 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroupGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroupGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlRadioGroup.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControlRadioGroup.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 113cd096..28f548e5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp @@ -39,12 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// +#include #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUITextBoxMod.h" #include "pfGameGUIMgr/pfGUIListElement.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h index 1efa3f0c..81e142bf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h @@ -48,15 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // attached to a GUIControlTextBox // ////////////////////////////////////////////////////////////////////// -#include -#include "pyKey.h" #include "pyGUIControl.h" -#include "pfGameGUIMgr/pfGUIControlMod.h" - #include "pyGlueHelpers.h" class pyColor; +class pfGUIColorScheme; class pyGUIControlTextBox : public pyGUIControl { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBoxGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBoxGlue.cpp index bd5d49ff..e96b09bd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBoxGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBoxGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlTextBox.h" -#include "pyColor.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControlTextBox.h" +#include "pyColor.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 8af06942..0dee0aca 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.cpp @@ -39,12 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// #include "pyKey.h" +#pragma hdrstop #include "pfGameGUIMgr/pfGUIValueCtrl.h" #include "pfGameGUIMgr/pfGUIKnobCtrl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.h index 01290ec8..f7917538 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValue.h @@ -49,10 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyKey.h" #include "pyGUIControl.h" - -#include #include "pyGlueHelpers.h" class pyGUIControlValue : public pyGUIControl diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValueGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValueGlue.cpp index 10ae694d..4e21f12a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValueGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlValueGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIControlValue.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUIControlValue.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 71ecf7b6..095d363d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.cpp @@ -39,12 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// +#include #include "pyKey.h" +#pragma hdrstop + #include "pyColor.h" #include "cyPythonInterface.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h index da74181f..1a7d7434 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h @@ -49,12 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include -#include "hsStlUtils.h" -#include "pyKey.h" - #include "pyGlueHelpers.h" - +#include class pyColor; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp index 749c66d5..3b7d9e89 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIDialog.h" #include +#include "pyKey.h" +#pragma hdrstop + +#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 93a186a3..0a0dacb3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.cpp @@ -39,16 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// #include "pyKey.h" +#pragma hdrstop + #include "pyColor.h" -#include "cyPythonInterface.h" #include "pfGameGUIMgr/pfGameGUIMgr.h" +#include "pfGameGUIMgr/pfGUIControlMod.h" #include "pfGameGUIMgr/pfGUIPopUpMenu.h" #include "pyGUIPopUpMenu.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h index c2c5e943..31595765 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h @@ -49,13 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include -#include "pfGameGUIMgr/pfGUIPopUpMenu.h" - -#include "pyKey.h" - +#include "pnKeyedObject/plKey.h" #include "pyGlueHelpers.h" +#include "pnKeyedObject/plUoid.h" +class pfGUIPopUpMenu; class pyColor; class pyGUIPopUpMenu diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenuGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenuGlue.cpp index fac7ba72..af7c2a5f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenuGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenuGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUIPopUpMenu.h" #include +#include "pyKey.h" +#pragma hdrstop + +#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 144e0126..c4151503 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.cpp @@ -39,14 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -////////////////////////////////////////////// -// -// -/////////////////////////////////////////////// #include "pyKey.h" -#include "pyColor.h" -#include "cyPythonInterface.h" +#pragma hdrstop + #include "pfGameGUIMgr/pfGameGUIMgr.h" #include "pfGameGUIMgr/pfGUIPopUpMenu.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.h b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.h index 0f23e377..43d153fc 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUISkin.h @@ -48,8 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyKey.h" -#include +#include "pnKeyedObject/plKey.h" #include "pyGlueHelpers.h" class pyColor; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUISkinGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUISkinGlue.cpp index 86c264b9..41fcdf22 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUISkinGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUISkinGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGUISkin.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGUISkin.h" // glue functions PYTHON_CLASS_DEFINITION(ptGUISkin, pyGUISkin); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp index 50e4c413..06cb591d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include "pyKey.h" +#pragma hdrstop + #include "pyGameScore.h" #include "pfGameScoreMgr/pfGameScoreMgr.h" -#include "pyKey.h" #include "plVault/plVault.h" pyGameScore::pyGameScore() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h index 42becdb4..8fbd64c7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h @@ -49,15 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: a wrapper class to provide access to a game score // -#include #include "HeadSpin.h" -#include "hsStlUtils.h" -#include "plString.h" - #include "pyGlueHelpers.h" class pfGameScore; -class pyKey; class pyGameScore { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp index 6157efaa..d84e31d8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreGlue.cpp @@ -39,10 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyKey.h" +#include "plString.h" +#pragma hdrstop + #include "pyGameScore.h" #include "pyEnum.h" #include "pfGameScoreMgr/pfGameScoreMgr.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 77128aa3..c1c1289a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.cpp @@ -40,7 +40,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include "plString.h" +#pragma hdrstop + #include "pyGameScoreMsg.h" +#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 6fabaf5a..597a0556 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsg.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pyGameScoreMsg_h_ #define _pyGameScoreMsg_h_ -#include "pyGlueHelpers.h" #include "pfMessage/pfGameScoreMsg.h" +#include "pyGlueHelpers.h" class pyGameScoreMsg { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsgGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsgGlue.cpp index 4e5a6c86..b66ca52e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsgGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGameScoreMsgGlue.cpp @@ -40,6 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include +#pragma hdrstop + #include "pyGameScoreMsg.h" // Maybe we need a better exception? Seems to be the best built in one though diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.cpp index 15c60c65..e9353705 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.cpp @@ -39,4 +39,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + #include "pyGeometry3.h" +#pragma hdrstop diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h index a7511020..0b3f32be 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h @@ -47,7 +47,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyGeometry3 - the wrapper class for hsPoint3 and hsVector3 // ////////////////////////////////////////////////////////////////////// -#include #include "hsGeometry3.h" @@ -58,7 +57,7 @@ class pyPoint3 protected: pyPoint3() : fPoint(0,0,0) {} pyPoint3(float x, float y, float z) : fPoint(x,y,z) {} - pyPoint3(hsPoint3 pt) : fPoint(pt.fX,pt.fY,pt.fZ) {} + pyPoint3(const hsPoint3& pt) : fPoint(pt) {} public: // required functions for PyObject interoperability @@ -73,9 +72,9 @@ public: hsPoint3 fPoint; // python get attributes helpers - float getX() { return fPoint.fX; } - float getY() { return fPoint.fY; } - float getZ() { return fPoint.fZ; } + float getX() const { return fPoint.fX; } + float getY() const { return fPoint.fY; } + float getZ() const { return fPoint.fZ; } // python set attributes helpers void setX(float x) { fPoint.fX = x; } @@ -84,9 +83,9 @@ public: // methods to manipulate point3's void Zero() { fPoint.fX=0; fPoint.fY=0; fPoint.fZ=0; } - PyObject* Copy() { return pyPoint3::New(fPoint); } - float Distance(pyPoint3 other) { return hsVector3(&fPoint,&other.fPoint).Magnitude(); } - float DistanceSquared(pyPoint3 other) { return hsVector3(&fPoint,&other.fPoint).MagnitudeSquared(); } + PyObject* Copy() const { return pyPoint3::New(fPoint); } + float Distance(const pyPoint3& other) const { return hsVector3(&fPoint, &other.fPoint).Magnitude(); } + float DistanceSquared(const pyPoint3& other) const { return hsVector3(&fPoint, &other.fPoint).MagnitudeSquared(); } }; @@ -95,7 +94,7 @@ class pyVector3 protected: pyVector3() : fVector(0,0,0) {} pyVector3(float x, float y, float z) : fVector(x,y,z) {} - pyVector3(hsVector3 v) : fVector(v.fX,v.fY,v.fZ) {} + pyVector3(const hsVector3& v) : fVector(v) {} public: // required functions for PyObject interoperability @@ -110,9 +109,9 @@ public: hsVector3 fVector; // python get attributes helpers - float getX() { return fVector.fX; } - float getY() { return fVector.fY; } - float getZ() { return fVector.fZ; } + float getX() const { return fVector.fX; } + float getY() const { return fVector.fY; } + float getZ() const { return fVector.fZ; } // python set attributes helpers void setX(float x) { fVector.fX = x; } @@ -125,15 +124,15 @@ public: // methods to manipulate vectors void Normalize() { fVector.Normalize(); } - float Dot(pyVector3 other) { return fVector*other.fVector;} - PyObject* Cross(pyVector3 other) {return pyVector3::New(fVector%other.fVector); } - float Magnitude() { return fVector.Magnitude(); } - float MagnitudeSquared() { return fVector.MagnitudeSquared(); } + float Dot(const pyVector3& other) { return fVector * other.fVector;} + PyObject* Cross(const pyVector3& other) const { return pyVector3::New(fVector % other.fVector); } + float Magnitude() const { return fVector.Magnitude(); } + float MagnitudeSquared() const { return fVector.MagnitudeSquared(); } void Zero() { fVector.fX=0; fVector.fY=0; fVector.fZ=0; } - PyObject* Scale(float scale) { return pyVector3::New(fVector * scale); } - PyObject* Add(pyVector3& other) { return pyVector3::New(fVector + other.fVector); } - PyObject* Subtract(pyVector3& other) { return pyVector3::New(fVector - other.fVector); } - PyObject* Copy() { return pyVector3::New(fVector); } + PyObject* Scale(float scale) const { return pyVector3::New(fVector * scale); } + PyObject* Add(const pyVector3& other) const { return pyVector3::New(fVector + other.fVector); } + PyObject* Subtract(const pyVector3& other) const { return pyVector3::New(fVector - other.fVector); } + PyObject* Copy() const { return pyVector3::New(fVector); } }; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp index 68ef9957..04af5873 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3Glue.cpp @@ -39,9 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGeometry3.h" #include +#include "pyGeometry3.h" +#pragma hdrstop // glue functions PYTHON_CLASS_DEFINITION(ptPoint3, pyPoint3); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.cpp index 5cd5f14d..97c75486 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.cpp @@ -40,9 +40,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ -#include "HeadSpin.h" +#include #include "pyGlueHelpers.h" #include "plString.h" +#pragma hdrstop plString PyString_AsStringEx(PyObject* obj) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.h b/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.h index 5f85c14a..78df4f4d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.h @@ -42,11 +42,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _pyGlueHelpers_h_ #define _pyGlueHelpers_h_ -#include - -// Useful string functions class plString; +class pyKey; +typedef struct _object PyObject; +typedef struct _typeobject PyTypeObject; +typedef struct PyMethodDef PyMethodDef; +// Useful string functions plString PyString_AsStringEx(PyObject* obj); bool PyString_CheckEx(PyObject* obj); PyObject* PyUnicode_FromStringEx(const plString& str); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp index daf22061..3e4cb655 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.cpp @@ -39,6 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyKey.h" +#pragma hdrstop + #include "pyGrassShader.h" #include "plSurface/plGrassShaderMod.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h index 4a4754c0..bc745029 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h @@ -42,13 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pyGrassShader_h #define pyGrassShader_h -#include -#include "hsStlUtils.h" - -#include "pyKey.h" - +#include "pnKeyedObject/plKey.h" #include "pyGlueHelpers.h" - +#include ////////////////////////////////////////////////////////////////////// // diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGrassShaderGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGrassShaderGlue.cpp index 876a32be..ad9eef79 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGrassShaderGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGrassShaderGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyGrassShader.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyGrassShader.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 7e019a88..a5bdf538 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.cpp @@ -39,13 +39,26 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyImage.h" -#include "cyMisc.h" +#include +#include "pyKey.h" +#include "hsResMgr.h" +#pragma hdrstop + +#include "pyImage.h" +#include "plJPEG/plJPEG.h" +#include "plGImage/plPNG.h" +#include "pnKeyedObject/plUoid.h" +void pyImage::setKey(pyKey& mipmapKey) // only for python glue, do NOT call +{ #ifndef BUILDING_PYPLASMA -#include "plGImage/plMipmap.h" + if (fMipmap && fMipMapKey) + fMipMapKey->UnRefObject(); + fMipmap = nil; #endif + fMipMapKey = mipmapKey.getKey(); +} #ifndef BUILDING_PYPLASMA plMipmap* pyImage::GetImage() @@ -164,7 +177,6 @@ uint32_t pyImage::GetHeight() return 0; } -#include "plJPEG/plJPEG.h" void pyImage::SaveAsJPEG(const wchar_t* fileName, uint8_t quality) { if (quality <= 0 || quality > 100) @@ -176,15 +188,12 @@ void pyImage::SaveAsJPEG(const wchar_t* fileName, uint8_t quality) plJPEG::Instance().WriteToFile( fileName, this->GetImage() ); } -#include "plGImage/plPNG.h" void pyImage::SaveAsPNG(const wchar_t* fileName) { plPNG::Instance().WriteToFile( fileName, this->GetImage() ); } -#include "hsResMgr.h" -#include "pnKeyedObject/plUoid.h" PyObject* pyImage::LoadJPEGFromDisk(const wchar_t* filename, uint16_t width, uint16_t height) { plMipmap* theMipmap = plJPEG::Instance().ReadFromFile(filename); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.h b/Sources/Plasma/FeatureLib/pfPython/pyImage.h index 95c2a810..3d0fc09a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyImage.h @@ -49,21 +49,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // PURPOSE: Class wrapper for Python to a plMipMap image // -#include -#include "hsStlUtils.h" +#include "pyGlueHelpers.h" +#include -#include "pyKey.h" +#include "pnKeyedObject/plKey.h" #include "pyColor.h" #ifndef BUILDING_PYPLASMA -#include "pyGeometry3.h" -#include "plGImage/plMipmap.h" +# include "plGImage/plMipmap.h" #endif -#include "pyGlueHelpers.h" - -class plKey; - class pyImage { protected: @@ -103,15 +98,6 @@ protected: } #endif - // contructor from Python - pyImage(pyKey& mipmapKey) - { - fMipMapKey = mipmapKey.getKey(); -#ifndef BUILDING_PYPLASMA - fMipmap = nil; -#endif - } - public: #ifndef BUILDING_PYPLASMA ~pyImage() @@ -134,15 +120,7 @@ public: static void AddPlasmaClasses(PyObject *m); static void AddPlasmaMethods(std::vector &methods); - void setKey(pyKey& mipmapKey) // only for python glue, do NOT call - { -#ifndef BUILDING_PYPLASMA - if (fMipmap && fMipMapKey) - fMipMapKey->UnRefObject(); - fMipmap = nil; -#endif - fMipMapKey = mipmapKey.getKey(); - } + void setKey(pyKey& mipmapKey); // override the equals to operator hsBool operator==(const pyImage &image) const diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp index 66b8f296..b4ef50d9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyImageGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyImage.h" #include +#include "pyKey.h" +#pragma hdrstop + +#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 e1e86f57..c2f801ac 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp @@ -45,13 +45,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // /////////////////////////////////////////////// +#include +#include "pyKey.h" +#include "hsResMgr.h" +#pragma hdrstop + #include "pyJournalBook.h" #include "pfJournalBook/pfJournalBook.h" #include "cyAnimation.h" #include "pyColor.h" #include "pyImage.h" -#include "hsResMgr.h" #include "pnKeyedObject/plUoid.h" uint32_t pyJournalBook::fNextKeyID = 0; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h index d1193e28..1535172a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h @@ -48,18 +48,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include -#include "hsStlUtils.h" -#include "pyKey.h" -#include "pyGeometry3.h" - - #include "pyGlueHelpers.h" +#include +class cyAnimation; class pyImage; class pyColor; -class cyAnimation; class pfJournalBook; +class plKey; class pyJournalBook { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp index 02e5b995..2038d95b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBookGlue.cpp @@ -39,13 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyKey.h" +#pragma hdrstop + #include "pyJournalBook.h" #include "pyEnum.h" -#include "pyKey.h" #include "pyImage.h" #include "pfJournalBook/pfJournalBook.h" -#include // glue functions PYTHON_CLASS_DEFINITION(ptBook, pyJournalBook); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp index ca9a79ab..8944cf45 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKey.cpp @@ -45,12 +45,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyKey.h" -#include "pnKeyedObject/plKey.h" #include "plgDispatch.h" +#include "pyKey.h" +#include "hsResMgr.h" +#pragma hdrstop + #include "plPythonFileMod.h" #include "pnMessage/plEnableMsg.h" -#include "hsResMgr.h" #include "pySceneObject.h" #include "pnSceneObject/plSceneObject.h" @@ -112,6 +113,11 @@ hsBool pyKey::operator==(const pyKey &key) const return false; } +const char* pyKey::getName() const +{ + return fKey ? fKey->GetName().c_str() : "nil"; +} + #ifndef BUILDING_PYPLASMA PyObject* pyKey::GetPySceneObject() { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKey.h b/Sources/Plasma/FeatureLib/pfPython/pyKey.h index f8c0c4b6..53b60dcd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKey.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyKey.h @@ -47,19 +47,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyKey - the wrapper class around a plKey so that Python can handle it // ////////////////////////////////////////////////////////////////////// -#include #include "pnKeyedObject/plKey.h" #include "pyGlueHelpers.h" -#include "plString.h" class plPythonFileMod; class pySceneObject; class plPipeline; -//#include "plPythonHelpers.h" - class pyKey { private: @@ -99,7 +95,7 @@ public: // getter and setters virtual plKey getKey() { return fKey; } virtual void setKey(plKey key) { fKey=key; } - virtual const char* getName() const { return fKey ? fKey->GetName().c_str() : "nil"; } + virtual const char* getName() const; #ifndef BUILDING_PYPLASMA PyObject* GetPySceneObject(); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKeyGlue.cpp index e131a3cd..c4b32d05 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyGlue.cpp @@ -39,13 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include #include "pyKey.h" +#pragma hdrstop + #ifndef BUILDING_PYPLASMA -#include "pySceneObject.h" +# include "pySceneObject.h" #endif -#include - // glue functions PYTHON_CLASS_DEFINITION(ptKey, pyKey); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp index a5717d26..251d21bb 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.cpp @@ -45,9 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyKeyMap.h" - +#pragma hdrstop +#include "pyKeyMap.h" #include "plInputCore/plInputInterfaceMgr.h" #include "pnInputCore/plKeyMap.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h index 71a56f12..176edb83 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h @@ -48,12 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "pnInputCore/plKeyMap.h" - #include "pyGlueHelpers.h" +class plKeyCombo; + class pyKeyMap { protected: diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMapGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyKeyMapGlue.cpp index 797130eb..9ded0a34 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMapGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMapGlue.cpp @@ -39,9 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyKeyMap.h" #include +#pragma hdrstop + +#include "pyKeyMap.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 7b23247f..f9642537 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.cpp @@ -45,8 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyMarkerMgr.h" +#pragma hdrstop +#include "pyMarkerMgr.h" #include "pfCharacter/pfMarkerMgr.h" void pyMarkerMgr::AddMarker(double x, double y, double z, uint32_t id, bool justCreated) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h index 1ece9214..aa3b168c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h @@ -47,10 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyMarkerMgr - a wrapper class to provide interface to the pfMarkerMgr stuff // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" - #include "pyGlueHelpers.h" class pyMarkerMgr diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp index 35cbb025..7fd8a5de 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgrGlue.cpp @@ -39,12 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyMarkerMgr.h" #include "pfMessage/pfMarkerMsg.h" #include "pyEnum.h" -#include - // glue functions PYTHON_CLASS_DEFINITION(ptMarkerMgr, pyMarkerMgr); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp index 62793f3e..dd78ae65 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.cpp @@ -39,19 +39,53 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyGeometry3.h" #include "pyMatrix44.h" +#pragma hdrstop + +PyObject* pyMatrix44::operator*(const pyVector3& p) const +{ + return pyVector3::New(fMatrix * p.fVector); +} + +PyObject* pyMatrix44::operator*(const pyPoint3& p) const +{ + return pyPoint3::New(fMatrix * p.fPoint); +} + +void pyMatrix44::Translate(const pyVector3& v) +{ + fMatrix.Translate(&v.fVector); +} + +void pyMatrix44::Scale(const pyVector3& v) +{ + fMatrix.Scale(&v.fVector); +} + +void pyMatrix44::MakeTranslateMat(const pyVector3& trans) +{ + fMatrix.MakeTranslateMat(&trans.fVector); +} -pyMatrix44::pyMatrix44() { fMatrix.Reset(); } -pyMatrix44::pyMatrix44(hsMatrix44 other) -{ // copy the other matrix to this one - int i,j; - for ( i=0;i<4;i++) - for ( j=0;j<4;j++) - fMatrix.fMap[i][j] = other.fMap[i][j]; - fMatrix.fFlags = other.fFlags; +void pyMatrix44::MakeScaleMat(const pyVector3& scale) +{ + fMatrix.MakeScaleMat(&scale.fVector); +} + +void pyMatrix44::Make(const pyPoint3& from, const pyPoint3& at, const pyVector3& up) +{ + fMatrix.Make(&from.fPoint, &at.fPoint, &up.fVector); } -PyObject* pyMatrix44::GetInverse(PyObject* inverse) +void pyMatrix44::MakeUpPreserving(const pyPoint3& from, const pyPoint3& at, const pyVector3& up) +{ + fMatrix.MakeUpPreserving(&from.fPoint, &at.fPoint, &up.fVector); +} + +PyObject* pyMatrix44::GetInverse(PyObject* inverse) const { pyMatrix44 *obj = pyMatrix44::ConvertFrom(inverse); fMatrix.GetInverse(&(obj->fMatrix)); @@ -59,7 +93,7 @@ PyObject* pyMatrix44::GetInverse(PyObject* inverse) return inverse; } -PyObject* pyMatrix44::GetTranspose(PyObject* transpose) +PyObject* pyMatrix44::GetTranspose(PyObject* transpose) const { pyMatrix44 *obj = pyMatrix44::ConvertFrom(transpose); fMatrix.GetTranspose(&(obj->fMatrix)); @@ -67,7 +101,7 @@ PyObject* pyMatrix44::GetTranspose(PyObject* transpose) return transpose; } -PyObject* pyMatrix44::GetAdjoint(PyObject* adjoint) +PyObject* pyMatrix44::GetAdjoint(PyObject* adjoint) const { pyMatrix44 *obj = pyMatrix44::ConvertFrom(adjoint); fMatrix.GetAdjoint(&(obj->fMatrix)); @@ -75,7 +109,7 @@ PyObject* pyMatrix44::GetAdjoint(PyObject* adjoint) return adjoint; } -PyObject* pyMatrix44::GetTranslate(PyObject* pt) +PyObject* pyMatrix44::GetTranslate(PyObject* pt) const { pyVector3 *obj = pyVector3::ConvertFrom(pt); fMatrix.GetTranslate(&(obj->fVector)); @@ -83,7 +117,22 @@ PyObject* pyMatrix44::GetTranslate(PyObject* pt) return pt; } -float* pyMatrix44::GetData() +PyObject* pyMatrix44::GetViewAxis() const +{ + return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kView)); +} + +PyObject* pyMatrix44::GetUpAxis() const +{ + return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kUp)); +} + +PyObject* pyMatrix44::GetRightAxis() const +{ + return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kRight)); +} + +float* pyMatrix44::GetData() const { float *res = new float[4*4]; res[0] = fMatrix.fMap[0][0]; res[1] = fMatrix.fMap[0][1]; res[2] = fMatrix.fMap[0][2]; res[3] = fMatrix.fMap[0][3]; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h index cfce21e4..891b569d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h @@ -41,21 +41,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #ifndef pyMatrix44_h_inc #define pyMatrix44_h_inc -#include - -#include "hsStlUtils.h" #include "hsMatrix44.h" -#include "pyGeometry3.h" - #include "pyGlueHelpers.h" +class pyPoint3; +class pyVector3; + class pyMatrix44 { protected: - pyMatrix44(); - pyMatrix44(hsMatrix44 other); + pyMatrix44() { fMatrix.Reset(); } + pyMatrix44(const hsMatrix44& other) : fMatrix(other) { } public: // required functions for PyObject interoperability @@ -71,31 +69,31 @@ public: // operator methods PyObject* operator*(const pyMatrix44& b) const { return pyMatrix44::New(fMatrix * b.fMatrix); } // returns pyMatrix44 - PyObject* operator*(const pyVector3& p) const { return pyVector3::New(fMatrix * p.fVector); } // returns pyVector3 - PyObject* operator*(const pyPoint3& p) const { return pyPoint3::New(fMatrix * p.fPoint); } // returns pyPoint3 + PyObject* operator*(const pyVector3& p) const; + PyObject* operator*(const pyPoint3& p) const; // other methods - PyObject* Copy() { return pyMatrix44::New(fMatrix); } // returns pyMatrix44 - void Translate(pyVector3 v) { fMatrix.Translate(&v.fVector); } - void Scale(pyVector3 v) { fMatrix.Scale(&v.fVector); } - void Rotate(int axis, float radians) { fMatrix.Rotate(axis,radians); } + PyObject* Copy() const { return pyMatrix44::New(fMatrix); } // returns pyMatrix44 + void Translate(const pyVector3& v); + void Scale(const pyVector3& v); + void Rotate(int axis, float radians) { fMatrix.Rotate(axis, radians); } void Reset() { fMatrix.Reset(); } - void MakeTranslateMat(pyVector3 trans) { fMatrix.MakeTranslateMat(&trans.fVector); } - void MakeScaleMat(pyVector3 scale) { fMatrix.MakeScaleMat(&scale.fVector); } - void MakeRotateMat(int axis, float radians) { fMatrix.MakeRotateMat(axis,radians); } - void Make(pyPoint3 from,pyPoint3 at,pyVector3 up) { fMatrix.Make(&from.fPoint,&at.fPoint,&up.fVector); } - void MakeUpPreserving(pyPoint3 from,pyPoint3 at,pyVector3 up) { fMatrix.MakeUpPreserving(&from.fPoint,&at.fPoint,&up.fVector); } - hsBool GetParity() { return fMatrix.GetParity(); } - float GetDeterminant() { return fMatrix.GetDeterminant(); } - PyObject* GetInverse(PyObject* inverse); // returns (and accepts) pyMatrix44 - PyObject* GetTranspose(PyObject* inverse); // returns (and accepts) pyMatrix44 - PyObject* GetAdjoint(PyObject* adjoint); // returns (and accepts) pyMatrix44 - PyObject* GetTranslate(PyObject* pt); // returns (and accepts) pyVector3 - PyObject* GetViewAxis() { return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kView)); } // returns pyVector3 - PyObject* GetUpAxis() { return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kUp)); } // returns pyVector3 - PyObject* GetRightAxis() { return pyVector3::New(fMatrix.GetAxis(hsMatrix44::kRight)); } // returns pyVector3 - - float* GetData(); + void MakeTranslateMat(const pyVector3& trans); + void MakeScaleMat(const pyVector3& scale); + void MakeRotateMat(int axis, float radians) { fMatrix.MakeRotateMat(axis, radians); } + void Make(const pyPoint3& from, const pyPoint3& at, const pyVector3& up); + void MakeUpPreserving(const pyPoint3& from, const pyPoint3& at, const pyVector3& up); + hsBool GetParity() const { return fMatrix.GetParity(); } + float GetDeterminant() const { return fMatrix.GetDeterminant(); } + PyObject* GetInverse(PyObject* inverse) const; // returns (and accepts) pyMatrix44 + PyObject* GetTranspose(PyObject* inverse) const; // returns (and accepts) pyMatrix44 + PyObject* GetAdjoint(PyObject* adjoint) const; // returns (and accepts) pyMatrix44 + PyObject* GetTranslate(PyObject* pt) const; // returns (and accepts) pyVector3 + PyObject* GetViewAxis() const; // returns pyVector3 + PyObject* GetUpAxis() const; // returns pyVector3 + PyObject* GetRightAxis() const; // returns pyVector3 + + float* GetData() const; void SetData(const float mat[]); }; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp index df040509..b003b812 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44Glue.cpp @@ -39,9 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyMatrix44.h" #include +#include "pyGeometry3.h" +#include "pyMatrix44.h" +#pragma hdrstop // glue functions PYTHON_CLASS_DEFINITION(ptMatrix44, pyMatrix44); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp index cd63a0f2..9f547fd5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.cpp @@ -45,8 +45,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include "pyKey.h" +#pragma hdrstop + #include "pyMoviePlayer.h" +#include "pyColor.h" #include "plMessage/plMovieMsg.h" #include "pfMessage/pfMovieEventMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h index af28c7f8..08e5fdf4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h @@ -47,12 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyMoviePlayer - a wrapper class all the movie player functions // ////////////////////////////////////////////////////////////////////// -#include - -#include "pyKey.h" -#include "pyColor.h" #include "pyGlueHelpers.h" +#include "pnKeyedObject/plKey.h" + +class pyColor; class pyMoviePlayer { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp index 1a0a9a95..ba918c7c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayerGlue.cpp @@ -39,13 +39,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyKey.h" +#pragma hdrstop + #include "pyMoviePlayer.h" #include "pyEnum.h" -#include "pyKey.h" #include "pyColor.h" #include "pfMessage/pfMovieEventMsg.h" -#include // glue functions PYTHON_CLASS_DEFINITION(ptMoviePlayer, pyMoviePlayer); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp index d9e4ec24..05a95867 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp @@ -40,12 +40,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#pragma hdrstop + #ifdef BUILDING_PYPLASMA # error "pyNetLinkingMgr is not compatible with pyPlasma.pyd. Use BUILDING_PYPLASMA macro to ifdef out unwanted headers." #endif #include "pyNetLinkingMgr.h" -#include "hsStlUtils.h" #include "plNetClient/plNetLinkingMgr.h" #include "plAvatar/plAvatarMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h index 99d3b467..2c796521 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h @@ -41,11 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #ifndef pyNetLinkingMgr_h_inc #define pyNetLinkingMgr_h_inc -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp index f3f23bd6..775e3370 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgrGlue.cpp @@ -39,12 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyNetLinkingMgr.h" #include "pyEnum.h" #include "pyAgeLinkStruct.h" #include "plNetCommon/plNetCommon.h" -#include #ifndef BUILDING_PYPLASMA diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.cpp index eea09404..dadfa6bf 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.cpp @@ -40,6 +40,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#pragma hdrstop + #include "pyNetServerSessionInfo.h" //////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h index a1e1b8f2..2af30bf1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h @@ -41,12 +41,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #ifndef pyNetServerSessionInfo_h_inc #define pyNetServerSessionInfo_h_inc -#include #include "HeadSpin.h" #include "plNetCommon/plNetServerSessionInfo.h" #include "pnUUID/pnUUID.h" - #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfoGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfoGlue.cpp index f9f7f803..824e7bc7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfoGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfoGlue.cpp @@ -39,9 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyNetServerSessionInfo.h" #include +#pragma hdrstop + +#include "pyNetServerSessionInfo.h" // glue functions PYTHON_CLASS_DEFINITION(ptNetServerSessionInfo, pyNetServerSessionInfo); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp index 275f525b..31b32e22 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp @@ -44,13 +44,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyNotify - a wrapper class to provide interface to send a NotifyMsg // ////////////////////////////////////////////////////////////////////// -#include "pyNotify.h" #include "plgDispatch.h" -#include "pnMessage/plNotifyMsg.h" -#include "pyKey.h" -#include "plPythonFileMod.h" #include "pyGeometry3.h" +#include "pyKey.h" +#pragma hdrstop + +#include "pyNotify.h" pyNotify::pyNotify() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h index 95b84bc9..9ee6a366 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h @@ -48,14 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include #include "pnMessage/plNotifyMsg.h" - -#include "pyKey.h" -#include "pyGeometry3.h" - #include "pyGlueHelpers.h" +class pyPoint3; + class pyNotify { private: diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp index 443d7c60..1cbe3340 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp @@ -39,10 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyNotify.h" -#include "pyEnum.h" #include +#include "pyGeometry3.h" +#include "pyKey.h" +#pragma hdrstop + +#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 e12d329a..92a9a560 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyPlayer.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyPlayer.cpp @@ -39,6 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include "pyKey.h" +#pragma hdrstop + #include "pyPlayer.h" pyPlayer::pyPlayer() // only used by python glue, do NOT call diff --git a/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h b/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h index fb3cf6b4..e5dd697c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h @@ -48,14 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: Class wrapper for Python to the player data // -#include - -#include "hsStlUtils.h" -#include "pyKey.h" #include "pyGlueHelpers.h" - -class plKey; +#include "pnKeyedObject/plKey.h" class pyPlayer { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp index 32b9f5ff..2ba45171 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyPlayer.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pyPlayer.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 92bdc663..67ed05da 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySDL.cpp @@ -40,6 +40,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#include +#pragma hdrstop + #include "pySDL.h" #include "plSDL/plSDL.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDL.h b/Sources/Plasma/FeatureLib/pfPython/pySDL.h index c27bb919..2c63ce5d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDL.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySDL.h @@ -47,11 +47,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pySDL - python subset of the plSDL library. // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" #include "hsStlUtils.h" - #include "pyGlueHelpers.h" class plStateDataRecord; diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp index 59d1eca9..b66fb9ad 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySDLGlue.cpp @@ -39,12 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyKey.h" +#pragma hdrstop + #include "pySDL.h" #include "plSDL/plSDL.h" #include "pyEnum.h" -#include "pyKey.h" - -#include void pySDL::AddPlasmaConstantsClasses(PyObject *m) { diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp index a1533cb8..55c2bae2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp @@ -39,25 +39,36 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "plAudible.h" +#include "plgDispatch.h" +#include "pyGeometry3.h" +#include "pyKey.h" +#include "pyMatrix44.h" +#include "plPhysical.h" +#pragma hdrstop + #include "pySceneObject.h" -#include "HeadSpin.h" // TEMP, for STL warnings +#include "plResMgr/plResManager.h" -#include "pnKeyedObject/plKey.h" #include "cyAvatar.h" -#include "plAvatar/plAvBrainHuman.h" -#include "pnSceneObject/plCoordinateInterface.h" -#include "plResMgr/plResManager.h" +#include "cyDraw.h" +#include "cyParticleSys.h" +#include "cyPhysics.h" + +#include "plMessage/plAnimCmdMsg.h" #include "pnMessage/plCameraMsg.h" -#include "pfCamera/plCameraModifier.h" +#include "pnMessage/plNotifyMsg.h" + #include "plAvatar/plArmatureMod.h" -#include "plPhysical.h" -#include "plModifier/plResponderModifier.h" +#include "pnSceneObject/plAudioInterface.h" +#include "plAvatar/plAvBrainHuman.h" +#include "pfCamera/plCameraModifier.h" +#include "pnSceneObject/plCoordinateInterface.h" #include "plModifier/plLogicModifier.h" -#include "pfPython/plPythonFileMod.h" - -#include "pyMatrix44.h" -#include "pyKey.h" -#include "plgDispatch.h" +#include "plPythonFileMod.h" +#include "plModifier/plResponderModifier.h" void pySceneObject::IAddObjKeyToAll(plKey key) { @@ -129,6 +140,14 @@ pySceneObject::pySceneObject(plKey objkey) fNetForce = false; } +pySceneObject::~pySceneObject() +{ + Py_XDECREF(fDraw); + Py_XDECREF(fPhysics); + Py_XDECREF(fAvatar); + Py_XDECREF(fParticle); +} + hsBool pySceneObject::operator==(const pySceneObject &sobj) const { @@ -822,11 +841,6 @@ std::vector pySceneObject::GetPythonMods() return pyPL; } - - -#include "plMessage/plAnimCmdMsg.h" -#include "pnMessage/plNotifyMsg.h" - void pySceneObject::Animate() { plSceneObject* obj = plSceneObject::ConvertNoRef(fSceneObjects[0]->ObjectIsLoaded()); @@ -938,9 +952,6 @@ void pySceneObject::FFResponder(int state) } } -#include "pnSceneObject/plAudioInterface.h" -#include "NucleusLib/inc/plAudible.h" - void pySceneObject::SetSoundFilename(int index, const char* filename, bool isCompressed) { plSceneObject* obj = plSceneObject::ConvertNoRef(fSceneObjects[0]->ObjectIsLoaded()); diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h index b15e4b7f..8f85de89 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h @@ -48,18 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // attached to a SceneObject // ////////////////////////////////////////////////////////////////////// -#include - -#include "pyKey.h" -#include "cyDraw.h" -#include "cyPhysics.h" -#include "cyAvatar.h" -#include "cyParticleSys.h" - -#include "hsStlUtils.h" #include "pyGlueHelpers.h" +#include "pnKeyedObject/plKey.h" +#include "hsTemplates.h" +class pyMatrix44; class pySceneObject { @@ -80,7 +74,7 @@ protected: pySceneObject(plKey objkey); public: - ~pySceneObject() {Py_XDECREF(fDraw); Py_XDECREF(fPhysics); Py_XDECREF(fAvatar); Py_XDECREF(fParticle);} + ~pySceneObject(); // required functions for PyObject interoperability PYTHON_CLASS_NEW_FRIEND(ptSceneobject); diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp index 61a9fab4..b3e448c7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObjectGlue.cpp @@ -39,11 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pySceneObject.h" -#include "pyMatrix44.h" -#include "pyGeometry3.h" #include +#include "pyGeometry3.h" +#include "pyKey.h" +#include "pyMatrix44.h" +#pragma hdrstop + +#include "pySceneObject.h" // glue functions PYTHON_CLASS_DEFINITION(ptSceneobject, pySceneObject); diff --git a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.cpp b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.cpp index 3ad5e405..4ad502c5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.cpp @@ -40,6 +40,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ +#pragma hdrstop + #include "pySpawnPointInfo.h" /////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h index 88901f86..1b8e1192 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h @@ -41,12 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #ifndef pySpawnPointInfo_h_inc #define pySpawnPointInfo_h_inc -#include -#include "HeadSpin.h" -#include "hsStlUtils.h" #include "plNetCommon/plSpawnPointInfo.h" - #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfoGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfoGlue.cpp index 80f1aeb7..bcebc2b7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfoGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfoGlue.cpp @@ -39,9 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pySpawnPointInfo.h" #include +#pragma hdrstop + +#include "pySpawnPointInfo.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 83aba880..183163fa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.cpp @@ -46,8 +46,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // and interface to the ChatLog (ptChatStatusLog) ////////////////////////////////////////////////////////////////////// -#include "pyStatusLog.h" +#include "plString.h" +#pragma hdrstop +#include "pyColor.h" +#include "pyStatusLog.h" #include "plStatusLog/plStatusLog.h" pyStatusLog::pyStatusLog( plStatusLog* log/*=nil */) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h index eb460598..5b8cbdef 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h @@ -48,15 +48,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // and interface to the ChatLog (ptChatStatusLog) ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" - #include "pyGlueHelpers.h" -#include "pyColor.h" +class pyColor; class plStatusLog; - +class plString; class pyStatusLog { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp index eaae3843..27a83ca6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLogGlue.cpp @@ -39,11 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyStatusLog.h" -#include "pyEnum.h" -#include "plStatusLog/plStatusLog.h" #include +#include "plString.h" +#pragma hdrstop + +#include "pyColor.h" +#include "pyEnum.h" +#include "plStatusLog/plStatusLog.h" +#include "pyStatusLog.h" // glue functions PYTHON_CLASS_DEFINITION(ptStatusLog, pyStatusLog); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp index 55b11a84..c205a775 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStream.cpp @@ -45,8 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyStream.h" +#pragma hdrstop +#include "pyStream.h" #include "plFile/plEncryptedStream.h" pyStream::pyStream() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStream.h b/Sources/Plasma/FeatureLib/pfPython/pyStream.h index 4845b6ba..e6e466a5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStream.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyStream.h @@ -47,13 +47,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyStream - a wrapper class to provide interface to the File stream stuff // ////////////////////////////////////////////////////////////////////// -#include -#include "HeadSpin.h" -#include "hsStlUtils.h" +#include "HeadSpin.h" #include "pyGlueHelpers.h" - +#include +#include class hsStream; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStreamGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyStreamGlue.cpp index c46e1e05..9a80344d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStreamGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyStreamGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyStream.h" #include +#pragma hdrstop + +#include "pyStream.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 a522697b..1a4471fd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.cpp @@ -39,6 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include "pyKey.h" +#pragma hdrstop + #include "pySwimCurrentInterface.h" #include "plAvatar/plSwimRegion.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h index 9f06495b..733a05e7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h @@ -42,10 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pySwimCurrentInterface_h #define pySwimCurrentInterface_h -#include -#include "pyKey.h" - #include "pyGlueHelpers.h" +#include "pnKeyedObject/plKey.h" class pySwimCurrentInterface { diff --git a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterfaceGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterfaceGlue.cpp index fa83e85c..12a00c0f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterfaceGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterfaceGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pySwimCurrentInterface.h" #include +#include "pyKey.h" +#pragma hdrstop + +#include "pySwimCurrentInterface.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 1988b4c5..d8c219ac 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp @@ -45,6 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#pragma hdrstop + #ifdef BUILDING_PYPLASMA # error "pyVault is not compatible with pyPlasma.pyd. Use BUILDING_PYPLASMA macro to ifdef out unwanted headers." #endif @@ -65,7 +68,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pySDL.h" #include "pnKeyedObject/plKey.h" -#include "cyPythonInterface.h" #include "plVault/plVault.h" #include "pnNetCommon/plNetApp.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVault.h b/Sources/Plasma/FeatureLib/pfPython/pyVault.h index 1d52c5da..b94679f2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVault.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVault.h @@ -47,10 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVault - a wrapper class to provide interface to the plVault and the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" - #include "pyGlueHelpers.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp index d9988efb..a44642d9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.cpp @@ -45,6 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#pragma hdrstop + #include "pyVaultAgeInfoListNode.h" #include "pyVaultFolderNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h index c6ba4313..333f88f8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h @@ -47,13 +47,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultAgeInfoListNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" - #include "pyVaultFolderNode.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp index da1fdbb8..e3eba888 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNodeGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyVaultAgeInfoListNode.h" -#include "plVault/plVault.h" #include +#pragma hdrstop + +#include "pyVaultAgeInfoListNode.h" +#include "plVault/plVault.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 559b9601..3878522b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp @@ -44,9 +44,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultAgeInfoNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include "pyVaultAgeInfoNode.h" -#include "hsStlUtils.h" +#include +#pragma hdrstop + +#include "pyVaultAgeInfoNode.h" #include "pyVaultAgeInfoListNode.h" #include "pyVaultPlayerInfoListNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h index 7e5a0f21..1e609a8b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h @@ -47,13 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultAgeInfoNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" - +#include #include "pyVaultNode.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp index c98b1ec1..a7b6a0a2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNodeGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyVaultAgeInfoNode.h" -#include "plVault/plVault.h" #include +#pragma hdrstop + +#include "pyVaultAgeInfoNode.h" +#include "plVault/plVault.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 96dc67cb..42fd05aa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.cpp @@ -45,6 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#pragma hdrstop + #include "pyVaultAgeLinkNode.h" #include "pyVaultAgeInfoNode.h" #include "pyNetLinkingMgr.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h index 162f4d41..8fbf15ce 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h @@ -47,15 +47,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultAgeLinkNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" - #include "pyVaultNode.h" #include "plNetCommon/plNetServerSessionInfo.h" // for plAgeLinkStruct +#include class pyVaultAgeInfoNode; struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp index be7cbf2b..51b1ded0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNodeGlue.cpp @@ -39,11 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyVaultAgeLinkNode.h" #include "pySpawnPointInfo.h" #include "plVault/plVault.h" -#include // glue functions PYTHON_CLASS_DEFINITION(ptVaultAgeLinkNode, pyVaultAgeLinkNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp index 48c45c34..a168b729 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.cpp @@ -45,13 +45,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#pragma hdrstop + #include "pyVaultChronicleNode.h" +#include "plVault/plVault.h" #ifndef BUILDING_PYPLASMA -#include "pyVault.h" +# include "pyVault.h" #endif -#include "plVault/plVault.h" - // should only be created from C++ side pyVaultChronicleNode::pyVaultChronicleNode(RelVaultNode* nfsNode) : pyVaultNode(nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h index 59504e8b..59cda028 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h @@ -47,13 +47,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultChronicleNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" - #include "pyVaultNode.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp index 3346b938..77de95dd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNodeGlue.cpp @@ -39,9 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyVaultChronicleNode.h" #include "plVault/plVault.h" -#include // glue functions PYTHON_CLASS_DEFINITION(ptVaultChronicleNode, pyVaultChronicleNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp index a7381fac..f1988f79 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.cpp @@ -45,9 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyVaultFolderNode.h" - +#pragma hdrstop +#include "pyVaultFolderNode.h" #include "plVault/plVault.h" // should only be created from C++ side diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h index 2c0a236e..33afd0bd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h @@ -47,13 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultFolderNode - a wrapper class to provide interface to the plVaultNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" - +#include #include "pyVaultNode.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp index 48dfffa4..8dabbdfd 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNodeGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyVaultFolderNode.h" #include "plVault/plVault.h" -#include // glue functions PYTHON_CLASS_DEFINITION(ptVaultFolderNode, pyVaultFolderNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp index 00d1cf16..db8f3cf2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp @@ -39,6 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyVault.h" #include "pyEnum.h" #include "pyAgeInfoStruct.h" @@ -48,7 +52,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plVault/plVault.h" #include "plMessage/plVaultNotifyMsg.h" -#include #ifndef BUILDING_PYPLASMA diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp index 1aaea5fc..21d1303f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp @@ -45,15 +45,19 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#include "plPipeline.h" +#include "hsResMgr.h" +#include "plString.h" +#pragma hdrstop + #include "pyVaultImageNode.h" #ifndef BUILDING_PYPLASMA -#include "pyVault.h" +# include "pyVault.h" #endif #include "pyImage.h" -#include "plPipeline.h" #include "cyMisc.h" -#include "hsResMgr.h" #include "plGImage/plMipmap.h" #include "plVault/plVault.h" #include "pnMessage/plRefMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h index daefefb5..858ef726 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h @@ -47,18 +47,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultImageNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" - -#include "pyVaultNode.h" #include "pnKeyedObject/plKey.h" +#include +#include "pyVaultNode.h" -struct RelVaultNode; +struct RelVaultNode; +class plMipmap; class pyVaultImageNode : public pyVaultNode { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp index 758a53d4..ca1e387b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNodeGlue.cpp @@ -39,11 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyVaultImageNode.h" #include "pyImage.h" #include "plVault/plVault.h" -#include // glue functions PYTHON_CLASS_DEFINITION(ptVaultImageNode, pyVaultImageNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp index 8821e7d3..cfe152d0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultMarkerGameNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include "pyVaultMarkerGameNode.h" -#include "hsStlUtils.h" +#pragma hdrstop +#include "pyVaultMarkerGameNode.h" #include "plVault/plVault.h" // should only be created from C++ side diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h index 7af1e406..a06b59f3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h @@ -47,7 +47,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultMarkerGameNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp index a612c99a..1dc86e1e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNodeGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyVaultMarkerGameNode.h" -#include "plVault/plVault.h" #include +#pragma hdrstop + +#include "pyVaultMarkerGameNode.h" +#include "plVault/plVault.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 e5afc01e..5b74fa24 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp @@ -45,40 +45,36 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#include +#pragma hdrstop + #include "pyVaultNode.h" #ifndef BUILDING_PYPLASMA -#include "pyVault.h" -#endif -#include "pyImage.h" -#include "pyDniCoordinates.h" -#include "pyVaultNodeRef.h" -#include "pyVaultFolderNode.h" -#include "pyVaultPlayerInfoListNode.h" -#include "pyVaultImageNode.h" -#include "pyVaultTextNoteNode.h" -#include "pyVaultAgeLinkNode.h" -#include "pyVaultChronicleNode.h" -#include "pyVaultPlayerInfoNode.h" -#include "pyVaultMarkerGameNode.h" -#include "pyVaultAgeInfoNode.h" -#include "pyVaultAgeInfoListNode.h" -#include "pyVaultPlayerNode.h" -#include "pyVaultSDLNode.h" -#ifndef BUILDING_PYPLASMA -#include "pyVaultSystemNode.h" +# include "pyVault.h" +# include "pyVaultSystemNode.h" +# include "pnNetCommon/plNetApp.h" +# include "plNetClientComm/plNetClientComm.h" #endif +# include "pyImage.h" +# include "pyDniCoordinates.h" +# include "pyVaultNodeRef.h" +# include "pyVaultFolderNode.h" +# include "pyVaultPlayerInfoListNode.h" +# include "pyVaultImageNode.h" +# include "pyVaultTextNoteNode.h" +# include "pyVaultAgeLinkNode.h" +# include "pyVaultChronicleNode.h" +# include "pyVaultPlayerInfoNode.h" +# include "pyVaultMarkerGameNode.h" +# include "pyVaultAgeInfoNode.h" +# include "pyVaultAgeInfoListNode.h" +# include "pyVaultPlayerNode.h" +# include "pyVaultSDLNode.h" #include "plGImage/plMipmap.h" - #include "plVault/plVault.h" -#ifndef BUILDING_PYPLASMA -#include "pnNetCommon/plNetApp.h" -#include "plNetClientComm/plNetClientComm.h" -#endif - -#include - /////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h index 55d8c312..e6d88316 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h @@ -47,10 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include -#include "HeadSpin.h" -#include "hsStlUtils.h" +#include "HeadSpin.h" #include "pyGlueHelpers.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp index 15a117df..61188e86 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyVaultNode.h" -#include "plVault/plVault.h" #include +#pragma hdrstop + +#include "pyVaultNode.h" +#include "plVault/plVault.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 935ff3dc..c499caa2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.cpp @@ -45,14 +45,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#pragma hdrstop + #include "pyVaultNodeRef.h" -#ifndef BUILDING_PYPLASMA -#include "pyVault.h" -#endif #include "pyVaultNode.h" #include "pyVaultPlayerInfoNode.h" - #include "plVault/plVault.h" +#ifndef BUILDING_PYPLASMA +# include "pyVault.h" +#endif ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h index 401a8657..e4ef2a3e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h @@ -47,10 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultNodeRef - a wrapper class to provide interface to the plVaultNodeRef // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" - #include "pyGlueHelpers.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp index 0edbdf03..ad1350d4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRefGlue.cpp @@ -39,10 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyVaultNodeRef.h" #include "plVault/plVault.h" -#include // glue functions // glue functions diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp index 0660b873..41d06989 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.cpp @@ -45,17 +45,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#include +#pragma hdrstop + #include "pyVaultPlayerInfoListNode.h" -#ifndef BUILDING_PYPLASMA -#include "pyVault.h" -#endif #include "pyVaultFolderNode.h" #include "pyVaultPlayerInfoNode.h" #include "pyVaultNodeRef.h" - #include "plVault/plVault.h" - -#include +#ifndef BUILDING_PYPLASMA +# include "pyVault.h" +#endif // should only be created from C++ side pyVaultPlayerInfoListNode::pyVaultPlayerInfoListNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h index d5da151e..ee891c38 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h @@ -47,13 +47,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultPlayerInfoListNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" - #include "pyVaultFolderNode.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp index fd609f37..272a2eb6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNodeGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyVaultPlayerInfoListNode.h" -#include "plVault/plVault.h" #include +#pragma hdrstop + +#include "pyVaultPlayerInfoListNode.h" +#include "plVault/plVault.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 5558939f..940f5102 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp @@ -45,13 +45,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#pragma hdrstop + #include "pyVaultPlayerInfoNode.h" +#include "plVault/plVault.h" #ifndef BUILDING_PYPLASMA -#include "pyVault.h" +# include "pyVault.h" #endif -#include "plVault/plVault.h" - // should only be created from C++ side pyVaultPlayerInfoNode::pyVaultPlayerInfoNode(RelVaultNode* nfsNode) : pyVaultNode(nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h index 6318dbea..04ca664d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h @@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include #include "pyVaultNode.h" #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp index 512fe5ca..25f7114c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNodeGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyVaultPlayerInfoNode.h" -#include "plVault/plVault.h" #include +#pragma hdrstop + +#include "pyVaultPlayerInfoNode.h" +#include "plVault/plVault.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 a09bd428..ffcf55c5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp @@ -45,22 +45,23 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#pragma hdrstop + #include "pyVaultPlayerNode.h" +#include "pyAgeInfoStruct.h" +#include "pyVaultAgeLinkNode.h" +#include "pyVaultPlayerInfoNode.h" +#include "pyVaultPlayerInfoListNode.h" +#include "pyVaultFolderNode.h" +#include "pyVaultChronicleNode.h" +#include "pyVaultSDLNode.h" +#include "pyAgeLinkStruct.h" +#include "plVault/plVault.h" #ifndef BUILDING_PYPLASMA -#include "pyVault.h" +# include "pyVault.h" #endif -#include "pfPython/pyAgeInfoStruct.h" -#include "pfPython/pyVaultAgeLinkNode.h" -#include "pfPython/pyVaultPlayerInfoNode.h" -#include "pfPython/pyVaultPlayerInfoListNode.h" -#include "pfPython/pyVaultFolderNode.h" -#include "pfPython/pyVaultChronicleNode.h" -#include "pfPython/pyVaultSDLNode.h" -#include "pfPython/pyAgeLinkStruct.h" - -#include "plVault/plVault.h" - //============================================================================ static PyObject * GetPlayerVaultFolder (unsigned folderType) { PyObject * result = nil; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h index 18900214..57881bf6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h @@ -47,15 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultPlayerNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include - #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" - -#include "pfPython/pyVaultNode.h" -#include "pfPython/pyVaultPlayerInfoNode.h" +#include +#include "pyVaultNode.h" class pyAgeInfoStruct; struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp index 2d309e94..a8b0df59 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNodeGlue.cpp @@ -39,11 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyVaultPlayerNode.h" #include "pyAgeInfoStruct.h" - #include "plVault/plVault.h" -#include // glue functions PYTHON_CLASS_DEFINITION(ptVaultPlayerNode, pyVaultPlayerNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp index 28a7700b..1186e7b2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.cpp @@ -45,13 +45,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#pragma hdrstop + #include "pyVaultSDLNode.h" +#include "plSDL/plSDL.h" #include "pySDL.h" - #include "plVault/plVault.h" -#include "plSDL/plSDL.h" - // should only be created from C++ side pyVaultSDLNode::pyVaultSDLNode(RelVaultNode* nfsNode) : pyVaultNode(nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h index fe32d5ac..7f0afd06 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h @@ -47,13 +47,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultSDLNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" - #include "pyVaultNode.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp index 6d085091..56abdf1e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNodeGlue.cpp @@ -39,11 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#pragma hdrstop + #include "pyVaultSDLNode.h" #include "pySDL.h" - #include "plVault/plVault.h" -#include // glue functions PYTHON_CLASS_DEFINITION(ptVaultSDLNode, pyVaultSDLNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp index 793193a4..dbcadd15 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.cpp @@ -45,14 +45,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#pragma hdrstop + #include "pyVaultSystemNode.h" -#ifndef BUILDING_PYPLASMA -#include "pyVault.h" -#endif #include "pyVaultAgeLinkNode.h" #include "pyVaultFolderNode.h" - #include "plVault/plVault.h" +#ifndef BUILDING_PYPLASMA +# include "pyVault.h" +#endif // should only be created from C++ side pyVaultSystemNode::pyVaultSystemNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h index 87143b72..54b48fe8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h @@ -47,13 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultSystemNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// -#include - #include "HeadSpin.h" -#include "hsStlUtils.h" - #include "pyGlueHelpers.h" - #include "pyVaultNode.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp index 9647eb2c..9a1f8b4b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNodeGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyVaultSystemNode.h" -#include "plVault/plVault.h" #include +#pragma hdrstop + +#include "pyVaultSystemNode.h" +#include "plVault/plVault.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 a1e924e6..a4d54872 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.cpp @@ -45,14 +45,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include +#pragma hdrstop + #include "pyVaultTextNoteNode.h" -#ifndef BUILDING_PYPLASMA -#include "pyVault.h" -#endif #include "pyVaultAgeLinkNode.h" #include "pyVaultFolderNode.h" - #include "plVault/plVault.h" +#ifndef BUILDING_PYPLASMA +# include "pyVault.h" +#endif // should only be created from C++ side pyVaultTextNoteNode::pyVaultTextNoteNode(RelVaultNode* nfsNode) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h index b2c05932..73d79f56 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h @@ -48,11 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include #include "HeadSpin.h" -#include "hsStlUtils.h" #include "pyGlueHelpers.h" - +#include #include "pyVaultNode.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp index 66028c3c..ca63bbac 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNodeGlue.cpp @@ -39,10 +39,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyVaultTextNoteNode.h" -#include "plVault/plVault.h" #include +#pragma hdrstop + +#include "pyVaultTextNoteNode.h" +#include "plVault/plVault.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 c52b9e7e..8e888de8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.cpp @@ -39,6 +39,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ + +#include +#include "pyKey.h" +#pragma hdrstop + +#include "pyColor.h" +#include "pyGeometry3.h" #include "pyWaveSet.h" #include "plDrawable/plWaveSet7.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h index d0560da7..d3ad746b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h @@ -42,46 +42,18 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pyWaveSet_h #define pyWaveSet_h -#include -#include "pyKey.h" -#include "pyGeometry3.h" -#include "pyColor.h" - #include "pyGlueHelpers.h" +#include "pnKeyedObject/plKey.h" + +class pyColor; +class pyPoint3; +class pyVector3; ////////////////////////////////////////////////////////////////////// // // pyWaveSet - a wrapper class to provide interface to wave sets // ////////////////////////////////////////////////////////////////////// - -/* -// Getters and Setters for Python twiddling - // - // First a way to set new values. The secs parameter says how long to take - // blending to the new value from the current value. - // - - - - - // Skipping the shore parameters, because they are never used. - - - - - // Now a way to get current values. See the accompanying Setter for notes on - // what the parameter means. - // - - - - - - - - */ - class pyWaveSet { private: diff --git a/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp index a0ef6c00..dac9ed5f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyWaveSetGlue.cpp @@ -39,9 +39,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "pyWaveSet.h" #include +#include "pyGeometry3.h" +#include "pyKey.h" +#pragma hdrstop + +#include "pyColor.h" +#include "pyWaveSet.h" // glue functions PYTHON_CLASS_DEFINITION(ptWaveSet, pyWaveSet); diff --git a/cmake/PrecompiledHeader.cmake b/cmake/PrecompiledHeader.cmake new file mode 100644 index 00000000..8392b2e3 --- /dev/null +++ b/cmake/PrecompiledHeader.cmake @@ -0,0 +1,23 @@ +if(MSVC) + set(PCH_SUPPORTED TRUE) +else() + set(PCH_SUPPORTED FALSE) +endif() + +if(PCH_SUPPORTED) + option(PLASMA_USE_PCH "Enable precompiled headers?" ON) +endif(PCH_SUPPORTED) + +macro(use_precompiled_header PrecompiledHeader PrecompiledSource) + if(PLASMA_USE_PCH) + if(MSVC) + get_filename_component(PrecompiledBasename ${PrecompiledHeader} NAME_WE) + set(PrecompiledBinary ${PrecompiledBasename}.pch) + + add_definitions(/Fp"${PrecompiledBinary}") + add_definitions(/Yu"${PrecompiledHeader}") + add_definitions(/FI"${PrecompiledHeader}") + set_source_files_properties(${PrecompiledSource} PROPERTIES COMPILE_FLAGS "/Yc\"${PrecompiledHeader}\"") + endif(MSVC) + endif(PLASMA_USE_PCH) +endmacro(use_precompiled_header) \ No newline at end of file