OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04:00
Code Releases Activity

Merge remote-tracking branch 'origin/master' into plString

Browse Source 
Conflicts:
	Sources/Plasma/FeatureLib/pfPython/pyVault.cpp
	Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.cpp
	Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp
	Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp
	Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp

--HG--
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxStr.cpp => Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxStr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxSync.cpp => Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxSync.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxUuid.cpp => Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxUuid.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/W32Int.h => Sources/Plasma/NucleusLib/pnUtils/Win32/W32Int.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Addr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Dll.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Dll.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Misc.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Misc.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Path.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Path.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Str.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Str.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Sync.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Sync.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Time.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Time.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Uuid.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.h => Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAllIncludes.h => Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtArray.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h => Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.h => Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.h => Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.h => Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCoreLib.h => Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.h => Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtHash.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h => Sources/Plasma/NucleusLib/pnUtils/pnUtHash.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtList.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h => Sources/Plasma/NucleusLib/pnUtils/pnUtList.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMath.h => Sources/Plasma/NucleusLib/pnUtils/pnUtMath.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.h => Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtPath.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.h => Sources/Plasma/NucleusLib/pnUtils/pnUtPath.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPragma.h => Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPriQ.h => Sources/Plasma/NucleusLib/pnUtils/pnUtPriQ.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtRand.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.h => Sources/Plasma/NucleusLib/pnUtils/pnUtRand.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h => Sources/Plasma/NucleusLib/pnUtils/pnUtRef.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSort.h => Sources/Plasma/NucleusLib/pnUtils/pnUtSort.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.h => Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.h => Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSync.h => Sources/Plasma/NucleusLib/pnUtils/pnUtSync.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtTime.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.h => Sources/Plasma/NucleusLib/pnUtils/pnUtTime.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtTls.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.h => Sources/Plasma/NucleusLib/pnUtils/pnUtTls.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h => Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.h
This commit is contained in:
Michael Hansen
2012-02-05 22:01:09 -08:00
parent be4b0732d5 b2e8edb725
commit e6ebf7ffaf
280 changed files with 1099 additions and 1881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt
View File

@ -38,6 +38,7 @@ set(pfPython_SOURCES
pyEnum.cpp
pyGameScore.cpp
pyGeometry3.cpp
pyGlueHelpers.cpp
pyGrassShader.cpp
pyGUIControl.cpp
pyGUIControlButton.cpp

2
Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralGame.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/BlueSpiral/pyBlueSpiralMsg.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallGame.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/ClimbingWall/pyClimbingWallMsg.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekGame.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/Heek/pyHeekMsg.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerGame.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/Marker/pyMarkerMsg.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTGame.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/TicTacToe/pyTTTMsg.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncGame.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/VarSync/pyVarSyncMsg.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h
View File

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

12
Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.cpp
View File

@ -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;
}
}

2
Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliMsg.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/cyAnimation.cpp
View File

@ -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()
{

2
Sources/Plasma/FeatureLib/pfPython/cyAnimation.h
View File

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

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

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

2
Sources/Plasma/FeatureLib/pfPython/cyAvatar.h
View File

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

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

@ -801,10 +801,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;
}

2
Sources/Plasma/FeatureLib/pfPython/cyCamera.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/cyDraw.h
View File

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

10
Sources/Plasma/FeatureLib/pfPython/cyDrawGlue.cpp
View File

@ -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);
}
}

7
Sources/Plasma/FeatureLib/pfPython/cyInputInterfaceGlue.cpp
View File

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

23
Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
View File

