Browse Source

Merge remote-tracking branch 'origin/pfPython_linux' into mingw

Darryl Pogue 13 years ago
parent
commit
e97e3c7c76
  1. 2
      Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h
  2. 2
      Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h
  3. 2
      Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h
  4. 2
      Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h
  5. 2
      Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h
  6. 2
      Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h
  7. 2
      Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h
  8. 2
      Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h
  9. 2
      Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h
  10. 2
      Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h
  11. 2
      Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h
  12. 2
      Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h
  13. 2
      Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h
  14. 10
      Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp
  15. 2
      Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h
  16. 2
      Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h
  17. 2
      Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp
  18. 2
      Sources/Plasma/FeatureLib/pfPython/cyAnimation.h
  19. 3
      Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp
  20. 2
      Sources/Plasma/FeatureLib/pfPython/cyAvatar.h
  21. 8
      Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp
  22. 2
      Sources/Plasma/FeatureLib/pfPython/cyCamera.h
  23. 2
      Sources/Plasma/FeatureLib/pfPython/cyDraw.h
  24. 8
      Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp
  25. 5
      Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp
  26. 23
      Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
  27. 8
      Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp
  28. 2
      Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h
  29. 8
      Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp
  30. 2
      Sources/Plasma/FeatureLib/pfPython/cyPhysics.h
  31. 8
      Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp
  32. 2
      Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h
  33. 2
      Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
  34. 2
      Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h
  35. 2
      Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp
  36. 2
      Sources/Plasma/FeatureLib/pfPython/plPythonPack.h
  37. 1
      Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp
  38. 4
      Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h
  39. 12
      Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp
  40. 2
      Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h
  41. 2
      Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp
  42. 2
      Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h
  43. 2
      Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h
  44. 2
      Sources/Plasma/FeatureLib/pfPython/pyAlarm.h
  45. 2
      Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h
  46. 2
      Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp
  47. 2
      Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp
  48. 2
      Sources/Plasma/FeatureLib/pfPython/pyCluster.h
  49. 2
      Sources/Plasma/FeatureLib/pfPython/pyColor.h
  50. 2
      Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h
  51. 2
      Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp
  52. 3
      Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h
  53. 2
      Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h
  54. 20
      Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp
  55. 3
      Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h
  56. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp
  57. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h
  58. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h
  59. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h
  60. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h
  61. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h
  62. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.h
  63. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h
  64. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h
  65. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp
  66. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h
  67. 7
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp
  68. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h
  69. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.h
  70. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h
  71. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h
  72. 2
      Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h
  73. 2
      Sources/Plasma/FeatureLib/pfPython/pyGameScore.h
  74. 2
      Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h
  75. 2
      Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h
  76. 2
      Sources/Plasma/FeatureLib/pfPython/pyImage.h
  77. 2
      Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h
  78. 2
      Sources/Plasma/FeatureLib/pfPython/pyKey.h
  79. 2
      Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h
  80. 2
      Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h
  81. 2
      Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h
  82. 2
      Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h
  83. 2
      Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp
  84. 2
      Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h
  85. 2
      Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
  86. 2
      Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp
  87. 2
      Sources/Plasma/FeatureLib/pfPython/pyNotify.h
  88. 2
      Sources/Plasma/FeatureLib/pfPython/pyPlayer.h
  89. 2
      Sources/Plasma/FeatureLib/pfPython/pySDL.h
  90. 2
      Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp
  91. 2
      Sources/Plasma/FeatureLib/pfPython/pySceneObject.h
  92. 2
      Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.h
  93. 2
      Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h
  94. 2
      Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h
  95. 2
      Sources/Plasma/FeatureLib/pfPython/pyStream.h
  96. 2
      Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h
  97. 13
      Sources/Plasma/FeatureLib/pfPython/pyVault.cpp
  98. 2
      Sources/Plasma/FeatureLib/pfPython/pyVault.h
  99. 2
      Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoListNode.h
  100. 2
      Sources/Plasma/FeatureLib/pfPython/pyVaultAgeInfoNode.cpp
  101. Some files were not shown because too many files have changed in this diff Show More

