Merge pull request #141 from branan/mingw

Compilation fixes for mingw

If it breaks, blame Zrax because he was the unlucky guy who got caught AFK.

--HG--
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxStr.cpp => Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxStr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxSync.cpp => Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxSync.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxUuid.cpp => Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxUuid.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/W32Int.h => Sources/Plasma/NucleusLib/pnUtils/Win32/W32Int.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Addr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Dll.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Dll.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Misc.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Misc.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Path.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Path.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Str.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Str.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Sync.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Sync.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Time.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Time.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Uuid.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.h => Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAllIncludes.h => Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtArray.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h => Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.h => Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.h => Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.h => Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCoreLib.h => Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.h => Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtHash.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h => Sources/Plasma/NucleusLib/pnUtils/pnUtHash.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtList.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h => Sources/Plasma/NucleusLib/pnUtils/pnUtList.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMath.h => Sources/Plasma/NucleusLib/pnUtils/pnUtMath.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.h => Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtPath.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.h => Sources/Plasma/NucleusLib/pnUtils/pnUtPath.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPragma.h => Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPriQ.h => Sources/Plasma/NucleusLib/pnUtils/pnUtPriQ.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtRand.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.h => Sources/Plasma/NucleusLib/pnUtils/pnUtRand.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h => Sources/Plasma/NucleusLib/pnUtils/pnUtRef.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSort.h => Sources/Plasma/NucleusLib/pnUtils/pnUtSort.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.h => Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.h => Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSync.h => Sources/Plasma/NucleusLib/pnUtils/pnUtSync.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtTime.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.h => Sources/Plasma/NucleusLib/pnUtils/pnUtTime.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtTls.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.h => Sources/Plasma/NucleusLib/pnUtils/pnUtTls.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h => Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.h

Sources/Plasma/Apps/plClientPatcher/CMakeLists.txt

@@ -18,6 +18,7 @@ set(plClientPatcher_SOURCES
 )
 
 add_library(plClientPatcher STATIC ${plClientPatcher_HEADERS} ${plClientPatcher_SOURCES})
+target_link_libraries(plClientPatcher CoreLib plAudioCore)
 
 source_group("Header Files" FILES ${plClientPatcher_HEADERS})
 source_group("Source Files" FILES ${plClientPatcher_SOURCES})

Sources/Plasma/CoreLib/hsUtils.h

@@ -164,6 +164,8 @@ inline hsBool hsCompare(float a, float b, float delta=0.0001);
 #    define hsSnwprintf     swprintf
 
 #   define hsWFopen(name, mode)     fopen(hsWStringToString(name), hsWStringToString(mode))
+
+#   define MAX_PATH 1024
 #endif
 
 // Useful floating point utilities

Sources/Plasma/CoreLib/hsWindows.h

@@ -58,6 +58,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #      pragma warning( disable : 4305 4503 4018 4786 4284 4800)
 #   endif // _MSC_VER
 
+    // Terrible hacks for MinGW because they don't have a reasonable
+    // default for the Windows version. We cheat and say it's XP.
+#   ifdef __MINGW32__
+#       undef _WIN32_WINNT
+#       define _WIN32_WINNT 0x501
+#       undef _WIN32_IE
+#       define _WIN32_IE    0x400
+#   endif
+
     // Windows.h includes winsock.h (winsocks 1), so we need to manually include winsock2 
     // and tell Windows.h to only bring in modern headers
 #   ifndef MAXPLUGINCODE
@@ -65,7 +74,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #      include <ws2tcpip.h>
 #   endif // MAXPLUGINCODE
 #   define WIN32_LEAN_AND_MEAN
-#   define NOMINMAX // Needed to prevent NxMath conflicts
+#   ifndef NOMINMAX
+#      define NOMINMAX // Needed to prevent NxMath conflicts
+#   endif
 #   include <Windows.h>
     
     typedef HWND hsWindowHndl;

Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp

@@ -977,7 +977,7 @@ plCameraBrain1_Avatar::~plCameraBrain1_Avatar()
         pMsg->SetFadeOut(false);
         pMsg->SetSubjectKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
         pMsg->SetBCastFlag(plMessage::kBCastByExactType);
-        pMsg->SetBCastFlag(plMessage::kNetPropagate, FALSE);
+        pMsg->SetBCastFlag(plMessage::kNetPropagate, false);
         pMsg->AddReceiver(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
         plgDispatch::MsgSend(pMsg);
     }
@@ -1152,7 +1152,7 @@ void plCameraBrain1_Avatar::ISendFadeMsg(hsBool fade)
         pMsg->SetFadeOut(fade);
         pMsg->SetSubjectKey(GetSubject()->GetKey());
         pMsg->SetBCastFlag(plMessage::kBCastByExactType);
-        pMsg->SetBCastFlag(plMessage::kNetPropagate, FALSE);
+        pMsg->SetBCastFlag(plMessage::kNetPropagate, false);
         pMsg->AddReceiver(GetSubject()->GetKey());
         plgDispatch::MsgSend(pMsg);
     }

Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp

@@ -189,7 +189,7 @@ plVirtualCam1::plVirtualCam1()
         wchar_t fileAndPath[MAX_PATH];
         PathGetLogDirectory(fileAndPath, arrsize(fileAndPath));
         PathAddFilename(fileAndPath, fileAndPath, L"camLog.txt", arrsize(fileAndPath));
-        foutLog = _wfopen( fileAndPath, L"wt" );
+        foutLog = hsWFopen( fileAndPath, L"wt" );
     }
 #endif
 
@@ -1306,7 +1306,7 @@ hsBool plVirtualCam1::MsgReceive(plMessage* msg)
                 pMsg->SetFadeOut(true);
                 pMsg->SetSubjectKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
                 pMsg->SetBCastFlag(plMessage::kBCastByExactType);
