Merge branch 'master' into asyncfixes

CMakeLists.txt

@@ -9,7 +9,7 @@ find_package(OpenAL REQUIRED)
 find_package(PythonLibs REQUIRED)
 find_package(EXPAT REQUIRED)
 find_package(ZLIB REQUIRED)
-find_package(PHYSX REQUIRED)  #TODO: Not required if we aren't building the client
+find_package(PhysX REQUIRED)  #TODO: Not required if we aren't building the client
 find_package(Ogg REQUIRED)    #TODO: Not required if we aren't building the client
 find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client
 find_package(Speex REQUIRED)  #TODO: Not required if we aren't building the client
@@ -69,10 +69,21 @@ if(PLASMA_TARGETS STREQUAL "Ethereal")
     add_definitions(-DSTREAM_LOGGER)
 endif(PLASMA_TARGETS STREQUAL "Ethereal")
 
+include(TestBigEndian)
+test_big_endian(BIG_ENDIAN)
+if(BIG_ENDIAN)
+    add_definitions(-DBIG_ENDIAN)
+else()
+    add_definitions(-DLITTLE_ENDIAN)
+endif()
+
 if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
     add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 endif(MSVC)
 
+#TODO: Make the OpenSSL includes less promiscuous so this isn't needed
+include_directories(${OPENSSL_INCLUDE_DIR})
+
 add_subdirectory(Sources/Plasma)
 add_subdirectory(Sources/Tools)

Sources/Plasma/Apps/plClient/CMakeLists.txt