2
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 // PURPOSE: Class wrapper for the BlueSpiral game client
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
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 // PURPOSE: Class wrapper for BlueSpiral game messages
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
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 // PURPOSE: Class wrapper for the climbing wall game client
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
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 // PURPOSE: Class wrapper for ClimbingWall game messages
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
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 // PURPOSE: Class wrapper for the Heek game client
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
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 // PURPOSE: Class wrapper for Heek game messages
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
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 // PURPOSE: Class wrapper for the Marker game client
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
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 // PURPOSE: Class wrapper for Marker game messages
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
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 // PURPOSE: Class wrapper for the TTT game client
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
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 // PURPOSE: Class wrapper for TTT game messages
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
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 // PURPOSE: Class wrapper for the VarSync game client
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCli.h" #include "../pyGameCli.h"
#include "../../pyKey.h" #include "../../pyKey.h"

2
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 // PURPOSE: Class wrapper for VarSync game messages
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../../pyGlueHelpers.h" #include "../../pyGlueHelpers.h"
#include "../pyGameCliMsg.h" #include "../pyGameCliMsg.h"

2
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 // PURPOSE: Class wrapper for the game client base class
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../pyGlueHelpers.h" #include "../pyGlueHelpers.h"
#include "../pyKey.h" #include "../pyKey.h"

10
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 "pyGameCliMsg.h"
#include "pyGameCli.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" #include "VarSync/pyVarSyncMsg.h"
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

2
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 // PURPOSE: Class wrapper for game client messages
// //
#include <Python.h>
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../pyGlueHelpers.h" #include "../pyGlueHelpers.h"
class pyGameCliMsg class pyGameCliMsg

2
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 // PURPOSE: Class wrapper for game manager messages
// //
#include <Python.h>
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "pfGameMgr/pfGameMgr.h" #include "pfGameMgr/pfGameMgr.h"
#include <Python.h>
#include "../pyGlueHelpers.h" #include "../pyGlueHelpers.h"
class pyGameMgrMsg class pyGameMgrMsg

2
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 // PURPOSE: Class wrapper to map animation functions to plasma2 message
// //
#include "cyAnimation.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "plMessage/plAnimCmdMsg.h" #include "plMessage/plAnimCmdMsg.h"
#include "pnMessage/plEventCallbackMsg.h" #include "pnMessage/plEventCallbackMsg.h"
#include "cyAnimation.h"
cyAnimation::cyAnimation() cyAnimation::cyAnimation()
{ {

2
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 // PURPOSE: Class wrapper to map animation functions to plasma2 message
// //
#include <Python.h>
#include "pyKey.h" #include "pyKey.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class cyAnimation class cyAnimation

3
Sources/Plasma/FeatureLib/pfPython/cyAvatar.cpp

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

2
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 // PURPOSE: Class wrapper to map animation functions to plasma2 message
// //
#include <Python.h>
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#include "hsBitVector.h" #include "hsBitVector.h"
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"

8
Sources/Plasma/FeatureLib/pfPython/cyAvatarGlue.cpp

@ -803,10 +803,10 @@ PYTHON_CLASS_NEW_IMPL(ptAvatar, cyAvatar)
static PyObject* New(PyObject* sender, PyObject* recvr = nil) static PyObject* New(PyObject* sender, PyObject* recvr = nil)
{ {
ptAvatar* newObj = (ptAvatar*)ptAvatar_type.tp_new(&ptAvatar_type, NULL, NULL); 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); newObj->fThis->SetNetForce(false);
return (PyObject*) newObj; return (PyObject*) newObj;
} }

2
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 // PURPOSE: Class wrapper to map camera functions to plasma2 message
// //
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
class pyKey; class pyKey;
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class cyCamera class cyCamera

2
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 // PURPOSE: Class wrapper to map draw functions to plasma2 message
// //
#include <Python.h>
#include "hsTemplates.h" #include "hsTemplates.h"
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class cyDraw class cyDraw

8
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); ptDraw *newObj = (ptDraw*)ptDraw_type.tp_new(&ptDraw_type, NULL, NULL);
if (sender != 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) 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; newObj->fThis->fNetForce = false;

5
Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp

@ -39,10 +39,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021 Mead, WA 99021
*==LICENSE==*/ *==LICENSE==*/
#include "HeadSpin.h"
#include "cyInputInterface.h"
#include <Python.h> #include <Python.h>
#include "cyInputInterface.h"
#include "HeadSpin.h"
// glue functions // glue functions
PYTHON_CLASS_DEFINITION(ptInputInterface, cyInputInterface); PYTHON_CLASS_DEFINITION(ptInputInterface, cyInputInterface);

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

8
Sources/Plasma/FeatureLib/pfPython/cyMiscGlue2.cpp

@ -39,6 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021 Mead, WA 99021
*==LICENSE==*/ *==LICENSE==*/
#include <Python.h>
#include "cyMisc.h" #include "cyMisc.h"
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
#include "pyKey.h" #include "pyKey.h"
@ -47,11 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyEnum.h" #include "pyEnum.h"
// for enums // 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" 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" "This dialog _has_ to be answered by the user.\n"

2
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 // PURPOSE: Class wrapper to for Particle System
// //
#include <Python.h>
#include "hsTemplates.h" #include "hsTemplates.h"
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
class pyKey; class pyKey;
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class cyParticleSys class cyParticleSys

8
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); ptParticle *newObj = (ptParticle*)ptParticle_type.tp_new(&ptParticle_type, NULL, NULL);
if (sender != 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) 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); newObj->fThis->SetNetForce(false);
return (PyObject*)newObj; return (PyObject*)newObj;

2
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 // PURPOSE: Class wrapper to map animation functions to plasma2 message
// //
#include <Python.h>
#include "hsTemplates.h" #include "hsTemplates.h"
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyPoint3; class pyPoint3;

8
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); ptPhysics *newObj = (ptPhysics*)ptPhysics_type.tp_new(&ptPhysics_type, NULL, NULL);
if (sender != 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) 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); newObj->fThis->SetNetForce(false);
return (PyObject*)newObj; return (PyObject*)newObj;

2
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 // NOTE: Eventually, this will be made into a separate dll, because there should
// only be one instance of this interface. // only be one instance of this interface.
// //
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <Python.h>
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE) #if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
#include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h" #include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h"

2
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. // This modifier will handle the interface to python code that has been file-ized.
// //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#include "plPythonFileMod.h"
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStream.h" #include "hsStream.h"
@ -97,7 +98,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plProfile.h" #include "plProfile.h"
#include "plPythonFileMod.h"
#include "cyPythonInterface.h" #include "cyPythonInterface.h"
#include "pyKey.h" #include "pyKey.h"
#include "cyDraw.h" #include "cyDraw.h"

2
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. // This modifier will handle the interface to python code that has been file-ized.
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pnModifier/plMultiModifier.h" #include "pnModifier/plMultiModifier.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "hsResMgr.h" #include "hsResMgr.h"
#include <Python.h>
#include "plPythonParameter.h" #include "plPythonParameter.h"

2
Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp

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

2
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 #ifndef plPythonPack_h_inc
#define plPythonPack_h_inc #define plPythonPack_h_inc
#include "Python.h" #include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
namespace PythonPack namespace PythonPack

1
Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.cpp

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

4
Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h

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

12
Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp

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

2
Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.h

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

2
Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.cpp

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

2
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 #ifndef pyAgeLinkStruct_h_inc
#define pyAgeLinkStruct_h_inc #define pyAgeLinkStruct_h_inc
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "plNetCommon/plNetServerSessionInfo.h" #include "plNetCommon/plNetServerSessionInfo.h"
#include "pyAgeInfoStruct.h" #include "pyAgeInfoStruct.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

2
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 // pyAgeVault - a wrapper class to provide interface to the plVaultAgeNode
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyVaultNode; class pyVaultNode;

2
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 #ifndef pyAlarm_h_inc
#define pyAlarm_h_inc #define pyAlarm_h_inc
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <Python.h>
struct pyAlarm; struct pyAlarm;
class pyAlarmMgr class pyAlarmMgr

2
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 "HeadSpin.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyAudioControl class pyAudioControl

2
Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp

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

2
Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp

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

2
Sources/Plasma/FeatureLib/pfPython/pyCluster.h

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

2
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 // pyColor - the wrapper class for hsColorRGBA structure
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "hsColorRGBA.h" #include "hsColorRGBA.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyColor class pyColor

2
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 "HeadSpin.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class plDniCoordinateInfo; class plDniCoordinateInfo;

2
Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.cpp

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

3
Sources/Plasma/FeatureLib/pfPython/pyDniInfoSource.h

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

2
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 // pyDrawControl - a wrapper class all the draw/pipeline control functions
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyDrawControl class pyDrawControl

20
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 "plgDispatch.h"
#include "plMessage/plDynamicTextMsg.h" #include "plMessage/plDynamicTextMsg.h"
#include "pyKey.h" #include "pyKey.h"
@ -54,7 +55,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyImage.h" #include "pyImage.h"
#include "plGImage/plDynamicTextMap.h" #include "plGImage/plDynamicTextMap.h"
#include "pyDynamicText.h"
pyDynamicText::pyDynamicText() pyDynamicText::pyDynamicText()
{ {
@ -154,7 +154,8 @@ void pyDynamicText::ClearToColor( pyColor& color )
plDynamicTextMsg* pMsg = ICreateDTMsg(); plDynamicTextMsg* pMsg = ICreateDTMsg();
if ( pMsg ) if ( pMsg )
{ {
pMsg->ClearToColor(color.getColor()); hsColorRGBA col = color.getColor();
pMsg->ClearToColor(col);
plgDispatch::MsgSend( pMsg ); // whoosh... off it goes plgDispatch::MsgSend( pMsg ); // whoosh... off it goes
} }
@ -193,7 +194,8 @@ void pyDynamicText::SetTextColor2( pyColor& color, bool blockRGB )
plDynamicTextMsg* pMsg = ICreateDTMsg(); plDynamicTextMsg* pMsg = ICreateDTMsg();
if ( pMsg ) if ( pMsg )
{ {
pMsg->SetTextColor(color.getColor(),blockRGB); hsColorRGBA col = color.getColor();
pMsg->SetTextColor(col,blockRGB);
plgDispatch::MsgSend( pMsg ); // whoosh... off it goes 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(); plDynamicTextMsg* pMsg = ICreateDTMsg();
if ( pMsg ) 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 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(); plDynamicTextMsg* pMsg = ICreateDTMsg();
if ( pMsg ) 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 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(); plDynamicTextMsg* pMsg = ICreateDTMsg();
if ( pMsg ) 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 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(); plDynamicTextMsg* pMsg = ICreateDTMsg();
if ( pMsg ) 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 plgDispatch::MsgSend( pMsg ); // whoosh... off it goes
} }
} }

3
Sources/Plasma/FeatureLib/pfPython/pyDynamicText.h

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

2
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/pfGUIControlMod.h"
#include "pfGameGUIMgr/pfGUIDialogMod.h" #include "pfGameGUIMgr/pfGUIDialogMod.h"
#include "pyKey.h" #include "pyKey.h"
#include "pyGUIControl.h"
#include "pyGUIDialog.h" #include "pyGUIDialog.h"
#include "pyColor.h" #include "pyColor.h"

2
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 "pyKey.h"
#include "pyGeometry3.h" #include "pyGeometry3.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyGUIDialog; class pyGUIDialog;

2
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 // attached to a GUIControlButton
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pyKey.h" #include "pyKey.h"
#include "pyGeometry3.h" #include "pyGeometry3.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
#include "pyGUIControl.h" #include "pyGUIControl.h"

2
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 "pyKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
#include "pyGUIControl.h" #include "pyGUIControl.h"

2
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 "pyKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
#include "pyGUIControl.h" #include "pyGUIControl.h"

2
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 "pyKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
#include "pyGUIControl.h" #include "pyGUIControl.h"

2
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 // attached to a GUIControlDraggable
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pyKey.h" #include "pyKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
#include "pyGUIControl.h" #include "pyGUIControl.h"

2
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 // attached to a GUIControlDynamicText
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pyKey.h" #include "pyKey.h"
#include "pyGUIControl.h" #include "pyGUIControl.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyDynamicText; class pyDynamicText;

2
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 // attached to a GUIControlEditBox
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "pyKey.h" #include "pyKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
#include "pyGUIControl.h" #include "pyGUIControl.h"

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp

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

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

7
Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp

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

2
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 // attached to a GUIControlMultiLineEdit
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pyKey.h" #include "pyKey.h"
#include "pyGUIControl.h" #include "pyGUIControl.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyColor; class pyColor;

2
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 // attached to a GUIControlRadioGroup
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pyKey.h" #include "pyKey.h"
#include "pyGUIControl.h" #include "pyGUIControl.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyGUIControlRadioGroup :public pyGUIControl class pyGUIControlRadioGroup :public pyGUIControl

2
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 // attached to a GUIControlTextBox
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pyKey.h" #include "pyKey.h"
#include "pyGUIControl.h" #include "pyGUIControl.h"
#include "pfGameGUIMgr/pfGUIControlMod.h" #include "pfGameGUIMgr/pfGUIControlMod.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyColor; class pyColor;

2
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 "hsStlUtils.h"
#include "pyKey.h" #include "pyKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"

2
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 "pfGameGUIMgr/pfGUIPopUpMenu.h"
#include "pyKey.h" #include "pyKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyColor; class pyColor;

2
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 // PURPOSE: a wrapper class to provide access to a game score
// //
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
struct pfGameScore; struct pfGameScore;

2
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 // pyGeometry3 - the wrapper class for hsPoint3 and hsVector3
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyPoint3 class pyPoint3

2
Sources/Plasma/FeatureLib/pfPython/pyGrassShader.h

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

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

2
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 "hsStlUtils.h"
#include "pyKey.h" #include "pyKey.h"
#include "pyGeometry3.h" #include "pyGeometry3.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyImage; class pyImage;

2
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 // pyKey - the wrapper class around a plKey so that Python can handle it
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class plPythonFileMod; class plPythonFileMod;

2
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 "HeadSpin.h"
#include "pnInputCore/plKeyMap.h" #include "pnInputCore/plKeyMap.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyKeyMap class pyKeyMap

2
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 // pyMarkerMgr - a wrapper class to provide interface to the pfMarkerMgr stuff
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyMarkerMgr class pyMarkerMgr

2
Sources/Plasma/FeatureLib/pfPython/pyMatrix44.h

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

2
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 // pyMoviePlayer - a wrapper class all the movie player functions
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pyKey.h" #include "pyKey.h"
#include "pyColor.h" #include "pyColor.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyMoviePlayer class pyMoviePlayer

2
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." # error "pyNetLinkingMgr is not compatible with pyPlasma.pyd. Use BUILDING_PYPLASMA macro to ifdef out unwanted headers."
#endif #endif
#include "pyNetLinkingMgr.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "pyNetLinkingMgr.h"
#include "plNetClient/plNetLinkingMgr.h" #include "plNetClient/plNetLinkingMgr.h"
#include "plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"

2
Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.h

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

2
Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h

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

2
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 // pyNotify - a wrapper class to provide interface to send a NotifyMsg
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include "pyNotify.h"
#include "plgDispatch.h" #include "plgDispatch.h"
#include "pnMessage/plNotifyMsg.h" #include "pnMessage/plNotifyMsg.h"
@ -51,7 +52,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPythonFileMod.h" #include "plPythonFileMod.h"
#include "pyGeometry3.h" #include "pyGeometry3.h"
#include "pyNotify.h"
pyNotify::pyNotify() pyNotify::pyNotify()
{ {

2
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 "pnMessage/plNotifyMsg.h"
#include "pyKey.h" #include "pyKey.h"
#include "pyGeometry3.h" #include "pyGeometry3.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class pyNotify class pyNotify

2
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 // PURPOSE: Class wrapper for Python to the player data
// //
#include <Python.h>
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "pyKey.h" #include "pyKey.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class plKey; class plKey;

2
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. // pySDL - python subset of the plSDL library.
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class plStateDataRecord; class plStateDataRecord;

2
Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp

@ -39,8 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021 Mead, WA 99021
*==LICENSE==*/ *==LICENSE==*/
#include "HeadSpin.h" // TEMP, for STL warnings
#include "pySceneObject.h" #include "pySceneObject.h"
#include "HeadSpin.h" // TEMP, for STL warnings
#include "pnKeyedObject/plKey.h" #include "pnKeyedObject/plKey.h"
#include "cyAvatar.h" #include "cyAvatar.h"

2
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 // attached to a SceneObject
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pyKey.h" #include "pyKey.h"
#include "cyDraw.h" #include "cyDraw.h"
@ -57,7 +58,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"

2
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 // PURPOSE: a wrapper class to provide an interface to the scoring system
// //
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"

2
Sources/Plasma/FeatureLib/pfPython/pySpawnPointInfo.h

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

2
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) // and interface to the ChatLog (ptChatStatusLog)
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
#include "pyColor.h" #include "pyColor.h"

2
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 // pyStream - a wrapper class to provide interface to the File stream stuff
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"

2
Sources/Plasma/FeatureLib/pfPython/pySwimCurrentInterface.h

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

13
Sources/Plasma/FeatureLib/pfPython/pyVault.cpp

@ -575,7 +575,8 @@ void pyVault::UnRegisterVisitAge( const char * guidstr )
Uuid uuid; Uuid uuid;
GuidFromString(guidstr, &uuid); GuidFromString(guidstr, &uuid);
plAgeInfoStruct info; plAgeInfoStruct info;
info.SetAgeInstanceGuid(&plUUID(uuid)); plUUID guid(uuid);
info.SetAgeInstanceGuid(&guid);
VaultUnregisterVisitAgeAndWait(&info); VaultUnregisterVisitAgeAndWait(&info);
} }
@ -583,7 +584,7 @@ void pyVault::UnRegisterVisitAge( const char * guidstr )
void _InvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node) void _InvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node)
{ {
if (result == kNetSuccess) if (result == kNetSuccess)
VaultSendNode(node, (uint32_t)param); VaultSendNode(node, (uint32_t)((uintptr_t)param));
} }
void pyVault::InvitePlayerToAge( const pyAgeLinkStruct & link, uint32_t playerID ) 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) void _UninvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node)
{ {
if (result == kNetSuccess) if (result == kNetSuccess)
VaultSendNode(node, (uint32_t)param); VaultSendNode(node, (uint32_t)((uintptr_t)param));
} }
void pyVault::UnInvitePlayerToAge( const char * str, uint32_t playerID ) void pyVault::UnInvitePlayerToAge( const char * str, uint32_t playerID )
{ {
plAgeInfoStruct info; plAgeInfoStruct info;
info.SetAgeInstanceGuid(&plUUID(str)); plUUID guid(str);
info.SetAgeInstanceGuid(&guid);
if (RelVaultNode * rvnLink = VaultGetOwnedAgeLinkIncRef(&info)) { if (RelVaultNode * rvnLink = VaultGetOwnedAgeLinkIncRef(&info)) {
if (RelVaultNode * rvnInfo = rvnLink->GetChildNodeIncRef(plVault::kNodeType_AgeInfo, 1)) { 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() ); 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()->SetAgeUserDefinedName( title.c_str() );
link.GetAgeInfo()->SetAgeDescription( desc.c_str() ); link.GetAgeInfo()->SetAgeDescription( desc.c_str() );

2
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 // pyVault - a wrapper class to provide interface to the plVault and the RelVaultNode
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
class plKey; class plKey;

2
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 // pyVaultAgeInfoListNode - a wrapper class to provide interface to the RelVaultNode
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "HeadSpin.h" #include "HeadSpin.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h" #include "pyGlueHelpers.h"
#include "pyVaultFolderNode.h" #include "pyVaultFolderNode.h"

2
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 // pyVaultAgeInfoNode - a wrapper class to provide interface to the RelVaultNode
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include "pyVaultAgeInfoNode.h"
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "pyVaultAgeInfoNode.h"
#include "pyVaultAgeInfoListNode.h" #include "pyVaultAgeInfoListNode.h"
#include "pyVaultPlayerInfoListNode.h" #include "pyVaultPlayerInfoListNode.h"
#include "pyVaultPlayerInfoNode.h" #include "pyVaultPlayerInfoNode.h"

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save