-                pMsg->SetBCastFlag(plMessage::kNetPropagate, FALSE);
+                pMsg->SetBCastFlag(plMessage::kNetPropagate, false);
                 pMsg->AddReceiver(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
                 plgDispatch::MsgSend(pMsg);
                 return true;

Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp

@@ -45,6 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////
 
+#include "pfPython/cyPythonInterface.h"
+
 #include "HeadSpin.h"
 #include "pfConsole.h"
 #include "pfConsoleCore/pfConsoleEngine.h"
@@ -62,7 +64,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plgDispatch.h"
 #include "plPipeline.h"
 
-#include "pfPython/cyPythonInterface.h"
 #include "plNetClient/plNetClientMgr.h"
 
 #ifndef PLASMA_EXTERNAL_RELEASE
@@ -1214,7 +1215,7 @@ void pfConsole::AddLineF(const char * fmt, ...) {
     char str[1024];
     va_list args;
     va_start(args, fmt);
-    _vsnprintf(str, arrsize(str), fmt, args);
+    hsVsnprintf(str, arrsize(str), fmt, args);
     va_end(args);
     AddLine(str);
 }

Sources/Plasma/FeatureLib/pfConsole/pfConsole.h

@@ -117,7 +117,7 @@ class pfConsole : public hsKeyedObject
 
         static uint32_t       fConsoleTextColor;
         static pfConsole    *fTheConsole;
-        static void _cdecl IAddLineCallback( const char *string );
+        static void CDECL IAddLineCallback( const char *string );
 
         static plPipeline   *fPipeline;
 

Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp

@@ -49,6 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define LIMIT_CONSOLE_COMMANDS 1
 #endif
 
+#include "pfPython/cyPythonInterface.h"
+#include "pfPython/plPythonSDLModifier.h"
 
 #include "pfConsoleCore/pfConsoleCmd.h"
 #include "plgDispatch.h"
@@ -163,10 +165,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsStlUtils.h"
 #include "hsTemplates.h"
 
-
-#include "pfPython/cyPythonInterface.h"
-#include "pfPython/plPythonSDLModifier.h"
-
 #include "plResMgr/plResManagerHelper.h"
 #include "plResMgr/plResMgrSettings.h"
 #include "plResMgr/plLocalization.h"
@@ -2466,11 +2464,10 @@ PF_CONSOLE_CMD( App,            // groupName
                "",              // paramList
                "Quit the client app" ) // helpString
 {
-    if( plClient::GetInstance() )
+    if( plClient::GetInstance() ) {
-        PostMessage(plClient::GetInstance()->GetWindowHandle(), 
+        plClientMsg* msg = new plClientMsg(plClientMsg::kQuit);
-            WM_SYSCOMMAND,
+        msg->Send(hsgResMgr::ResMgr()->FindKey(kClient_KEY));
-            SC_CLOSE,
+    }
-            0);
 }
 
 #ifndef LIMIT_CONSOLE_COMMANDS
@@ -2510,8 +2507,12 @@ PF_CONSOLE_CMD(App,
                "",
                "Set low priority for this process")
 {
+#if HS_BUILD_FOR_WIN32
     SetPriorityClass( GetCurrentProcess(), IDLE_PRIORITY_CLASS );
     PrintString( "Set process priority to lowest setting" );
+#else
+    PrintString("Not implemented on your platform!");
+#endif
 }
 
 
@@ -3933,6 +3934,8 @@ PF_CONSOLE_CMD( Nav, PageInNodeList,    // Group name, Function name
                "string roomNameBase",           // Params
                "Pages in all scene nodes that start with name." )   // Help string
 {
+/* This is really old and hasn't worked since 2002 anyways. */
+#if HS_BUILD_FOR_WIN32
     plSynchEnabler ps(false);   // disable dirty tracking while paging in
 
     std::string pageInNodesStr;
@@ -3950,6 +3953,7 @@ PF_CONSOLE_CMD( Nav, PageInNodeList,    // Group name, Function name
     }
     pMsg1->AddReceiver( plClient::GetInstance()->GetKey() );
     plgDispatch::MsgSend(pMsg1);
+#endif
 }
 
 #ifndef LIMIT_CONSOLE_COMMANDS

Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp

@@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #endif
 
 
+#include "pfPython/plPythonSDLModifier.h"
 #include "pfConsoleCore/pfConsoleCmd.h"
 #include "plgDispatch.h"
 
@@ -355,7 +356,8 @@ PF_CONSOLE_CMD( Net,        // groupName
     link.GetAgeInfo()->SetAgeFilename( params[0] );
     //link.GetAgeInfo()->SetAgeInstanceName( params[0] );
     //link.GetAgeInfo()->SetAgeUserDefinedName( params[0] );
-    link.GetAgeInfo()->SetAgeInstanceGuid( &plUUID( params[1] ) );
+    plUUID guid(params[1]);
+    link.GetAgeInfo()->SetAgeInstanceGuid( &guid );
     link.SetLinkingRules( plNetCommon::LinkingRules::kBasicLink );
     plNetLinkingMgr::GetInstance()->LinkToAge( &link );
     PrintString("Linking to age...");
@@ -637,7 +639,6 @@ PF_CONSOLE_CMD( Net_DebugObject,        // groupName
         plNetObjectDebugger::GetInstance()->ClearAllDebugObjects();
 }
 
-#include "pfPython/plPythonSDLModifier.h"
 PF_CONSOLE_CMD( Net_DebugObject,        // groupName
                DumpAgeSDLHook,      // fxnName
                "bool dirtyOnly", // paramList
@@ -810,7 +811,8 @@ PF_CONSOLE_CMD( Net_Vault,
     plAgeLinkStruct link;
     link.GetAgeInfo()->SetAgeFilename( params[0] );
     link.GetAgeInfo()->SetAgeInstanceName( params[0] );
-    link.GetAgeInfo()->SetAgeInstanceGuid( &plUUID(GuidGenerate()));
+    plUUID guid(GuidGenerate());
+    link.GetAgeInfo()->SetAgeInstanceGuid( &guid);
     link.SetSpawnPoint( kDefaultSpawnPoint );
     bool success = VaultRegisterOwnedAgeAndWait(&link);
     PrintStringF(PrintString, "Operation %s.", success ? "Successful" : "Failed");
@@ -837,7 +839,8 @@ PF_CONSOLE_CMD( Net_Vault,
     plAgeLinkStruct link;
     link.GetAgeInfo()->SetAgeFilename( params[0] );
     link.GetAgeInfo()->SetAgeInstanceName( params[0] );
-    link.GetAgeInfo()->SetAgeInstanceGuid( &plUUID(GuidGenerate()));
+    plUUID guid(GuidGenerate());
+    link.GetAgeInfo()->SetAgeInstanceGuid( &guid);
     link.SetSpawnPoint( kDefaultSpawnPoint );
     bool success = VaultRegisterOwnedAgeAndWait(&link);
     PrintStringF(PrintString, "Operation %s.", success ? "Successful" : "Failed");

Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp

@@ -1841,7 +1841,7 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
             }
             else if( lastParChunk != nil )
             {
-                uint32_t count = ((uint32_t)c - (uint32_t)start)/2; // wchar_t is 2 bytes
+                uint32_t count = ((uintptr_t)c - (uintptr_t)start)/2; // wchar_t is 2 bytes
                 
                 wchar_t *temp = new wchar_t[ count + 1 ];
                 wcsncpy( temp, start, count );
@@ -1901,7 +1901,7 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
                         }
                         else if( wcsicmp( name, L"link" ) == 0 )
                         {
-                            chunk->fEventID = _wtoi( option );
+                            chunk->fEventID = wcstol(option, NULL, 0);
                             chunk->fFlags |= pfEsHTMLChunk::kCanLink;
                         }
                         else if( wcsicmp( name, L"blend" ) == 0 )
@@ -1917,10 +1917,10 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
                             if( comma != nil )
                             {
 
-                                chunk->fAbsoluteY = _wtoi( comma + 1 );
+                                chunk->fAbsoluteY = wcstol(comma + 1, NULL, 0);
                                 *comma = 0;
                             }
-                            chunk->fAbsoluteX = _wtoi( option );
+                            chunk->fAbsoluteX = wcstol(option, NULL, 0);
                         }
                         else if( wcsicmp( name, L"glow" ) == 0 )
                         {
@@ -1961,7 +1961,7 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
                                 wchar_t *comma2 = wcschr( comma + 1, L',' );
                                 if( comma2 != nil )
                                 {
-                                    if( _wtoi( comma2 + 1 ) != 0 )
+                                    if( wcstol(comma2 + 1, NULL, 0) != 0 )
                                         chunk->fFlags |= pfEsHTMLChunk::kChecked;
                                     *comma2 = 0;
                                 }
@@ -2089,7 +2089,7 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
                         }
                         else if( wcsicmp( name, L"size" ) == 0 )
                         {
-                            chunk->fFontSize = _wtoi( option );
+                            chunk->fFontSize = wcstol(option, NULL, 0);
                             if (fBookGUIs[fCurBookGUI]->IsEditable())
                             {
                                 fBookGUIs[fCurBookGUI]->GetEditCtrl(pfJournalDlgProc::kTagRightEditCtrl)->SetFontSize(chunk->fFontSize);
@@ -2112,7 +2112,7 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
                         }
                         else if( wcsicmp( name, L"spacing" ) == 0 )
                         {
-                            chunk->fLineSpacing = _wtoi(option);
+                            chunk->fLineSpacing = wcstol(option, NULL, 0);
                             chunk->fFlags |= pfEsHTMLChunk::kFontSpacing;
                         }
                     }
@@ -2127,13 +2127,13 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
                     while(IGetNextOption(c,name,option))
                     {
                         if (wcsicmp(name,L"top") == 0)
-                            fPageTMargin = _wtoi(option);
+                            fPageTMargin = wcstol(option, NULL, 0);
                         else if (wcsicmp(name,L"left") == 0)
-                            fPageLMargin = _wtoi(option);
+                            fPageLMargin = wcstol(option, NULL, 0);
                         else if (wcsicmp(name,L"bottom") == 0)
-                            fPageBMargin = _wtoi(option);
+                            fPageBMargin = wcstol(option, NULL, 0);
                         else if (wcsicmp(name,L"right") == 0)
-                            fPageRMargin = _wtoi(option);
+                            fPageRMargin = wcstol(option, NULL, 0);
                     }
                     // set the edit controls to the margins we just set
                     if (fBookGUIs[fCurBookGUI]->IsEditable())
@@ -2203,10 +2203,10 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
                             if( comma != nil )
                             {
 
-                                chunk->fAbsoluteY = _wtoi( comma + 1 );
+                                chunk->fAbsoluteY = wcstol(comma + 1, NULL, 0);
                                 *comma = 0;
                             }
-                            chunk->fAbsoluteX = _wtoi( option );
+                            chunk->fAbsoluteX = wcstol(option, NULL, 0);
                         }
                         else if (wcsicmp(name,L"resize")==0)
                         {
@@ -2251,7 +2251,7 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
                         }
                         else if( wcsicmp( name, L"link" ) == 0 )
                         {
-                            chunk->fEventID = _wtoi( option );
+                            chunk->fEventID = wcstol(option, NULL, 0);
                             chunk->fFlags |= pfEsHTMLChunk::kCanLink;
                         }
                         else if( wcsicmp( name, L"pos" ) == 0 )
@@ -2262,10 +2262,10 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
                             if( comma != nil )
                             {
 
-                                chunk->fAbsoluteY = _wtoi( comma + 1 );
+                                chunk->fAbsoluteY = wcstol(comma + 1, NULL, 0);
                                 *comma = 0;
                             }
-                            chunk->fAbsoluteX = _wtoi( option );
+                            chunk->fAbsoluteX = wcstol(option, NULL, 0);
                         }
                         else if (wcsicmp(name,L"resize")==0)
                         {
@@ -2336,7 +2336,7 @@ hsBool  pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
     }
     else if( lastParChunk != nil )
     {
-        uint32_t count = (uint32_t)c - (uint32_t)start;
+        uint32_t count = (uintptr_t)c - (uintptr_t)start;
         
         wchar_t *temp = new wchar_t[ count + 1 ];
         wcsncpy( temp, start, count + 1 );
@@ -2422,7 +2422,7 @@ hsBool  pfJournalBook::IGetNextOption( const wchar_t *&string, wchar_t *name, wc
         return false;
 
     // Copy name
-    uint32_t len = ((uint32_t)string - (uint32_t)c)/2; // divide length by 2 because each character is two bytes
+    uint32_t len = ((uintptr_t)string - (uintptr_t)c)/2; // divide length by 2 because each character is two bytes
     wcsncpy( name, c, len );
     name[len] = L'\0';
 
@@ -2442,7 +2442,7 @@ hsBool  pfJournalBook::IGetNextOption( const wchar_t *&string, wchar_t *name, wc
         while( *string != L'>' && *string != L'\"' && *string != L'\0' )
             string++;
 
-        len = ((uint32_t)string - (uint32_t)c)/2; // divide length by 2 because each character is two bytes
+        len = ((uintptr_t)string - (uintptr_t)c)/2; // divide length by 2 because each character is two bytes
         wcsncpy( option, c, len );
         option[len] = L'\0';
         
@@ -2457,7 +2457,7 @@ hsBool  pfJournalBook::IGetNextOption( const wchar_t *&string, wchar_t *name, wc
     while( *string != L' ' && *string != L'>' && *string != L'\0' )
         string++;
 
-    len = ((uint32_t)string - (uint32_t)c)/2; // divide length by 2 because each character is two bytes
+    len = ((uintptr_t)string - (uintptr_t)c)/2; // divide length by 2 because each character is two bytes
     wcsncpy( option, c, len );
     option[len] = L'\0';
     

Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h

@@ -99,4 +99,4 @@ REGISTER_CREATABLE(pfBackdoorMsg);
 
 REGISTER_CREATABLE(pfMovieEventMsg);
 
-#endif pfMessageCreatable_inc
+#endif //pfMessageCreatable_inc

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for the BlueSpiral game client
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for BlueSpiral game messages
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for the climbing wall game client
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for ClimbingWall game messages
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

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

@@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // PURPOSE: Class wrapper for the Heek game client
 //
 
+#include <Python.h>
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for Heek game messages
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for the Marker game client
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for Marker game messages
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for the TTT game client
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for TTT game messages
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for the VarSync game client
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCli.h"
 #include "../../pyKey.h"

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for VarSync game messages
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../../pyGlueHelpers.h"
 #include "../pyGameCliMsg.h"
 

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

@@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // PURPOSE: Class wrapper for the game client base class
 //
 
+#include <Python.h>
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../pyGlueHelpers.h"
 #include "../pyKey.h"
 

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

@@ -42,11 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyGameCliMsg.h"
 #include "pyGameCli.h"
 
-#include "TicTacToe\pyTTTMsg.h"
+#include "TicTacToe/pyTTTMsg.h"
-#include "Heek\pyHeekMsg.h"
+#include "Heek/pyHeekMsg.h"
-#include "Marker\pyMarkerMsg.h"
+#include "Marker/pyMarkerMsg.h"
-#include "BlueSpiral\pyBlueSpiralMsg.h"
+#include "BlueSpiral/pyBlueSpiralMsg.h"
-#include "ClimbingWall\pyClimbingWallMsg.h"
+#include "ClimbingWall/pyClimbingWallMsg.h"
 #include "VarSync/pyVarSyncMsg.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -239,4 +239,4 @@ unsigned long pyGameCliOwnerChangeMsg::OwnerID() const
         return gmMsg->ownerId;
     }
     return 0;
-}
+}

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

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for game client messages
 //
+#include <Python.h>
 
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../pyGlueHelpers.h"
 
 class pyGameCliMsg

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

@@ -49,10 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // PURPOSE: Class wrapper for game manager messages
 //
 
+#include <Python.h>
 #include "hsStlUtils.h"
 #include "pfGameMgr/pfGameMgr.h"
 
-#include <Python.h>
 #include "../pyGlueHelpers.h"
 
 class pyGameMgrMsg

Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp

@@ -46,11 +46,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // PURPOSE: Class wrapper to map animation functions to plasma2 message
 //
 
+#include "cyAnimation.h"
 #include "plgDispatch.h"
 #include "plMessage/plAnimCmdMsg.h"
 #include "pnMessage/plEventCallbackMsg.h"
 
-#include "cyAnimation.h"
 
 cyAnimation::cyAnimation()
 {

Sources/Plasma/FeatureLib/pfPython/cyAnimation.h

@@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper to map animation functions to plasma2 message
 //
+#include <Python.h>
 
 #include "pyKey.h"
 #include "hsTemplates.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class cyAnimation

Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp

@@ -118,7 +118,8 @@ void cyAvatar::SetNetForce(hsBool state)
 
 void cyAvatar::SetSenderKey(pyKey& pKey)
 {
-    SetSender(pKey.getKey());
+    plKey k = pKey.getKey();
+    SetSender(k);
 }
 
 

Sources/Plasma/FeatureLib/pfPython/cyAvatar.h

@@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper to map animation functions to plasma2 message
 //
+#include <Python.h>
 #include "hsStlUtils.h"
 #include "hsTemplates.h"
 #include "hsBitVector.h"
 #include "pnKeyedObject/plKey.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 

Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp

@@ -803,10 +803,10 @@ PYTHON_CLASS_NEW_IMPL(ptAvatar, cyAvatar)
 static PyObject* New(PyObject* sender, PyObject* recvr = nil)
 {
     ptAvatar* newObj = (ptAvatar*)ptAvatar_type.tp_new(&ptAvatar_type, NULL, NULL);
-    pyKey* senderKey = pyKey::ConvertFrom(sender);
+    plKey senderKey = pyKey::ConvertFrom(sender)->getKey();
-    pyKey* recvrKey = pyKey::ConvertFrom(recvr);
+    plKey recvrKey = pyKey::ConvertFrom(recvr)->getKey();
-    newObj->fThis->SetSender(senderKey->getKey());
+    newObj->fThis->SetSender(senderKey);
-    newObj->fThis->AddRecvr(recvrKey->getKey());
+    newObj->fThis->AddRecvr(recvrKey);
     newObj->fThis->SetNetForce(false);
     return (PyObject*) newObj;
 }

Sources/Plasma/FeatureLib/pfPython/cyCamera.h

@@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper to map camera functions to plasma2 message
 //
+#include <Python.h>
 #include "HeadSpin.h"
 
 #include "pnKeyedObject/plKey.h"
 class pyKey;
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class cyCamera

Sources/Plasma/FeatureLib/pfPython/cyDraw.h

@@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper to map draw functions to plasma2 message
 //
+#include <Python.h>
 
 #include "hsTemplates.h"
 #include "pnKeyedObject/plKey.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class cyDraw

Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp

@@ -97,13 +97,13 @@ PyObject *cyDraw::New(PyObject *sender, PyObject *recvr)
     ptDraw *newObj = (ptDraw*)ptDraw_type.tp_new(&ptDraw_type, NULL, NULL);
     if (sender != NULL)
     {
-        pyKey *senderKey = pyKey::ConvertFrom(sender);
+        plKey senderKey = pyKey::ConvertFrom(sender)->getKey();
-        newObj->fThis->SetSender(senderKey->getKey());
+        newObj->fThis->SetSender(senderKey);
     }
     if (recvr != NULL)
     {
-        pyKey *recvrKey = pyKey::ConvertFrom(recvr);
+        plKey recvrKey = pyKey::ConvertFrom(recvr)->getKey();
-        newObj->fThis->AddRecvr(recvrKey->getKey());
+        newObj->fThis->AddRecvr(recvrKey);
     }
     newObj->fThis->fNetForce = false;
 
@@ -122,4 +122,4 @@ void cyDraw::AddPlasmaClasses(PyObject *m)
     PYTHON_CLASS_IMPORT_START(m);
     PYTHON_CLASS_IMPORT(m, ptDraw);
     PYTHON_CLASS_IMPORT_END(m);
-}
+}

Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp

@@ -39,10 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "HeadSpin.h"
-#include "cyInputInterface.h"
-
 #include <Python.h>
+#include "cyInputInterface.h"
+#include "HeadSpin.h"
 
 // glue functions
 PYTHON_CLASS_DEFINITION(ptInputInterface, cyInputInterface);
@@ -80,4 +79,4 @@ void cyInputInterface::AddPlasmaClasses(PyObject *m)
     PYTHON_CLASS_IMPORT_START(m);
     PYTHON_CLASS_IMPORT(m, ptInputInterface);
     PYTHON_CLASS_IMPORT_END(m);
-}
+}

Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp

@@ -1319,7 +1319,8 @@ void cyMisc::SetPrivateChatList(const std::vector<pyPlayer*> & tolist)
         for (int i=0 ; i<tolist.size() ; i++ )
             pMsg->GetClientList()->Append(tolist[i]->GetPlayerID());
         
-        pMsg->SetRemovedKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
+        plKey k = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
+        pMsg->SetRemovedKey(k);
         pMsg->Send();
     }
 }
@@ -1336,7 +1337,8 @@ void cyMisc::SetPrivateChatList(const std::vector<pyPlayer*> & tolist)
 void cyMisc::ClearPrivateChatList(pyKey& member)
 {
     plNetVoiceListMsg* pMsg = new plNetVoiceListMsg(plNetVoiceListMsg::kDistanceMode);
-    pMsg->SetRemovedKey( member.getKey() );
+    plKey k = member.getKey();
+    pMsg->SetRemovedKey(k);
     pMsg->Send();
 }
 
@@ -1550,7 +1552,7 @@ void cyMisc::EnableAvatarCursorFade()
         plIfaceFadeAvatarMsg* iMsg = new plIfaceFadeAvatarMsg;
         iMsg->SetSubjectKey(nmgr->GetLocalPlayerKey());
         iMsg->SetBCastFlag(plMessage::kBCastByExactType);
-        iMsg->SetBCastFlag(plMessage::kNetPropagate, FALSE);
+        iMsg->SetBCastFlag(plMessage::kNetPropagate, false);
         iMsg->Enable();
         iMsg->Send();
     }
@@ -1564,7 +1566,7 @@ void cyMisc::DisableAvatarCursorFade()
         plIfaceFadeAvatarMsg* iMsg = new plIfaceFadeAvatarMsg;
         iMsg->SetSubjectKey(nmgr->GetLocalPlayerKey());
         iMsg->SetBCastFlag(plMessage::kBCastByExactType);
-        iMsg->SetBCastFlag(plMessage::kNetPropagate, FALSE);
+        iMsg->SetBCastFlag(plMessage::kNetPropagate, false);
         iMsg->Disable();
         iMsg->Send();
     }
@@ -1579,7 +1581,7 @@ void cyMisc::FadeLocalPlayer(hsBool fade)
         pMsg->SetFadeOut(fade);
         pMsg->SetSubjectKey(nmgr->GetLocalPlayerKey());
         pMsg->SetBCastFlag(plMessage::kBCastByExactType);
-        pMsg->SetBCastFlag(plMessage::kNetPropagate, FALSE);
+        pMsg->SetBCastFlag(plMessage::kNetPropagate, false);
         pMsg->AddReceiver(nmgr->GetLocalPlayerKey());
         plgDispatch::MsgSend(pMsg);
     }
@@ -1661,7 +1663,8 @@ void cyMisc::ToggleAvatarClickability(hsBool on)
         pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kGUIEnableAvatarClickable);
     else
         pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kGUIDisableAvatarClickable);
-    pMsg->SetAvKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
+    plKey k = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
+    pMsg->SetAvKey(k);
     pMsg->SetBCastFlag(plMessage::kNetPropagate);
     pMsg->SetBCastFlag(plMessage::kNetForce);
     pMsg->Send();
@@ -1671,7 +1674,8 @@ void cyMisc::ToggleAvatarClickability(hsBool on)
 void cyMisc::SetShareSpawnPoint(const char* spawnPoint)
 {
     plInputIfaceMgrMsg* pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kSetShareSpawnPoint);
-    pMsg->SetSender(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
+    plKey k = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
+    pMsg->SetSender(k);
     pMsg->SetSpawnPoint(spawnPoint);
     pMsg->Send();
 }
@@ -1679,7 +1683,8 @@ void cyMisc::SetShareSpawnPoint(const char* spawnPoint)
 void cyMisc::SetShareAgeInstanceGuid(const Uuid& guid)
 {
     plInputIfaceMgrMsg* pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kSetShareAgeInstanceGuid);
-    pMsg->SetSender(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
+    plKey k = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
+    pMsg->SetSender(k);
     pMsg->SetAgeInstanceGuid(guid);
     pMsg->Send();
 }
@@ -2427,7 +2432,7 @@ int cyMisc::GetKILevel()
     StrToUnicode(wStr, pfKIMsg::kChronicleKILevel, arrsize(wStr));
     if (RelVaultNode * rvn = VaultFindChronicleEntryIncRef(wStr)) {
         VaultChronicleNode chron(rvn);
-        result = _wtoi(chron.entryValue);
+        result = wcstol(chron.entryValue, nil, 0);
         rvn->DecRef();
     }
     

Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp

@@ -39,6 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+#include <Python.h>
 #include "cyMisc.h"
 #include "pyGlueHelpers.h"
 #include "pyKey.h"
@@ -47,11 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyEnum.h"
 
 // for enums
-#include "plNetCommon\plNetCommon.h"
+#include "plNetCommon/plNetCommon.h"
-#include "plResMgr\plLocalization.h"
+#include "plResMgr/plLocalization.h"
-#include "plMessage\plLOSRequestMsg.h"
+#include "plMessage/plLOSRequestMsg.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/cyParticleSys.h

@@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper to for Particle System
 //
+#include <Python.h>
 #include "hsTemplates.h"
 
 #include "pnKeyedObject/plKey.h"
 class pyKey;
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class cyParticleSys

Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp

@@ -120,13 +120,13 @@ PyObject *cyParticleSys::New(PyObject *sender, PyObject *recvr)
     ptParticle *newObj = (ptParticle*)ptParticle_type.tp_new(&ptParticle_type, NULL, NULL);
     if (sender != NULL)
     {
-        pyKey *senderKey = pyKey::ConvertFrom(sender);
+        plKey senderKey = pyKey::ConvertFrom(sender)->getKey();
-        newObj->fThis->SetSender(senderKey->getKey());
+        newObj->fThis->SetSender(senderKey);
     }
     if (recvr != NULL)
     {
-        pyKey *recvrKey = pyKey::ConvertFrom(recvr);
+        plKey recvrKey = pyKey::ConvertFrom(recvr)->getKey();
-        newObj->fThis->AddRecvr(recvrKey->getKey());
+        newObj->fThis->AddRecvr(recvrKey);
     }
     newObj->fThis->SetNetForce(false);
     return (PyObject*)newObj;