@@ -93,6 +93,9 @@ set(plClient_RESOURCES
 
 add_executable(plClient WIN32 ${plClient_SOURCES} ${plClient_HEADERS}
                               ${plClient_TEXT} ${plClient_RESOURCES})
+if(PLASMA_EXTERNAL_RELEASE)
+    set_target_properties(plClient PROPERTIES OUTPUT_NAME "UruExplorer")
+endif(PLASMA_EXTERNAL_RELEASE)
 target_link_libraries(plClient CoreLib)
 target_link_libraries(plClient CoreLibExe)
 target_link_libraries(plClient pfAnimation)
@@ -184,8 +187,13 @@ target_link_libraries(plClient pnTimer)
 target_link_libraries(plClient pnUtils)
 target_link_libraries(plClient pnUtilsExe)
 
-target_link_libraries(plClient debug ${PYTHON_DEBUG_LIBRARY})
-target_link_libraries(plClient optimized ${PYTHON_LIBRARY})
+if(PYTHON_DEBUG_LIBRARY)
+    target_link_libraries(plClient debug ${PYTHON_DEBUG_LIBRARY})
+    target_link_libraries(plClient optimized ${PYTHON_LIBRARY})
+else()
+    target_link_libraries(plClient ${PYTHON_LIBRARY})
+endif()
+
 target_link_libraries(plClient ${OPENAL_LIBRARY})
 target_link_libraries(plClient ${OPENSSL_LIBRARIES})
 target_link_libraries(plClient ${EXPAT_LIBRARY})

Sources/Plasma/Apps/plClient/res/plClient.rc

@@ -2,15 +2,9 @@
 //
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <afxres.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#define IDC_STATIC              (-1)     // all static controls
 
 /////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
@@ -34,25 +28,8 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include <afxres.h>\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
     "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#endif\r\n"
-    "\r\n"
-    "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""plClient.exe.manifest""\0"
+    "\0"
 END
 
 #endif    // APSTUDIO_INVOKED

Sources/Plasma/Apps/plPlasmaInstaller/plPlasmaInstaller.rc

@@ -2,15 +2,9 @@
 //
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#define IDC_STATIC              (-1)     // all static controls
 
 /////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
@@ -91,7 +85,6 @@ END
 
 2 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "#include ""afxres.h""\r\n"
     "\0"
 END
 

Sources/Plasma/Apps/plPlasmaUpdate/plPlasmaUpdate.rc

@@ -2,15 +2,9 @@
 //
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#define IDC_STATIC              (-1)     // all static controls
 
 /////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
@@ -100,7 +94,6 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
     "\0"
 END
 

Sources/Plasma/Apps/plPythonPack/CMakeLists.txt

@@ -14,8 +14,13 @@ set(plPythonPack_HEADERS
 
 add_executable(plPythonPack ${plPythonPack_SOURCES} ${plPythonPack_HEADERS})
 target_link_libraries(plPythonPack CoreLib CoreLibExe plFile)
-target_link_libraries(plPythonPack debug ${PYTHON_DEBUG_LIBRARY})
-target_link_libraries(plPythonPack optimized ${PYTHON_LIBRARY})
+
+if(PYTHON_DEBUG_LIBRARY)
+    target_link_libraries(plPythonPack debug ${PYTHON_DEBUG_LIBRARY})
+    target_link_libraries(plPythonPack optimized ${PYTHON_LIBRARY})
+else()
+    target_link_libraries(plPythonPack ${PYTHON_LIBRARY})
+endif()
 
 source_group("Source Files" FILES ${plPythonPack_SOURCES})
 source_group("Header Files" FILES ${plPythonPack_HEADERS})

Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt

@@ -29,6 +29,9 @@ set(plUruLauncher_RESOURCES
 
 add_executable(plUruLauncher WIN32 ${plUruLauncher_SOURCES} ${plUruLauncher_HEADERS}
                                    ${plUruLauncher_RESOURCES})
+if(PLASMA_EXTERNAL_RELEASE)
+    set_target_properties(plUruLauncher PROPERTIES OUTPUT_NAME UruLauncher)
+endif(PLASMA_EXTERNAL_RELEASE)
 target_link_libraries(plUruLauncher CoreLib)
 target_link_libraries(plUruLauncher CoreLibExe)
 target_link_libraries(plUruLauncher pfConsoleCore)

Sources/Plasma/Apps/plUruLauncher/plUruLauncher.rc

@@ -2,15 +2,9 @@
 //
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <afxres.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#define IDC_STATIC              (-1)     // all static controls
 
 /////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
@@ -33,12 +27,6 @@ BEGIN
 END
 
 2 TEXTINCLUDE 
-BEGIN
-    "#include <afxres.h>\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"

Sources/Plasma/CoreLib/CMakeLists.txt

@@ -74,6 +74,7 @@ set(CoreLib_HEADERS
     hsScalar.h
     hsStlSortUtils.h
     hsSTLStream.h
+    hsStlUtils.h
     hsStream.h
     hsStringTokenizer.h
     hsTemplates.h

Sources/Plasma/CoreLib/hsMalloc.h

@@ -159,7 +159,7 @@ inline void __cdecl operator delete (void *, void *) {}
 #ifdef __cplusplus
 
 #if !defined(HS_NO_TYPEINFO)
-#include <typeinfo.h>
+#include <typeinfo>
 #endif
 
 #endif // ifdef __cplusplus

Sources/Plasma/CoreLib/hsUtils.h

@@ -50,6 +50,7 @@ char *  hsFormatStrV(const char * fmt, va_list args);   // You are responsible f
 #define strnicmp _strnicmp
 #define wcsicmp _wcsicmp
 #define wcsnicmp _wcsnicmp
+#define strlwr _strlwr
 #else
 #define stricmp strcasecmp
 #define strnicmp strncasecmp

Sources/Plasma/CoreLibExe/CMakeLists.txt

@@ -1,5 +1,7 @@
 add_definitions(-D_LIB)
 
+include_directories("../../Plasma/CoreLib")
+
 set(CoreLibExe_SOURCES
     hsExeError.cpp
     hsExeMalloc.cpp

Sources/Plasma/CoreLibExe/Pch.h

@@ -36,14 +36,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #pragma warning(push, 3)
 
-#include "../CoreLib/HeadSpin.h"
-#include "../CoreLib/hsConfig.h"
-#include "../CoreLib/hsTypes.h"
-#include "../CoreLib/hsWindows.h"
-#include "../CoreLib/hsMalloc.h"
-#include "../CoreLib/hsCritSect.h"
-#include "../CoreLib/hsUtils.h"
-#include "../CoreLib/hsWindows.h"
+#include "HeadSpin.h"
+#include "hsConfig.h"
+#include "hsTypes.h"
+#include "hsWindows.h"
+#include "hsMalloc.h"
+#include "hsCritSect.h"
+#include "hsUtils.h"
+#include "hsWindows.h"
 
 #pragma warning(pop)
 

Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt

@@ -3,11 +3,6 @@ include_directories("../../NucleusLib")
 include_directories("../../NucleusLib/inc")
 include_directories("../../PubUtilLib")
 
-include_directories(${OPENSSL_INCLUDE_DIR})
-
-# this is in the vcproj, but it seems silly for animation...
-# find_package(OpenSSL REQUIRED)
-
 set(pfAnimation_SOURCES
     pfObjectFlocker.cpp
     plAnimDebugList.cpp

Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt

@@ -5,7 +5,6 @@ include_directories(../../NucleusLib/inc)
 include_directories(../../PubUtilLib)
 #include_directories(../../PubUtilLib/inc)
 
-include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${OPENAL_INCLUDE_DIR})
 
 set(pfAudio_SOURCES

Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt

@@ -4,8 +4,6 @@ include_directories(../../NucleusLib)
 include_directories(../../NucleusLib/inc)
 include_directories(../../PubUtilLib)
 
-include_directories(${OPENSSL_INCLUDE_DIR})
-
 set(pfCamera_SOURCES
     pfCameraProxy.cpp
     plCameraBrain.cpp

Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt

@@ -4,8 +4,6 @@ include_directories(../../NucleusLib)
 include_directories(../../NucleusLib/inc)
 include_directories(../../PubUtilLib)
 
-include_directories(${OPENSSL_INCLUDE_DIR})
-
 set(pfCharacter_SOURCES
     pfMarkerInfo.cpp
     pfMarkerMgr.cpp

Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt

@@ -4,7 +4,6 @@ include_directories(../../NucleusLib)
 include_directories(../../NucleusLib/inc)
 include_directories(../../PubUtilLib)
 
-include_directories(${OPENSSL_INCLUDE_DIR})
 include_directories(${OPENAL_INCLUDE_DIR})
 include_directories(${PYTHON_INCLUDE_DIR})
 

Sources/Plasma/FeatureLib/pfConsole/pfAvatarConsoleCommands.cpp

@@ -68,7 +68,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAvatar/plArmatureEffects.h"
 #include "plAvatar/plAvTaskSeek.h"
 
-//#include "../plHavok1/plSimulationMgr.h"
+//#include "plHavok1/plSimulationMgr.h"
 #include "pnNetCommon/plNetApp.h"
 #include "plNetClient/plNetClientMgr.h"
 #include "plDrawable/plInstanceDrawInterface.h"

Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCommandsCore.cpp

@@ -61,14 +61,6 @@ void PrintStringF(void pfun(const char *),const char * fmt, ...)
 *
 ***/
 
-//TODO: Fix Plasma to use OpenSSL's byte order (or better yet, to use OpenSSL),
-//      so this hack isn't needed
-static void swap_key_bytes(byte keyData[])
-{
-    for (size_t i = 0; i < (kNetDiffieHellmanKeyBits / 16); ++i)
-        std::swap(keyData[i], keyData[ (kNetDiffieHellmanKeyBits / 8) - i - 1 ]);
-}
-
 //============================================================================
 // Server group
 PF_CONSOLE_GROUP(Server)
@@ -159,7 +151,6 @@ PF_CONSOLE_CMD(
 
     Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
                  kNetDiffieHellmanKeyBits / 8, kAuthDhNData);
-    swap_key_bytes(kAuthDhNData);
 }
 
 //============================================================================
@@ -178,7 +169,6 @@ PF_CONSOLE_CMD(
 
     Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
                  kNetDiffieHellmanKeyBits / 8, kAuthDhXData);
-    swap_key_bytes(kAuthDhXData);
 }
 
 
@@ -214,7 +204,6 @@ PF_CONSOLE_CMD(
 
     Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
                  kNetDiffieHellmanKeyBits / 8, kCsrDhNData);
-    swap_key_bytes(kCsrDhNData);
 }
 
 //============================================================================
@@ -233,7 +222,6 @@ PF_CONSOLE_CMD(
 
     Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
                  kNetDiffieHellmanKeyBits / 8, kCsrDhXData);
-    swap_key_bytes(kCsrDhXData);
 }
 
 
@@ -257,7 +245,6 @@ PF_CONSOLE_CMD(
 
     Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
                  kNetDiffieHellmanKeyBits / 8, kGameDhNData);
-    swap_key_bytes(kGameDhNData);
 }
 
 //============================================================================
@@ -276,7 +263,6 @@ PF_CONSOLE_CMD(
 
     Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
                  kNetDiffieHellmanKeyBits / 8, kGameDhXData);
-    swap_key_bytes(kGameDhXData);
 }
 
 
@@ -312,7 +298,6 @@ PF_CONSOLE_CMD(
 
     Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
                  kNetDiffieHellmanKeyBits / 8, kGateKeeperDhNData);
-    swap_key_bytes(kGateKeeperDhNData);
 }
 
 //============================================================================
@@ -331,5 +316,4 @@ PF_CONSOLE_CMD(
 
     Base64Decode(hsStrlen((const char *)params[0]), (const char *)params[0],
                  kNetDiffieHellmanKeyBits / 8, kGateKeeperDhXData);
-    swap_key_bytes(kGateKeeperDhXData);
 }

Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleEngine.cpp

@@ -41,6 +41,7 @@ const Int32     pfConsoleEngine::fMaxNumParams = 16;
 static const char kTokenSeparators[] = " =\r\n\t,";
 static const char kTokenGrpSeps[] = " =\r\n._\t,";
 
+//WARNING: Potentially increments the pointer passed to it.
 static char *console_strtok( char *&line, hsBool haveCommand )
 {
     char *begin = line;
@@ -461,6 +462,7 @@ hsBool  pfConsoleEngine::FindPartialCmd( char *line, hsBool findAgain, hsBool pr
     static pfConsoleCmd         *lastCmd = nil;
     static pfConsoleCmdGroup    *lastGroup = nil, *lastParentGroup = nil;
     static char                 newStr[ 256 ];
+    static char                 *originalLine = line;
 
 
     /// Repeat search
@@ -525,13 +527,12 @@ hsBool  pfConsoleEngine::FindPartialCmd( char *line, hsBool findAgain, hsBool pr
     if( preserveParams )
     {
         /// Preserve the rest of the string after the matched command
-        ptr = strtok( nil, "\0" );
-        if( ptr != nil )
-            strcat( newStr, ptr );
+        if( line != nil )
+            strcat( newStr, line );
     }
 
     // Copy back!
-    strcpy( line, newStr );
+    strcpy( originalLine, newStr );
 
     return true;
 }

Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt

@@ -4,8 +4,6 @@ include_directories(../../NucleusLib)
 include_directories(../../NucleusLib/inc)
 include_directories(../../PubUtilLib)
 
-include_directories(${OPENSSL_INCLUDE_DIR})
-
 set(pfGameMgr_SOURCES
     pfGameMgr.cpp
     BlueSpiral/pfGmBlueSpiral.cpp

Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt

@@ -4,8 +4,6 @@ include_directories(../../NucleusLib)
 include_directories(../../NucleusLib/inc)
 include_directories(../../PubUtilLib)
 
-include_directories(${OPENSSL_INCLUDE_DIR})
-
 set(pfJournalBook_SOURCES
     pfJournalBook.cpp
 )

Sources/Plasma/FeatureLib/pfLoginDialog/pfLoginDialog.rc

@@ -2,15 +2,9 @@
 //
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#define IDC_STATIC              (-1)     // all static controls
 
 /////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
@@ -34,7 +28,6 @@ END
 
 2 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "#include ""afxres.h""\r\n"
     "\0"
 END
 

Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt

@@ -7,7 +7,6 @@ include_directories(../../)
 
 include_directories(${PYTHON_INCLUDE_DIR})
 include_directories(${OPENAL_INCLUDE_DIR})
-include_directories(${OPENSSL_INCLUDE_DIR})
 
 set(pfPython_SOURCES
     cyAccountManagement.cpp

Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGameGlue.cpp

@@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyBlueSpiralGame.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyEnum.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsgGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyBlueSpiralMsg.h"
 #include "../../pyEnum.h"
 
-#include <python.h>
+#include <Python.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGameGlue.cpp

@@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyClimbingWallGame.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyEnum.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsgGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyClimbingWallMsg.h"
 #include "../../pyEnum.h"
 
-#include <python.h>
+#include <Python.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGameGlue.cpp

@@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyHeekGame.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyEnum.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsgGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyHeekMsg.h"
 #include "../../pyEnum.h"
 
-#include <python.h>
+#include <Python.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGameGlue.cpp

@@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyMarkerGame.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyEnum.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsgGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyMarkerMsg.h"
 #include "../../pyEnum.h"
 
-#include <python.h>
+#include <Python.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGameGlue.cpp

@@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyTTTGame.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyEnum.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsgGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyTTTMsg.h"
 #include "../../pyEnum.h"
 
-#include <python.h>
+#include <Python.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGameGlue.cpp

@@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyVarSyncGame.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyEnum.h"
 
 ///////////////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsgGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyVarSyncMsg.h"
 #include "../../pyEnum.h"
 
-#include <python.h>
+#include <Python.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../pyGlueHelpers.h"
 #include "../pyKey.h"
 

Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyGameCli.h"
 #include "../pyEnum.h"
 
-#include <python.h>
+#include <Python.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../pyGlueHelpers.h"
 
 class pyGameCliMsg

Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsgGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyGameCliMsg.h"
 #include "../pyEnum.h"
 
-#include <python.h>
+#include <Python.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h

@@ -36,7 +36,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStlUtils.h"
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <python.h>
+#include <Python.h>
 #include "../pyGlueHelpers.h"
 
 class pyGameMgrMsg

Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsgGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyGameMgrMsg.h"
 #include "../pyEnum.h"
 
-#include <python.h>
+#include <Python.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h

@@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // PURPOSE: Python wrapper for account management functions
 //
 
-#include <python.h>
+#include <Python.h>
 #include "hsTypes.h"
 #include "hsStlUtils.h"
 

Sources/Plasma/FeatureLib/pfPython/cyAnimation.h

@@ -36,7 +36,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyKey.h"
 #include "hsTemplates.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class cyAnimation

Sources/Plasma/FeatureLib/pfPython/cyAnimationGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "cyAnimation.h"
 #include "hsUtils.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptAnimation, cyAnimation);

Sources/Plasma/FeatureLib/pfPython/cyAvatar.h

@@ -37,7 +37,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsBitVector.h"
 #include "pnKeyedObject/plKey.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 

Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp

@@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "plAvatar/plAvBrainHuman.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptAvatar, cyAvatar);

Sources/Plasma/FeatureLib/pfPython/cyCamera.h

@@ -37,7 +37,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnKeyedObject/plKey.h"
 class pyKey;
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class cyCamera

Sources/Plasma/FeatureLib/pfPython/cyCameraGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "cyCamera.h"
 #include "pyKey.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptCamera, cyCamera);

Sources/Plasma/FeatureLib/pfPython/cyDraw.h

@@ -36,7 +36,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTemplates.h"
 #include "pnKeyedObject/plKey.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class cyDraw

Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "cyDraw.h"
 #include "pyKey.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptDraw, cyDraw);

Sources/Plasma/FeatureLib/pfPython/cyInputInterface.h

@@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // PURPOSE: Class wrapper to map InputInterface functions to plasma2 message
 //
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class plInputInterface;

Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include "cyInputInterface.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptInputInterface, cyInputInterface);

Sources/Plasma/FeatureLib/pfPython/cyMisc.h

@@ -41,7 +41,7 @@ class pyColor;
 class pyAgeInfoStruct;
 class pyPoint3;
 
-#include <python.h>
+#include <Python.h>
 #include "hsTypes.h"
 #include "hsStlUtils.h"
 #include "pnUtils/pnUtils.h"

Sources/Plasma/FeatureLib/pfPython/cyMiscGlue.cpp

@@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsUtils.h"
 
-#include <python.h>
+#include <Python.h>
 
 PYTHON_GLOBAL_METHOD_DEFINITION_NOARGS(PtGetAgeName, "DEPRECIATED - use ptDniInfoSource instead")
 {

Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plResMgr\plLocalization.h"
 #include "plMessage\plLOSRequestMsg.h"
 
-#include <python.h>
+#include <Python.h>
 
 PYTHON_GLOBAL_METHOD_DEFINITION(PtYesNoDialog, args, "Params: selfkey,dialogMessage\nThis will display a Yes/No dialog to the user with the text dialogMessage\n"
             "This dialog _has_ to be answered by the user.\n"

Sources/Plasma/FeatureLib/pfPython/cyMiscGlue3.cpp

@@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyKey.h"
 #include "pySceneObject.h"
 
-#include <python.h>
+#include <Python.h>
 
 PYTHON_GLOBAL_METHOD_DEFINITION(PtSendPetitionToCCR, args, "Params: message,reason=0,title=\"\"\nSends a petition with a message to the CCR group")
 {

Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp

@@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "NucleusLib/inc/plPipeline.h"
 #include "pnNetBase/pnNetBase.h"
 
-#include <python.h>
+#include <Python.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")
 {

Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h

@@ -37,7 +37,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnKeyedObject/plKey.h"
 class pyKey;
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class cyParticleSys

Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "cyParticleSys.h"
 #include "pyKey.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptParticle, cyParticleSys);

Sources/Plasma/FeatureLib/pfPython/cyPhysics.h

@@ -36,7 +36,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTemplates.h"
 #include "pnKeyedObject/plKey.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyPoint3;

Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp

@@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyGeometry3.h"
 #include "pyMatrix44.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptPhysics, cyPhysics);

Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h

@@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 #include "hsTypes.h"
 #include "hsStlUtils.h"
-#include <python.h>
+#include <Python.h>
 
 #if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 #include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h"

Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h

@@ -38,7 +38,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsGeometry3.h"
 #include "hsResMgr.h"
 
-#include <python.h>
+#include <Python.h>
 
 #include "plPythonParameter.h"
 

Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h

@@ -33,7 +33,7 @@ class plSimpleStateVariable;
 #include "hsStlUtils.h"
 #include "plModifier/plSDLModifier.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 

Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifierGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plPythonSDLModifier.h"
 #include "pyKey.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptSDL, pySDLModifier);

Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp

@@ -107,7 +107,18 @@ const char * pyAgeInfoStruct::GetAgeInstanceGuid() const
 
 void pyAgeInfoStruct::SetAgeInstanceGuid( const char * guid )
 {
-    fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) );
+    if ( guid[0] == '@' )
+    {
+        // if it starts with an @ then do a meta kind of GUID
+        std::string curInst = fAgeInfo.GetAgeInstanceName();
+        std::string y = curInst + guid;
+       
+        plUUID instanceGuid;
+        CryptDigest(kCryptMd5,  instanceGuid.fData , y.length(), y.c_str());
+        fAgeInfo.SetAgeInstanceGuid(&instanceGuid);
+    }
+    else
+        fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) );
 }
 
 Int32 pyAgeInfoStruct::GetAgeSequenceNumber() const

Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h

@@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStlUtils.h"
 #include "plNetCommon/plNetServerSessionInfo.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 //////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStructGlue.cpp

@@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyAgeInfoStruct.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptAgeInfoStruct, pyAgeInfoStruct);

Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h

@@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plNetCommon/plNetServerSessionInfo.h"
 #include "pyAgeInfoStruct.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 //////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStructGlue.cpp

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyAgeLinkStruct.h"
 #include "pySpawnPointInfo.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptAgeLinkStruct, pyAgeLinkStruct);

Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h

@@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "hsStlUtils.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyVaultNode;

Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp

@@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyAgeInfoStruct.h"
 #include "pySDL.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptAgeVault, pyAgeVault);

Sources/Plasma/FeatureLib/pfPython/pyAlarm.h

@@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsTypes.h"
 #include "hsStlUtils.h"
-#include <python.h>
+#include <Python.h>
 
 struct pyAlarm;
 class pyAlarmMgr

Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h

@@ -34,7 +34,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsTypes.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyAudioControl

Sources/Plasma/FeatureLib/pfPython/pyAudioControlGlue.cpp

@@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyAudioControl.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptAudioControl, pyAudioControl);

Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp

@@ -26,4 +26,4 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyCCRMgr.h"
 #include "pyAgeLinkStruct.h"
 
-#include <python.h>
+#include <Python.h>

Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp

@@ -25,4 +25,4 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyCCRMgr.h"
 
-#include <python.h>
+#include <Python.h>

Sources/Plasma/FeatureLib/pfPython/pyCluster.h

@@ -28,7 +28,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pyKey.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 //////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/pyClusterGlue.cpp

@@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyCluster.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptCluster, pyCluster);

Sources/Plasma/FeatureLib/pfPython/pyColor.h

@@ -34,7 +34,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsColorRGBA.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyColor

Sources/Plasma/FeatureLib/pfPython/pyColorGlue.cpp

@@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #include "pyColor.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptColor, pyColor);

Sources/Plasma/FeatureLib/pfPython/pyCritterBrain.h

@@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef _pyCritterBrain_h_
 #define _pyCritterBrain_h_
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 #include "pyKey.h"

Sources/Plasma/FeatureLib/pfPython/pyCritterBrainGlue.cpp

@@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "plMessage/plAIMsg.h"
 
-#include <python.h>
+#include <Python.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 //

Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h

@@ -35,7 +35,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTypes.h"
 #include "hsGeometry3.h"
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class plDniCoordinateInfo;

Sources/Plasma/FeatureLib/pfPython/pyDniCoordinatesGlue.cpp

@@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyGeometry3.h"
 #include "plVault/plDniCoordinateInfo.h"
 
-#include <python.h>
+#include <Python.h>
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptDniCoordinates, pyDniCoordinates);

Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h

@@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStlUtils.h"
 
 
-#include <python.h>
+#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyDniCoordinates;