diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h index 71769008..0ca9484a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" #include "../../pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h index 78f27f17..fc992b51 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h index 02b34c95..0ce90a89 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" #include "../../pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h index 85636b4e..5b111d9f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h index c028b320..ebd6073c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" #include "../../pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h index 1515f1b2..f87cc1d1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h index 1490855b..2f02005f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" #include "../../pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h index 1515d6eb..8671dbb5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h index afe04552..40653dc7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" #include "../../pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h index efb716e7..2f512fca 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h index 4776d560..a5b25fc3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCli.h" #include "../../pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h index 98537e8b..8c173e48 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../../pyGlueHelpers.h" #include "../pyGameCliMsg.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h index 1fef769f..51d53684 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../pyGlueHelpers.h" #include "../pyKey.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp index f1571571..c840e939 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp +++ b/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 "Heek\pyHeekMsg.h" -#include "Marker\pyMarkerMsg.h" -#include "BlueSpiral\pyBlueSpiralMsg.h" -#include "ClimbingWall\pyClimbingWallMsg.h" +#include "TicTacToe/pyTTTMsg.h" +#include "Heek/pyHeekMsg.h" +#include "Marker/pyMarkerMsg.h" +#include "BlueSpiral/pyBlueSpiralMsg.h" +#include "ClimbingWall/pyClimbingWallMsg.h" #include "VarSync/pyVarSyncMsg.h" /////////////////////////////////////////////////////////////////////////////// @@ -239,4 +239,4 @@ unsigned long pyGameCliOwnerChangeMsg::OwnerID() const return gmMsg->ownerId; } return 0; -} \ No newline at end of file +} diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h index 1793fcb5..4b5ec2ce 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h +++ b/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 #include "pfGameMgr/pfGameMgr.h" -#include #include "../pyGlueHelpers.h" class pyGameCliMsg diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h index 01d45582..5906df9d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h +++ b/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 #include "hsStlUtils.h" #include "pfGameMgr/pfGameMgr.h" -#include #include "../pyGlueHelpers.h" class pyGameMgrMsg diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp index 71efed9e..56498b9c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp +++ b/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() { diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h b/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h index 9734c39c..d0ce9fb5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAnimation.h +++ b/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 #include "pyKey.h" #include "hsTemplates.h" -#include #include "pyGlueHelpers.h" class cyAnimation diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp index 6751e1bd..6a999bb1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp +++ b/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); } diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h b/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h index ded3c41e..d372b818 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatar.h +++ b/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 #include "hsStlUtils.h" #include "hsTemplates.h" #include "hsBitVector.h" #include "pnKeyedObject/plKey.h" -#include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp index feb49db1..a6b79e49 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp +++ b/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); - pyKey* recvrKey = pyKey::ConvertFrom(recvr); - newObj->fThis->SetSender(senderKey->getKey()); - newObj->fThis->AddRecvr(recvrKey->getKey()); + plKey senderKey = pyKey::ConvertFrom(sender)->getKey(); + plKey recvrKey = pyKey::ConvertFrom(recvr)->getKey(); + newObj->fThis->SetSender(senderKey); + newObj->fThis->AddRecvr(recvrKey); newObj->fThis->SetNetForce(false); return (PyObject*) newObj; } diff --git a/Sources/Plasma/FeatureLib/pfPython/cyCamera.h b/Sources/Plasma/FeatureLib/pfPython/cyCamera.h index 209429ad..6c438c4e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyCamera.h +++ b/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 #include "HeadSpin.h" #include "pnKeyedObject/plKey.h" class pyKey; -#include #include "pyGlueHelpers.h" class cyCamera diff --git a/Sources/Plasma/FeatureLib/pfPython/cyDraw.h b/Sources/Plasma/FeatureLib/pfPython/cyDraw.h index 55373719..fb0dfb4f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDraw.h +++ b/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 #include "hsTemplates.h" #include "pnKeyedObject/plKey.h" -#include #include "pyGlueHelpers.h" class cyDraw diff --git a/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp index 5422222e..93daa9a4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp +++ b/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); - newObj->fThis->SetSender(senderKey->getKey()); + plKey senderKey = pyKey::ConvertFrom(sender)->getKey(); + newObj->fThis->SetSender(senderKey); } if (recvr != NULL) { - pyKey *recvrKey = pyKey::ConvertFrom(recvr); - newObj->fThis->AddRecvr(recvrKey->getKey()); + plKey recvrKey = pyKey::ConvertFrom(recvr)->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); -} \ No newline at end of file +} diff --git a/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp index 0b3ff593..9d5ed431 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp +++ b/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 +#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); -} \ No newline at end of file +} diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp index 3993fdf9..dd5f84f3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp @@ -1319,7 +1319,8 @@ void cyMisc::SetPrivateChatList(const std::vector & tolist) for (int i=0 ; iGetClientList()->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 & 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(); } diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp index 348931cc..34bc8efa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp +++ b/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 #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 "plResMgr\plLocalization.h" -#include "plMessage\plLOSRequestMsg.h" +#include "plNetCommon/plNetCommon.h" +#include "plResMgr/plLocalization.h" +#include "plMessage/plLOSRequestMsg.h" -#include 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" diff --git a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h b/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h index 4065a6a2..60f3a7f7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h +++ b/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 #include "hsTemplates.h" #include "pnKeyedObject/plKey.h" class pyKey; -#include #include "pyGlueHelpers.h" class cyParticleSys diff --git a/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp index 16ce0fe5..de65bbc9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp +++ b/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); - newObj->fThis->SetSender(senderKey->getKey()); + plKey senderKey = pyKey::ConvertFrom(sender)->getKey(); + newObj->fThis->SetSender(senderKey); } if (recvr != NULL) { - pyKey *recvrKey = pyKey::ConvertFrom(recvr); - newObj->fThis->AddRecvr(recvrKey->getKey()); + plKey recvrKey = pyKey::ConvertFrom(recvr)->getKey(); + newObj->fThis->AddRecvr(recvrKey); } newObj->fThis->SetNetForce(false); return (PyObject*)newObj; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h b/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h index b1e61a16..c953ee63 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysics.h +++ b/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 #include "hsTemplates.h" #include "pnKeyedObject/plKey.h" -#include #include "pyGlueHelpers.h" class pyPoint3; diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp index 905a96d1..ac0b7f0c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp +++ b/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); - newObj->fThis->SetSender(senderKey->getKey()); + plKey senderKey = pyKey::ConvertFrom(sender)->getKey(); + newObj->fThis->SetSender(senderKey); } if (recvr != NULL) { - pyKey *recvrKey = pyKey::ConvertFrom(recvr); - newObj->fThis->AddRecvr(recvrKey->getKey()); + plKey recvrKey = pyKey::ConvertFrom(recvr)->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); -} \ No newline at end of file +} diff --git a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h b/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h index 7078705c..9e16611e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h +++ b/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 #include "HeadSpin.h" #include "hsStlUtils.h" -#include #if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE) #include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp index 24970057..6714954e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp +++ b/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" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h b/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h index 8c23857e..062a6aea 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h +++ b/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 #include "pnModifier/plMultiModifier.h" #include "hsGeometry3.h" #include "hsResMgr.h" -#include #include "plPythonParameter.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp index d44cd821..f672fbb4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp +++ b/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" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.h b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.h index b1a98cd5..9a35c547 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.h +++ b/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 #include "HeadSpin.h" namespace PythonPack diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp index 79d75164..bd7026a2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp +++ b/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" diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h index 1181e06a..604d0ae8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h @@ -46,10 +46,12 @@ class plPythonFileMod; class plStateDataRecord; class plSimpleStateVariable; +#include + +#include "HeadSpin.h" #include "hsStlUtils.h" #include "plModifier/plSDLModifier.h" -#include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp index 853b1b02..3ce53b32 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp +++ b/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 - fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) ); + else { + 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 diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h index fba8b231..039970e9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h +++ b/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 #include "HeadSpin.h" #include "hsStlUtils.h" #include "plNetCommon/plNetServerSessionInfo.h" -#include #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp index 7c18bac1..744a89db 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp +++ b/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" /////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h index f21e554d..ca6528c0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h +++ b/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 #include "HeadSpin.h" #include "hsStlUtils.h" #include "plNetCommon/plNetServerSessionInfo.h" #include "pyAgeInfoStruct.h" -#include #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h b/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h index d2d40a8a..8560c0fa 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h +++ b/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 #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" class pyVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAlarm.h b/Sources/Plasma/FeatureLib/pfPython/pyAlarm.h index e0d3a30f..0f86310c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAlarm.h +++ b/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 #include "HeadSpin.h" #include "hsStlUtils.h" -#include struct pyAlarm; class pyAlarmMgr diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h index 4a0edf63..382a2851 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h @@ -48,9 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" -#include #include "pyGlueHelpers.h" class pyAudioControl diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp index 1f7eb058..cca82970 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp +++ b/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 #include "pyCCRMgr.h" #include "pyAgeLinkStruct.h" -#include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp b/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp index 52592ada..2dc8cdc8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp +++ b/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 #include "pyCCRMgr.h" -#include diff --git a/Sources/Plasma/FeatureLib/pfPython/pyCluster.h b/Sources/Plasma/FeatureLib/pfPython/pyCluster.h index 9b29be1a..311e82a2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyCluster.h +++ b/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 #include "pyKey.h" -#include #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// @@ -79,4 +79,4 @@ public: }; -#endif // pyCluster_h \ No newline at end of file +#endif // pyCluster_h diff --git a/Sources/Plasma/FeatureLib/pfPython/pyColor.h b/Sources/Plasma/FeatureLib/pfPython/pyColor.h index 9b311e85..4452e0c2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyColor.h +++ b/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 #include "hsColorRGBA.h" -#include #include "pyGlueHelpers.h" class pyColor diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h index 8fe5a383..4370a2d6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h @@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsGeometry3.h" -#include #include "pyGlueHelpers.h" class plDniCoordinateInfo; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp index a761e26c..4fbd03ca 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp +++ b/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() diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h b/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h index 9fe1881f..e22a31f3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h +++ b/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 #include "HeadSpin.h" #include "hsStlUtils.h" - -#include #include "pyGlueHelpers.h" class pyDniCoordinates; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h b/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h index 29ce034f..18b535a6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h +++ b/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 #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" class pyDrawControl diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp index 63b48590..3ad7aa99 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp +++ b/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 } } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h index 0088f6bb..665f495c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h @@ -53,10 +53,11 @@ class pyKey; class pyColor; class pyImage; +#include #include "hsTemplates.h" #include "hsStlUtils.h" +#include "hsResMgr.h" -#include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp index 7baee232..543e2457 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp +++ b/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" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h index d2d854d7..36be2c94 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h @@ -49,10 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "pyKey.h" #include "pyGeometry3.h" -#include #include "pyGlueHelpers.h" class pyGUIDialog; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h index 2c504714..c27b9a25 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h +++ b/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 #include "pyKey.h" #include "pyGeometry3.h" -#include #include "pyGlueHelpers.h" #include "pyGUIControl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h index 37549191..8e13fa7b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h @@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "pyKey.h" -#include #include "pyGlueHelpers.h" #include "pyGUIControl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h index 6cda66db..c27d0502 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h @@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "pyKey.h" -#include #include "pyGlueHelpers.h" #include "pyGUIControl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h index eaaa0090..89b65d56 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h @@ -49,9 +49,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "pyKey.h" -#include #include "pyGlueHelpers.h" #include "pyGUIControl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.h index 2fdecfd6..83c72ff3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.h +++ b/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 #include "pyKey.h" -#include #include "pyGlueHelpers.h" #include "pyGUIControl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h index 86afe0b1..a4f9f2f0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h +++ b/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 #include "pyKey.h" #include "pyGUIControl.h" -#include #include "pyGlueHelpers.h" class pyDynamicText; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h index c3bd31fa..56c6a495 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h +++ b/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 #include "hsStlUtils.h" #include "pyKey.h" -#include #include "pyGlueHelpers.h" #include "pyGUIControl.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp index 113480b8..083cbc87 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp +++ b/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) diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h index 8b8f8d97..ce813ef8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h +++ b/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 #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 #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp index 561fa415..0bdefb1b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp +++ b/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; + 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; + 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); } } } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h index 1db5213f..d0d2799b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h +++ b/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 #include "pyKey.h" #include "pyGUIControl.h" -#include #include "pyGlueHelpers.h" class pyColor; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.h index a5a6c63f..ed056d5a 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.h +++ b/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 #include "pyKey.h" #include "pyGUIControl.h" -#include #include "pyGlueHelpers.h" class pyGUIControlRadioGroup :public pyGUIControl diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h index 53436613..1efa3f0c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h +++ b/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 #include "pyKey.h" #include "pyGUIControl.h" #include "pfGameGUIMgr/pfGUIControlMod.h" -#include #include "pyGlueHelpers.h" class pyColor; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h index 5e2689b9..da74181f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h @@ -49,10 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "hsStlUtils.h" #include "pyKey.h" -#include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp index 82c440dc..749c66d5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp @@ -378,4 +378,4 @@ void pyGUIDialog::AddPlasmaMethods(std::vector &methods) PYTHON_BASIC_GLOBAL_METHOD(methods, PtGUICursorOff); PYTHON_BASIC_GLOBAL_METHOD(methods, PtGUICursorOn); PYTHON_BASIC_GLOBAL_METHOD(methods, PtGUICursorDimmed); -} \ No newline at end of file +} diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h index 4f453ba5..c2c5e943 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h @@ -49,11 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "pfGameGUIMgr/pfGUIPopUpMenu.h" #include "pyKey.h" -#include #include "pyGlueHelpers.h" class pyColor; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h b/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h index b0112dfc..bf0bca76 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGameScore.h +++ b/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 #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" struct pfGameScore; @@ -87,4 +87,4 @@ public: bool SetPoints(int numPoints); }; -#endif \ No newline at end of file +#endif diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h b/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h index 92df489b..a7511020 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h +++ b/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 #include "hsGeometry3.h" -#include #include "pyGlueHelpers.h" class pyPoint3 diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h b/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h index 195c014f..4a4754c0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h +++ b/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 #include "hsStlUtils.h" #include "pyKey.h" -#include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyImage.h b/Sources/Plasma/FeatureLib/pfPython/pyImage.h index f5791847..86e9337f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyImage.h +++ b/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 #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 #include "pyGlueHelpers.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h index 23c6b085..e6898571 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h @@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "hsStlUtils.h" #include "pyKey.h" #include "pyGeometry3.h" -#include #include "pyGlueHelpers.h" class pyImage; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKey.h b/Sources/Plasma/FeatureLib/pfPython/pyKey.h index e966120d..88236b11 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKey.h +++ b/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 #include "pnKeyedObject/plKey.h" -#include #include "pyGlueHelpers.h" class plPythonFileMod; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h index b0f295f0..71a56f12 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h @@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "pnInputCore/plKeyMap.h" -#include #include "pyGlueHelpers.h" class pyKeyMap diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h b/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h index c6e470f7..1ece9214 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h +++ b/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 #include "HeadSpin.h" -#include #include "pyGlueHelpers.h" class pyMarkerMgr diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h b/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h index 05382273..cfce21e4 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h +++ b/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 #include "hsStlUtils.h" #include "hsMatrix44.h" #include "pyGeometry3.h" -#include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h b/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h index 0e6a0faf..af28c7f8 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h +++ b/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 #include "pyKey.h" #include "pyColor.h" -#include #include "pyGlueHelpers.h" class pyMoviePlayer diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp index 67b227f8..d9e4ec24 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp +++ b/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" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h b/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h index 271f8f72..99d3b467 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h +++ b/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 #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h b/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h index 3d351a5e..19b49ecb 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h +++ b/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 #include "HeadSpin.h" #include "plNetCommon/plNetServerSessionInfo.h" #include "pnUUID/pnUUID.h" -#include #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp index 9352eeaf..a8846251 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp +++ b/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() { diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h index 72eb86c7..b02b6ffe 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h @@ -48,12 +48,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "pnMessage/plNotifyMsg.h" #include "pyKey.h" #include "pyGeometry3.h" -#include #include "pyGlueHelpers.h" class pyNotify diff --git a/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h b/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h index a90c716e..22dad7c2 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyPlayer.h +++ b/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 #include "hsStlUtils.h" #include "pyKey.h" -#include #include "pyGlueHelpers.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDL.h b/Sources/Plasma/FeatureLib/pfPython/pySDL.h index 17e1ec49..c27bb919 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDL.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySDL.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pySDL - python subset of the plSDL library. // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" class plStateDataRecord; diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp index 1764244a..2242a42f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp @@ -39,8 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ -#include "HeadSpin.h" // TEMP, for STL warnings #include "pySceneObject.h" +#include "HeadSpin.h" // TEMP, for STL warnings #include "pnKeyedObject/plKey.h" #include "cyAvatar.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h index a4a380e2..dd35819d 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySceneObject.h @@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // attached to a SceneObject // ////////////////////////////////////////////////////////////////////// +#include #include "pyKey.h" #include "cyDraw.h" @@ -57,7 +58,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.h b/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.h index 970a24c4..8cafbff0 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.h @@ -48,11 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // PURPOSE: a wrapper class to provide an interface to the scoring system // +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" @@ -112,4 +112,4 @@ public: ); }; -#endif \ No newline at end of file +#endif diff --git a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h index c12e9d70..88901f86 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h @@ -41,12 +41,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #ifndef pySpawnPointInfo_h_inc #define pySpawnPointInfo_h_inc +#include #include "HeadSpin.h" #include "hsStlUtils.h" #include "plNetCommon/plSpawnPointInfo.h" -#include #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h index 60b59c4e..390e4ef1 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h @@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // and interface to the ChatLog (ptChatStatusLog) ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" -#include #include "pyGlueHelpers.h" #include "pyColor.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyStream.h b/Sources/Plasma/FeatureLib/pfPython/pyStream.h index 7da64f6d..4845b6ba 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyStream.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyStream.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyStream - a wrapper class to provide interface to the File stream stuff // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h index 385ca669..9f06495b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pySwimCurrentInterface_h #define pySwimCurrentInterface_h +#include #include "pyKey.h" -#include #include "pyGlueHelpers.h" class pySwimCurrentInterface @@ -88,4 +88,4 @@ public: void disable(); }; -#endif \ No newline at end of file +#endif diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp index e4e05880..b1444ce9 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp @@ -575,7 +575,8 @@ void pyVault::UnRegisterVisitAge( const char * guidstr ) Uuid uuid; GuidFromString(guidstr, &uuid); plAgeInfoStruct info; - info.SetAgeInstanceGuid(&plUUID(uuid)); + plUUID guid(uuid); + info.SetAgeInstanceGuid(&guid); VaultUnregisterVisitAgeAndWait(&info); } @@ -583,7 +584,7 @@ void pyVault::UnRegisterVisitAge( const char * guidstr ) void _InvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node) { if (result == kNetSuccess) - VaultSendNode(node, (uint32_t)param); + VaultSendNode(node, (uint32_t)((uintptr_t)param)); } void pyVault::InvitePlayerToAge( const pyAgeLinkStruct & link, uint32_t playerID ) @@ -602,13 +603,14 @@ void pyVault::InvitePlayerToAge( const pyAgeLinkStruct & link, uint32_t playerID void _UninvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node) { if (result == kNetSuccess) - VaultSendNode(node, (uint32_t)param); + VaultSendNode(node, (uint32_t)((uintptr_t)param)); } void pyVault::UnInvitePlayerToAge( const char * str, uint32_t playerID ) { plAgeInfoStruct info; - info.SetAgeInstanceGuid(&plUUID(str)); + plUUID guid(str); + info.SetAgeInstanceGuid(&guid); if (RelVaultNode * rvnLink = VaultGetOwnedAgeLinkIncRef(&info)) { if (RelVaultNode * rvnInfo = rvnLink->GetChildNodeIncRef(plVault::kNodeType_AgeInfo, 1)) { @@ -667,7 +669,8 @@ void pyVault::CreateNeighborhood() xtl::format( desc, "%s's %s", nc->GetPlayerName(), link.GetAgeInfo()->GetAgeInstanceName() ); } - link.GetAgeInfo()->SetAgeInstanceGuid(&plUUID(GuidGenerate())); + plUUID guid(GuidGenerate()); + link.GetAgeInfo()->SetAgeInstanceGuid(&guid); link.GetAgeInfo()->SetAgeUserDefinedName( title.c_str() ); link.GetAgeInfo()->SetAgeDescription( desc.c_str() ); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVault.h b/Sources/Plasma/FeatureLib/pfPython/pyVault.h index ec67026d..1d52c5da 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVault.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVault.h @@ -47,10 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVault - a wrapper class to provide interface to the plVault and the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" -#include #include "pyGlueHelpers.h" class plKey; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h index 231a96c9..c6ba4313 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultAgeInfoListNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pyVaultFolderNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp index 11e6f81c..559b9601 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp @@ -44,10 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultAgeInfoNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include "pyVaultAgeInfoNode.h" #include "hsStlUtils.h" -#include "pyVaultAgeInfoNode.h" #include "pyVaultAgeInfoListNode.h" #include "pyVaultPlayerInfoListNode.h" #include "pyVaultPlayerInfoNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h index 0e01f9ac..7e5a0f21 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultAgeInfoNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h index db713571..162f4d41 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultAgeLinkNode.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultAgeLinkNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h index e1b262a4..59504e8b 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultChronicleNode.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultChronicleNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h index 50d123d2..2c0a236e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultFolderNode.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultFolderNode - a wrapper class to provide interface to the plVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp index 2b96a240..f6101a53 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.cpp @@ -211,7 +211,7 @@ void pyVaultImageNode::SetImageFromBuf( PyObject * pybuf ) } uint8_t * buffer = nil; - int bytes; + ssize_t bytes; PyObject_AsReadBuffer(pybuf, (const void **)&buffer, &bytes); if (buffer) { VaultImageNode access(fNode); diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h index 8e13f539..daefefb5 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultImageNode.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultImageNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp index b2f60bcb..8821e7d3 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp @@ -44,11 +44,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultMarkerGameNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include "pyVaultMarkerGameNode.h" #include "hsStlUtils.h" -#include "pyVaultMarkerGameNode.h" - #include "plVault/plVault.h" // should only be created from C++ side diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h index 183ab7bd..7af1e406 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.h @@ -47,10 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultMarkerGameNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" -#include #include "pyGlueHelpers.h" #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp index d030a55d..e5afc01e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp @@ -82,7 +82,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com /////////////////////////////////////////////////////////////////////////// -static void __cdecl LogDumpProc ( +static void CDECL LogDumpProc ( void * , const wchar_t fmt[], ... diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h index 1d770781..55d8c312 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.h @@ -47,10 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h index d93545f0..401a8657 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNodeRef.h @@ -47,10 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultNodeRef - a wrapper class to provide interface to the plVaultNodeRef // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" -#include #include "pyGlueHelpers.h" struct RelVaultNode; diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h index 25d72457..d5da151e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoListNode.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultPlayerInfoListNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pyVaultFolderNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h index 1ba6b5fa..6318dbea 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.h @@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// -#include "pyVaultNode.h" #include +#include "pyVaultNode.h" #include "pyGlueHelpers.h" class pyVaultPlayerInfoNode : public pyVaultNode diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp index 20946203..a09bd428 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.cpp @@ -238,7 +238,8 @@ void pyVaultPlayerNode::RemoveVisitAgeLink(const char *guidstr) Uuid uuid; GuidFromString(guidstr, &uuid); plAgeInfoStruct info; - info.SetAgeInstanceGuid(&plUUID(uuid)); + plUUID guid(uuid); + info.SetAgeInstanceGuid(&guid); VaultUnregisterOwnedAgeAndWait(&info); } diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h index f319d06a..18900214 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerNode.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultPlayerNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pfPython/pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h index ccf3523b..fe32d5ac 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSDLNode.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultSDLNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h index 3d8da8f4..87143b72 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultSystemNode.h @@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // pyVaultSystemNode - a wrapper class to provide interface to the RelVaultNode // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h index 3a7bbd6a..b2c05932 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultTextNoteNode.h @@ -48,9 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ////////////////////////////////////////////////////////////////////// +#include #include "HeadSpin.h" #include "hsStlUtils.h" -#include #include "pyGlueHelpers.h" #include "pyVaultNode.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h index e9c095e3..d0560da7 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h +++ b/Sources/Plasma/FeatureLib/pfPython/pyWaveSet.h @@ -42,11 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef pyWaveSet_h #define pyWaveSet_h +#include #include "pyKey.h" #include "pyGeometry3.h" #include "pyColor.h" -#include #include "pyGlueHelpers.h" ////////////////////////////////////////////////////////////////////// @@ -216,4 +216,4 @@ public: }; -#endif // pyWaveSet_h \ No newline at end of file +#endif // pyWaveSet_h