Sources/Plasma/FeatureLib/pfPython/cyPhysics.h

@@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper to map animation functions to plasma2 message
 //
+#include <Python.h>
 
 #include "hsTemplates.h"
 #include "pnKeyedObject/plKey.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyPoint3;

Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp

@@ -396,13 +396,13 @@ PyObject *cyPhysics::New(PyObject *sender, PyObject *recvr)
     ptPhysics *newObj = (ptPhysics*)ptPhysics_type.tp_new(&ptPhysics_type, NULL, NULL);
     if (sender != NULL)
     {
-        pyKey *senderKey = pyKey::ConvertFrom(sender);
+        plKey senderKey = pyKey::ConvertFrom(sender)->getKey();
-        newObj->fThis->SetSender(senderKey->getKey());
+        newObj->fThis->SetSender(senderKey);
     }
     if (recvr != NULL)
     {
-        pyKey *recvrKey = pyKey::ConvertFrom(recvr);
+        plKey recvrKey = pyKey::ConvertFrom(recvr)->getKey();
-        newObj->fThis->AddRecvr(recvrKey->getKey());
+        newObj->fThis->AddRecvr(recvrKey);
     }
     newObj->fThis->SetNetForce(false);
     return (PyObject*)newObj;
@@ -420,4 +420,4 @@ void cyPhysics::AddPlasmaClasses(PyObject *m)
     PYTHON_CLASS_IMPORT_START(m);
     PYTHON_CLASS_IMPORT(m, ptPhysics);
     PYTHON_CLASS_IMPORT_END(m);
-}
+}

Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h

@@ -46,9 +46,9 @@ 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 <Python.h>
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
-#include <Python.h>
 
 #if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
 #include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h"

Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp

@@ -46,6 +46,7 @@ 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 "HeadSpin.h"
 #include "hsStream.h"
@@ -97,7 +98,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "plProfile.h"
 
-#include "plPythonFileMod.h"
 #include "cyPythonInterface.h"
 #include "pyKey.h"
 #include "cyDraw.h"

Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h

@@ -49,12 +49,12 @@ 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 <Python.h>
 
 #include "pnModifier/plMultiModifier.h"
 #include "hsGeometry3.h"
 #include "hsResMgr.h"
 
-#include <Python.h>
 
 #include "plPythonParameter.h"
 

Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp

@@ -39,9 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+#include "plPythonPack.h"
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
-#include "plPythonPack.h"
 #include "hsStream.h"
 #include "plFile/hsFiles.h"
 #include "plFile/plSecureStream.h"

Sources/Plasma/FeatureLib/pfPython/plPythonPack.h

@@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef plPythonPack_h_inc
 #define plPythonPack_h_inc
 
-#include "Python.h"
+#include <Python.h>
 #include "HeadSpin.h"
 
 namespace PythonPack

Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp

@@ -39,7 +39,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include "HeadSpin.h"
 #include "plPythonSDLModifier.h"
 #include "cyPythonInterface.h"
 

Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h

@@ -46,10 +46,12 @@ class plPythonFileMod;
 class plStateDataRecord;
 class plSimpleStateVariable;
 
+#include <Python.h>
+
+#include "HeadSpin.h"
 #include "hsStlUtils.h"
 #include "plModifier/plSDLModifier.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 

Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp

@@ -39,9 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+#include "pyAgeInfoStruct.h"
 #include "hsStlUtils.h"
+#include "pnUtils/pnUtCrypt.h"
 
-#include "pyAgeInfoStruct.h"
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -133,8 +134,10 @@ void pyAgeInfoStruct::SetAgeInstanceGuid( const char * guid )
         CryptDigest(kCryptMd5,  instanceGuid.fData , y.length(), y.c_str());
         fAgeInfo.SetAgeInstanceGuid(&instanceGuid);
     }
-    else
+    else {
-        fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) );
+        plUUID temp(guid);
+        fAgeInfo.SetAgeInstanceGuid( &temp );
+    }
 }
 
 int32_t pyAgeInfoStruct::GetAgeSequenceNumber() const
@@ -220,7 +223,8 @@ const char * pyAgeInfoStructRef::GetAgeInstanceGuid() const
 
 void pyAgeInfoStructRef::SetAgeInstanceGuid( const char * guid )
 {
-    fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) );
+    plUUID tmp(guid);
+    fAgeInfo.SetAgeInstanceGuid( &tmp );
 }
 
 int32_t pyAgeInfoStructRef::GetAgeSequenceNumber() const

Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h

@@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #ifndef pyAgeInfoStruct_h_inc
 #define pyAgeInfoStruct_h_inc
+#include <Python.h>
 
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
 #include "plNetCommon/plNetServerSessionInfo.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 //////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp

@@ -39,9 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+#include "pyAgeLinkStruct.h"
 #include "hsStlUtils.h"
 
-#include "pyAgeLinkStruct.h"
 #include "pySpawnPointInfo.h"
 
 ///////////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h

@@ -42,12 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pyAgeLinkStruct_h_inc
 #define pyAgeLinkStruct_h_inc
 
+#include <Python.h>
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
 #include "plNetCommon/plNetServerSessionInfo.h"
 #include "pyAgeInfoStruct.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 //////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h

@@ -51,11 +51,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // pyAgeVault   - a wrapper class to provide interface to the plVaultAgeNode
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyVaultNode;

Sources/Plasma/FeatureLib/pfPython/pyAlarm.h

@@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pyAlarm_h_inc
 #define pyAlarm_h_inc
 
+#include <Python.h>
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
-#include <Python.h>
 
 struct pyAlarm;
 class pyAlarmMgr

Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h

@@ -48,9 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 //////////////////////////////////////////////////////////////////////
 
+#include <Python.h>
 #include "HeadSpin.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyAudioControl

Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp

@@ -39,7 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+#include <Python.h>
 #include "pyCCRMgr.h"
 #include "pyAgeLinkStruct.h"
 
-#include <Python.h>

Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp

@@ -39,6 +39,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+#include <Python.h>
 #include "pyCCRMgr.h"
 
-#include <Python.h>

Sources/Plasma/FeatureLib/pfPython/pyCluster.h

@@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pyCluster_h
 #define pyCluster_h
 
+#include <Python.h>
 #include "pyKey.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 //////////////////////////////////////////////////////////////////////
@@ -79,4 +79,4 @@ public:
 };
 
 
-#endif // pyCluster_h
+#endif // pyCluster_h

Sources/Plasma/FeatureLib/pfPython/pyColor.h

@@ -47,10 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // pyColor   - the wrapper class for hsColorRGBA structure
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "hsColorRGBA.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyColor

Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 //////////////////////////////////////////////////////////////////////
 
+#include <Python.h>
 #include "HeadSpin.h"
 #include "hsGeometry3.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class plDniCoordinateInfo;

Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp

@@ -39,11 +39,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
+#include "pyDniInfoSource.h"
 #include "pnUtils/pnUtils.h"
 #include "plUnifiedTime/plUnifiedTime.h"
 #include "plVault/plAgeInfoSource.h"
 #include "plVault/plVault.h"
-#include "pyDniInfoSource.h"
 #include "pyDniCoordinates.h"
 
 pyDniInfoSource::pyDniInfoSource()

Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h

@@ -41,12 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #ifndef pyDniInfoSource_h_inc
 #define pyDniInfoSource_h_inc
+#include <Python.h>
 
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
 
-
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyDniCoordinates;

Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h

@@ -47,12 +47,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // pyDrawControl   - a wrapper class all the draw/pipeline control functions
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
 
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyDrawControl

Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp

@@ -46,6 +46,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////
 
+#include "pyDynamicText.h"
 #include "plgDispatch.h"
 #include "plMessage/plDynamicTextMsg.h"
 #include "pyKey.h"
@@ -54,7 +55,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyImage.h"
 #include "plGImage/plDynamicTextMap.h"
 
-#include "pyDynamicText.h"
 
 pyDynamicText::pyDynamicText()
 {
@@ -154,7 +154,8 @@ void pyDynamicText::ClearToColor( pyColor& color )
     plDynamicTextMsg* pMsg = ICreateDTMsg();
     if ( pMsg )
     {
-        pMsg->ClearToColor(color.getColor());
+        hsColorRGBA col = color.getColor();
+        pMsg->ClearToColor(col);
 
         plgDispatch::MsgSend( pMsg );   // whoosh... off it goes
     }
@@ -193,7 +194,8 @@ void pyDynamicText::SetTextColor2( pyColor& color, bool blockRGB )
     plDynamicTextMsg* pMsg = ICreateDTMsg();
     if ( pMsg )
     {
-        pMsg->SetTextColor(color.getColor(),blockRGB);
+        hsColorRGBA col = color.getColor();
+        pMsg->SetTextColor(col,blockRGB);
         plgDispatch::MsgSend( pMsg );   // whoosh... off it goes
     }
 }
@@ -215,7 +217,8 @@ void pyDynamicText::FillRect( uint16_t left, uint16_t top, uint16_t right, uint1
     plDynamicTextMsg* pMsg = ICreateDTMsg();
     if ( pMsg )
     {
-        pMsg->FillRect(left,top,right,bottom,color.getColor());
+        hsColorRGBA col = color.getColor();
+        pMsg->FillRect(left,top,right,bottom,col);
         plgDispatch::MsgSend( pMsg );   // whoosh... off it goes
     }
 }
@@ -226,7 +229,8 @@ void pyDynamicText::FrameRect( uint16_t left, uint16_t top, uint16_t right, uint
     plDynamicTextMsg* pMsg = ICreateDTMsg();
     if ( pMsg )
     {
-        pMsg->FrameRect(left,top,right,bottom,color.getColor());
+        hsColorRGBA col = color.getColor();
+        pMsg->FrameRect(left,top,right,bottom,col);
         plgDispatch::MsgSend( pMsg );   // whoosh... off it goes
     }
 }
@@ -311,7 +315,8 @@ void pyDynamicText::DrawImage( uint16_t x, uint16_t y, pyImage& image, hsBool re
     plDynamicTextMsg* pMsg = ICreateDTMsg();
     if ( pMsg )
     {
-        pMsg->DrawImage( x, y, image.GetKey(), respectAlpha);
+        plKey k = image.GetKey();
+        pMsg->DrawImage( x, y, k, respectAlpha);
         plgDispatch::MsgSend( pMsg );   // whoosh... off it goes
     }
 }
@@ -326,7 +331,8 @@ void pyDynamicText::DrawImageClipped( uint16_t x, uint16_t y, pyImage& image, ui
     plDynamicTextMsg* pMsg = ICreateDTMsg();
     if ( pMsg )
     {
-        pMsg->DrawClippedImage( x, y, image.GetKey(), cx, cy, cw, ch, respectAlpha);
+        plKey k = image.GetKey();
+        pMsg->DrawClippedImage( x, y, k, cx, cy, cw, ch, respectAlpha);
         plgDispatch::MsgSend( pMsg );   // whoosh... off it goes
     }
 }

Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h

@@ -53,10 +53,11 @@ class pyKey;
 class pyColor;
 class pyImage;
 
+#include <Python.h>
 #include "hsTemplates.h"
 #include "hsStlUtils.h"
+#include "hsResMgr.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 

Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp

@@ -43,12 +43,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 //
 ///////////////////////////////////////////////
+#include "pyGUIControl.h"
 
 #include "pfGameGUIMgr/pfGUIControlMod.h"
 #include "pfGameGUIMgr/pfGUIDialogMod.h"
 
 #include "pyKey.h"
-#include "pyGUIControl.h"
 #include "pyGUIDialog.h"
 #include "pyColor.h"
 

Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h

@@ -49,10 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 //////////////////////////////////////////////////////////////////////
 
+#include <Python.h>
 #include "pyKey.h"
 #include "pyGeometry3.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyGUIDialog;

Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h

@@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                   attached to a GUIControlButton
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "pyKey.h"
 #include "pyGeometry3.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 #include "pyGUIControl.h"

Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h

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

Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h

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

Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h

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

Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.h

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                   attached to a GUIControlDraggable
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "pyKey.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 #include "pyGUIControl.h"

Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h

@@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                   attached to a GUIControlDynamicText
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "pyKey.h"
 #include "pyGUIControl.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyDynamicText;

Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h

@@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                   attached to a GUIControlEditBox
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "hsStlUtils.h"
 #include "pyKey.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 #include "pyGUIControl.h"

Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp

@@ -250,7 +250,7 @@ class pfColorListElement : public pfGUIListText
             {
                 size_t length = wcslen( fString1 ) + wcslen( fString2 ) + 3;
                 thestring = new wchar_t[ length ];
-                snwprintf( thestring, length, L"%s %s", fString1, fString2 );
+                hsSnwprintf( thestring, length, L"%s %s", fString1, fString2 );
                 wemade_string = true;
             }
             else if (fString1)

Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h