@ -1317,7 +1317,8 @@ void cyMisc::SetPrivateChatList(const std::vector<pyPlayer*> & tolist)
for (int i=0 ; i<tolist.size() ; i++ )
pMsg->GetClientList()->Append(tolist[i]->GetPlayerID());
pMsg->SetRemovedKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
plKey k = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
pMsg->SetRemovedKey(k);
pMsg->Send();
}
}
@ -1334,7 +1335,8 @@ void cyMisc::SetPrivateChatList(const std::vector<pyPlayer*> & tolist)
void cyMisc::ClearPrivateChatList(pyKey& member)
{
plNetVoiceListMsg* pMsg = new plNetVoiceListMsg(plNetVoiceListMsg::kDistanceMode);
pMsg->SetRemovedKey( member.getKey() );
plKey k = member.getKey();
pMsg->SetRemovedKey(k);
pMsg->Send();
}
@ -1548,7 +1550,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();
}
@ -1562,7 +1564,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();
}
@ -1577,7 +1579,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);
}
@ -1659,7 +1661,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();
@ -1669,7 +1672,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();
}
@ -1677,7 +1681,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();
}
@ -2425,7 +2430,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();
}

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

@ -39,6 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include <Python.h>
#include "cyMisc.h"
#include "pyGlueHelpers.h"
#include "pyKey.h"
@ -47,11 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyEnum.h"
// for enums
#include "plNetCommon\plNetCommon.h"
#include "plResMgr\plLocalization.h"
#include "plMessage\plLOSRequestMsg.h"
#include "plNetCommon/plNetCommon.h"
#include "plResMgr/plLocalization.h"
#include "plMessage/plLOSRequestMsg.h"
#include <Python.h>
PYTHON_GLOBAL_METHOD_DEFINITION(PtYesNoDialog, args, "Params: selfkey,dialogMessage\nThis will display a Yes/No dialog to the user with the text dialogMessage\n"
"This dialog _has_ to be answered by the user.\n"

2
Sources/Plasma/FeatureLib/pfPython/cyParticleSys.h
View File

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

8
Sources/Plasma/FeatureLib/pfPython/cyParticleSysGlue.cpp
View File

@ -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;

2
Sources/Plasma/FeatureLib/pfPython/cyPhysics.h
View File

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

10
Sources/Plasma/FeatureLib/pfPython/cyPhysicsGlue.cpp
View File

@ -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);
}
}

2
Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h
View File

@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// NOTE: Eventually, this will be made into a separate dll, because there should
// only be one instance of this interface.
//
#include <Python.h>
#include "HeadSpin.h"
#include "hsStlUtils.h"
#include <Python.h>
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
#include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h"

2
Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
View File

@ -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"

2
Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h
View File

@ -49,12 +49,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// This modifier will handle the interface to python code that has been file-ized.
//
//////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pnModifier/plMultiModifier.h"
#include "hsGeometry3.h"
#include "hsResMgr.h"
#include <Python.h>
#include "plPythonParameter.h"

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

@ -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"

2
Sources/Plasma/FeatureLib/pfPython/plPythonPack.h
View File

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

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

@ -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"

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

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

14
Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp
View File

@ -39,9 +39,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "hsStlUtils.h"
#include "pyAgeInfoStruct.h"
#include "hsStlUtils.h"
#include "pnUtils/pnUtCrypt.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

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

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

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

@ -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"
///////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/pyAgeLinkStruct.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyAlarm.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyAudioControl.h
View File

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

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

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

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

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

4
Sources/Plasma/FeatureLib/pfPython/pyCluster.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyColor.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyDniCoordinates.h
View File

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

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

@ -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()

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

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

2
Sources/Plasma/FeatureLib/pfPython/pyDrawControl.h
View File

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

20
Sources/Plasma/FeatureLib/pfPython/pyDynamicText.cpp
View File

@ -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
}
}

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

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp
View File

@ -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"

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlButton.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlCheckBox.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlClickMap.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlDragBar.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlDraggable.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlDynamicText.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlEditBox.h
View File

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

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

@ -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)

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.h
View File

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

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

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlRadioGroup.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIDialog.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIDialogGlue.cpp
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyGUIPopUpMenu.h
View File

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

4
Sources/Plasma/FeatureLib/pfPython/pyGameScore.h
View File

@ -49,10 +49,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// PURPOSE: a wrapper class to provide access to a game score
//
#include <Python.h>
#include "HeadSpin.h"
#include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h"
struct pfGameScore;
@ -87,4 +87,4 @@ public:
bool SetPoints(int numPoints);
};
#endif
#endif

2
Sources/Plasma/FeatureLib/pfPython/pyGeometry3.h
View File

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

63
Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.cpp Normal file
View File

@ -0,0 +1,63 @@
/*==LICENSE==*
CyanWorlds.com Engine - MMOG client, server and tools
Copyright (C) 2011 Cyan Worlds, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Additional permissions under GNU GPL version 3 section 7
If you modify this Program, or any covered work, by linking or
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
(or a modified version of those libraries),
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
licensors of this Program grant you additional
permission to convey the resulting work. Corresponding Source for a
non-source form of such a combination shall include the source code for
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
work.
You can contact Cyan Worlds, Inc. by email legal@cyan.com
or by snail mail at:
Cyan Worlds, Inc.
14617 N Newport Hwy
Mead, WA 99021
*==LICENSE==*/
#include "HeadSpin.h"
#include "pyGlueHelpers.h"
char* PyString_AsStringEx(PyObject* obj)
{
if (PyString_Check(obj))
return hsStrcpy(PyString_AsString(obj));
else if (PyUnicode_Check(obj))
{
PyObject* utf8 = PyUnicode_AsUTF8String(obj);
char* buf = hsStrcpy(PyString_AsString(utf8));
Py_DECREF(utf8);
return buf;
} else
return NULL; // You suck.
}
bool PyString_CheckEx(PyObject* obj)
{
return (PyString_Check(obj) || PyUnicode_Check(obj));
}

6
Sources/Plasma/FeatureLib/pfPython/pyGlueHelpers.h
View File

@ -42,6 +42,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef _pyGlueHelpers_h_
#define _pyGlueHelpers_h_
#include <Python.h>
// Useful string functions
char* PyString_AsStringEx(PyObject*);
inline bool PyString_CheckEx(PyObject*);
// A set of macros to take at least some of the tediousness out of creating straight python glue code
/////////////////////////////////////////////////////////////////////

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

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

2
Sources/Plasma/FeatureLib/pfPython/pyImage.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyJournalBook.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyKey.h
View File

@ -47,10 +47,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// pyKey - the wrapper class around a plKey so that Python can handle it
//
//////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "pnKeyedObject/plKey.h"
#include <Python.h>
#include "pyGlueHelpers.h"
#include "plString.h"

2
Sources/Plasma/FeatureLib/pfPython/pyKeyMap.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyMarkerMgr.h
View File

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

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

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

2
Sources/Plasma/FeatureLib/pfPython/pyMoviePlayer.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyNetLinkingMgr.cpp
View File

@ -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"

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

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

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

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

2
Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp
View File

@ -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()
{

2
Sources/Plasma/FeatureLib/pfPython/pyNotify.h
View File

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

2
Sources/Plasma/FeatureLib/pfPython/pyPlayer.h
View File

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

70
Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp
View File

@ -63,56 +63,46 @@ PYTHON_INIT_DEFINITION(ptPlayer, args, keywords)
PyErr_SetString(PyExc_TypeError, "__init__ expects one of two argument lists: (ptKey, string, unsigned long, float) or (string, unsigned long)");
PYTHON_RETURN_INIT_ERROR;
}
if (pyKey::Check(firstObj)) // arg set 1
pyKey* key = NULL;
char* name = NULL;
uint32_t pid = -1;
float distSeq = -1;
if (pyKey::Check(firstObj))
{
// make sure the remaining objects fit the arg list
if ((!thirdObj) || (!fourthObj))
key = pyKey::ConvertFrom(firstObj);
if (!(name = PyString_AsStringEx(secondObj)))
{
// missing arguments
PyErr_SetString(PyExc_TypeError, "__init__ expects one of two argument lists: (ptKey, string, unsigned long, float) or (string, unsigned long)");
PYTHON_RETURN_INIT_ERROR;
}
if ((!PyString_Check(secondObj)) || (!PyLong_Check(thirdObj)) || (!PyFloat_Check(fourthObj)))
if (!(PyNumber_Check(thirdObj) && PyFloat_Check(fourthObj)))
{
// incorrect types
delete[] name;
PyErr_SetString(PyExc_TypeError, "__init__ expects one of two argument lists: (ptKey, string, unsigned long, float) or (string, unsigned long)");
PYTHON_RETURN_INIT_ERROR;
}
// all args are correct, convert and init
pyKey* key = pyKey::ConvertFrom(firstObj);
char* name = PyString_AsString(secondObj);
unsigned long pid = PyLong_AsUnsignedLong(thirdObj);
float distsq = (float)PyFloat_AsDouble(fourthObj);
self->fThis->Init(key->getKey(), name, pid, distsq);
PYTHON_RETURN_INIT_OK;
pid = PyNumber_AsSsize_t(thirdObj, NULL);
distSeq = (float)PyFloat_AsDouble(fourthObj);
} else if (name = PyString_AsStringEx(firstObj)) {
if (!PyNumber_Check(secondObj) || thirdObj || fourthObj)
{
delete[] name;
PyErr_SetString(PyExc_TypeError, "__init__ expects one of two argument lists: (ptKey, string, unsigned long, float) or (string, unsigned long)");
PYTHON_RETURN_INIT_ERROR;
}
pid = PyNumber_AsSsize_t(secondObj, NULL);
} else {
PyErr_SetString(PyExc_TypeError, "__init__ expects one of two argument lists: (ptKey, string, unsigned long, float) or (string, unsigned long)");
PYTHON_RETURN_INIT_ERROR;
}
else if (PyString_Check(firstObj)) // arg set 2
{
// make sure there are only two args
if (thirdObj || fourthObj)
{
// too many arguments
PyErr_SetString(PyExc_TypeError, "__init__ expects one of two argument lists: (ptKey, string, unsigned long, float) or (string, unsigned long)");
PYTHON_RETURN_INIT_ERROR;
}
char* name = PyString_AsString(firstObj);
unsigned long pid = 0;
if (PyLong_Check(secondObj))
pid = PyLong_AsUnsignedLong(secondObj);
else if (PyInt_Check(secondObj))
pid = (unsigned long)PyInt_AsLong(secondObj);
else
{
// incorrect type
PyErr_SetString(PyExc_TypeError, "__init__ expects one of two argument lists: (ptKey, string, unsigned long, float) or (string, unsigned long)");
PYTHON_RETURN_INIT_ERROR;
}
self->fThis->Init(nil, name, pid, -1);
PYTHON_RETURN_INIT_OK;
}
// some other args came in
PyErr_SetString(PyExc_TypeError, "__init__ expects one of two argument lists: (ptKey, string, unsigned long, float) or (string, unsigned long)");
PYTHON_RETURN_INIT_ERROR;
self->fThis->Init(key, name, pid, distSeq);
delete[] name;
PYTHON_RETURN_INIT_OK;
}
PYTHON_RICH_COMPARE_DEFINITION(ptPlayer, obj1, obj2, compareType)

2
Sources/Plasma/FeatureLib/pfPython/pySDL.h
View File

@ -47,11 +47,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// pySDL - python subset of the plSDL library.
//
//////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "HeadSpin.h"
#include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h"
class plStateDataRecord;

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

@ -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"

2
Sources/Plasma/FeatureLib/pfPython/pySceneObject.h
View File

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

4
Sources/Plasma/FeatureLib/pfPython/pyScoreMgr.h
View File

@ -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 <Python.h>
#include "HeadSpin.h"
#include "hsStlUtils.h"
#include <Python.h>
#include "pyGlueHelpers.h"
@ -112,4 +112,4 @@ public:
);
};
#endif
#endif

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

@ -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 <Python.h>
#include "HeadSpin.h"
#include "hsStlUtils.h"
#include "plNetCommon/plSpawnPointInfo.h"
#include <Python.h>
#include "pyGlueHelpers.h"
//////////////////////////////////////////////////////////////////////

2
Sources/Plasma/FeatureLib/pfPython/pyStatusLog.h
View File

@ -48,10 +48,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//
// and interface to the ChatLog (ptChatStatusLog)
//////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "HeadSpin.h"
#include <Python.h>
#include "pyGlueHelpers.h"
#include "pyColor.h"

2
Sources/Plasma/FeatureLib/pfPython/pyStream.h
View File

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

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