@@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                      attached to a GUIControl (such as Button, ListBox, etc.)
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "hsTemplates.h"
 
@@ -55,7 +56,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyKey.h"
 #include "pyGUIControl.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 

Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp

@@ -182,7 +182,7 @@ void pyGUIControlMultiLineEdit::SetEncodedBuffer( PyObject* buffer_object )
         {
             // something to do here... later
             uint8_t* daBuffer = nil;
-            int length;
+            Py_ssize_t length;
             PyObject_AsReadBuffer( buffer_object, (const void**)&daBuffer, &length);
             if ( daBuffer != nil )
             {
@@ -218,7 +218,7 @@ void pyGUIControlMultiLineEdit::SetEncodedBufferW( PyObject* buffer_object )
         {
             // something to do here... later
             uint16_t* daBuffer = nil;
-            int length;
+            Py_ssize_t length;
             PyObject_AsReadBuffer( buffer_object, (const void**)&daBuffer, &length);
             if ( daBuffer != nil )
             {
@@ -392,7 +392,8 @@ void pyGUIControlMultiLineEdit::InsertColor( pyColor& color )
         pfGUIMultiLineEditCtrl* pbmod = pfGUIMultiLineEditCtrl::ConvertNoRef(fGCkey->ObjectIsLoaded());
         if ( pbmod )
         {
-            pbmod->InsertColor(color.getColor());
+            hsColorRGBA col = color.getColor();
+            pbmod->InsertColor(col);
         }
     }
 }

Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h

@@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                   attached to a GUIControlMultiLineEdit
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "pyKey.h"
 #include "pyGUIControl.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyColor;

Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.h

@@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                   attached to a GUIControlRadioGroup
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "pyKey.h"
 #include "pyGUIControl.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyGUIControlRadioGroup :public pyGUIControl

Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h

@@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                   attached to a GUIControlTextBox
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "pyKey.h"
 #include "pyGUIControl.h"
 #include "pfGameGUIMgr/pfGUIControlMod.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyColor;

Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h

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

Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp

@@ -378,4 +378,4 @@ void pyGUIDialog::AddPlasmaMethods(std::vector<PyMethodDef> &methods)
     PYTHON_BASIC_GLOBAL_METHOD(methods, PtGUICursorOff);
     PYTHON_BASIC_GLOBAL_METHOD(methods, PtGUICursorOn);
     PYTHON_BASIC_GLOBAL_METHOD(methods, PtGUICursorDimmed);
-}
+}

Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h

@@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 //////////////////////////////////////////////////////////////////////
 
+#include <Python.h>
 #include "pfGameGUIMgr/pfGUIPopUpMenu.h"
 
 #include "pyKey.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyColor;

Sources/Plasma/FeatureLib/pfPython/pyGameScore.h

@@ -49,10 +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 <Python.h>
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 struct pfGameScore;
@@ -87,4 +87,4 @@ public:
     bool            SetPoints(int numPoints);
 };
 
-#endif
+#endif

Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h

@@ -47,10 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // pyGeometry3   - the wrapper class for hsPoint3 and hsVector3
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "hsGeometry3.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyPoint3

Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h

@@ -42,11 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #ifndef pyGrassShader_h
 #define pyGrassShader_h
 
+#include <Python.h>
 #include "hsStlUtils.h"
 
 #include "pyKey.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 

Sources/Plasma/FeatureLib/pfPython/pyImage.h

@@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // PURPOSE: Class wrapper for Python to a plMipMap image
 //
 
+#include <Python.h>
 #include "hsStlUtils.h"
 
 #include "pyKey.h"
@@ -59,7 +60,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plGImage/plMipmap.h"
 #endif
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class plKey;

Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h

@@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 //////////////////////////////////////////////////////////////////////
 
+#include <Python.h>
 #include "hsStlUtils.h"
 #include "pyKey.h"
 #include "pyGeometry3.h"
 
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyImage;

Sources/Plasma/FeatureLib/pfPython/pyKey.h

@@ -47,10 +47,10 @@ 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 <Python.h>
 
 #include "pnKeyedObject/plKey.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class plPythonFileMod;

Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h

@@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 //////////////////////////////////////////////////////////////////////
 
+#include <Python.h>
 #include "HeadSpin.h"
 #include "pnInputCore/plKeyMap.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyKeyMap

Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h

@@ -47,10 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // pyMarkerMgr   - a wrapper class to provide interface to the pfMarkerMgr stuff
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "HeadSpin.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyMarkerMgr

Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h

@@ -41,13 +41,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #ifndef pyMatrix44_h_inc
 #define pyMatrix44_h_inc
+#include <Python.h>
 
 #include "hsStlUtils.h"
 
 #include "hsMatrix44.h"
 #include "pyGeometry3.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 

Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h

@@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 // pyMoviePlayer   - a wrapper class all the movie player functions
 //
 //////////////////////////////////////////////////////////////////////
+#include <Python.h>
 
 #include "pyKey.h"
 #include "pyColor.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyMoviePlayer

Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp

@@ -44,9 +44,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 # 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 "pyNetLinkingMgr.h"
 #include "plNetClient/plNetLinkingMgr.h"
 #include "plAvatar/plAvatarMgr.h"
 #include "plAvatar/plArmatureMod.h"

Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h

@@ -41,11 +41,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #ifndef pyNetLinkingMgr_h_inc
 #define pyNetLinkingMgr_h_inc
+#include <Python.h>
 
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 //////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h

@@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #ifndef pyNetServerSessionInfo_h_inc
 #define pyNetServerSessionInfo_h_inc
+#include <Python.h>
 
 #include "HeadSpin.h"
 #include "plNetCommon/plNetServerSessionInfo.h"
 #include "pnUUID/pnUUID.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 //////////////////////////////////////////////////////////////////////

Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp

@@ -44,6 +44,7 @@ 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"
@@ -51,7 +52,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plPythonFileMod.h"
 #include "pyGeometry3.h"
 
-#include "pyNotify.h"
 
 pyNotify::pyNotify()
 {

Sources/Plasma/FeatureLib/pfPython/pyNotify.h

@@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 //////////////////////////////////////////////////////////////////////
 
+#include <Python.h>
 #include "pnMessage/plNotifyMsg.h"
 
 #include "pyKey.h"
 #include "pyGeometry3.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class pyNotify

Sources/Plasma/FeatureLib/pfPython/pyPlayer.h

@@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //
 // PURPOSE: Class wrapper for Python to the player data
 //
+#include <Python.h>
 
 #include "hsStlUtils.h"
 #include "pyKey.h"
 
-#include <Python.h>
 #include "pyGlueHelpers.h"
 
 class plKey;