mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
Merge msvc10 into cursors2
This commit is contained in:
@ -71,13 +71,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#include "../plAvatar/plArmatureMod.h"
|
||||
#include "../plAvatar/plAvBrainHuman.h"
|
||||
#include "../plNetClient/plNetClientMgr.h"
|
||||
//#define aspect_HDTV // maybe someday we'll be on the xbox...
|
||||
|
||||
#ifdef aspect_HDTV
|
||||
#define FOV_RATIO 1.78
|
||||
#else
|
||||
#define FOV_RATIO 1.33333333
|
||||
#endif
|
||||
|
||||
hsBool plCameraBrain1_FirstPerson::fDontFade = false;
|
||||
hsScalar plCameraBrain1::fFallAccel = 20.0f;
|
||||
@ -257,7 +250,7 @@ void plCameraBrain1::IAnimateFOV(double time)
|
||||
dH = fFOVGoal;
|
||||
}
|
||||
|
||||
fCamera->SetFOVw( (hsScalar)(dH * FOV_RATIO) );
|
||||
fCamera->SetFOVw( (hsScalar)(dH * plVirtualCam1::GetAspectRatio()) );
|
||||
fCamera->SetFOVh( dH );
|
||||
|
||||
}
|
||||
|
@ -238,7 +238,7 @@ public:
|
||||
plCameraBrain1_Drive(plCameraModifier1* pMod);
|
||||
~plCameraBrain1_Drive();
|
||||
|
||||
static SetSensitivity(hsScalar f) { fTurnRate = f; }
|
||||
static void SetSensitivity(hsScalar f) { fTurnRate = f; }
|
||||
|
||||
CLASSNAME_REGISTER( plCameraBrain1_Drive );
|
||||
GETINTERFACE_ANY( plCameraBrain1_Drive, plCameraBrain1 );
|
||||
|
@ -7040,6 +7040,7 @@ PF_CONSOLE_CMD( Python, // Group name
|
||||
}
|
||||
|
||||
#ifndef LIMIT_CONSOLE_COMMANDS
|
||||
#ifdef HAVE_CYPYTHONIDE
|
||||
PF_CONSOLE_CMD( Python,
|
||||
UsePythonDebugger,
|
||||
"",
|
||||
@ -7047,6 +7048,7 @@ PF_CONSOLE_CMD( Python,
|
||||
{
|
||||
PythonInterface::UsePythonDebugger(true);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#include "../pfMessage/pfBackdoorMsg.h"
|
||||
|
@ -61,6 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#include "plgDispatch.h"
|
||||
#include "hsResMgr.h"
|
||||
#include "../pnInputCore/plKeyMap.h"
|
||||
#include "../plClipboard/plClipboard.h"
|
||||
|
||||
#include <locale>
|
||||
|
||||
@ -501,6 +502,34 @@ hsBool pfGUIEditBoxMod::HandleKeyEvent( pfGameGUIMgr::EventType event, plKeyDef
|
||||
DoSomething(); // Query WasEscaped() to see if it was escape vs enter
|
||||
return true;
|
||||
}
|
||||
else if (modifiers & pfGameGUIMgr::kCtrlDown)
|
||||
{
|
||||
if (key == KEY_C)
|
||||
{
|
||||
plClipboard::GetInstance().SetClipboardText(fBuffer);
|
||||
}
|
||||
else if (key == KEY_V)
|
||||
{
|
||||
wchar_t* contents = plClipboard::GetInstance().GetClipboardText();
|
||||
if (contents != nil)
|
||||
{
|
||||
size_t len = wcslen(contents);
|
||||
if (len > 0)
|
||||
{
|
||||
wchar_t* insertTarget = fBuffer + fCursorPos;
|
||||
size_t bufferTailLen = wcslen(insertTarget) + 1; //include terminating \0
|
||||
if (fCursorPos + len + bufferTailLen < fBufferSize)
|
||||
{
|
||||
memmove(insertTarget + len, insertTarget, bufferTailLen * sizeof(wchar_t));
|
||||
memcpy(insertTarget, contents, len * sizeof(wchar_t));
|
||||
fCursorPos += len;
|
||||
HandleExtendedEvent( kValueChanging );
|
||||
}
|
||||
}
|
||||
delete contents;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
fIgnoreNextKey = false;
|
||||
|
@ -60,6 +60,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#include "../plGImage/plDynamicTextMap.h"
|
||||
#include "plgDispatch.h"
|
||||
#include "hsResMgr.h"
|
||||
#include "../plClipboard/plClipboard.h"
|
||||
|
||||
|
||||
//// Tiny Helper Class ///////////////////////////////////////////////////////
|
||||
@ -1172,9 +1173,6 @@ hsBool pfGUIMultiLineEditCtrl::HandleKeyEvent( pfGameGUIMgr::EventType event, pl
|
||||
if ((fPrevCtrl || fNextCtrl) && (fLineStarts.GetCount() <= GetFirstVisibleLine()))
|
||||
return true; // we're ignoring if we can't actually edit our visible frame (and we're linked)
|
||||
|
||||
if (modifiers & pfGameGUIMgr::kCtrlDown)
|
||||
return true; // we're ignoring ctrl key events
|
||||
|
||||
if( event == pfGameGUIMgr::kKeyDown || event == pfGameGUIMgr::kKeyRepeat )
|
||||
{
|
||||
// Use arrow keys to do our dirty work
|
||||
@ -1219,6 +1217,22 @@ hsBool pfGUIMultiLineEditCtrl::HandleKeyEvent( pfGameGUIMgr::EventType event, pl
|
||||
// fEscapedFlag = true;
|
||||
DoSomething(); // Query WasEscaped() to see if it was escape vs enter
|
||||
}
|
||||
else if (modifiers & pfGameGUIMgr::kCtrlDown)
|
||||
{
|
||||
if (key == KEY_C)
|
||||
{
|
||||
plClipboard::GetInstance().SetClipboardText(fBuffer.AcquireArray());
|
||||
}
|
||||
else if (key == KEY_V)
|
||||
{
|
||||
wchar_t* contents = plClipboard::GetInstance().GetClipboardText();
|
||||
if (contents != nil)
|
||||
{
|
||||
InsertString(contents);
|
||||
delete contents;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
fIgnoreNextKey = false;
|
||||
|
@ -68,10 +68,10 @@ public:
|
||||
virtual ~pfGUIMultiLineEditProc() {}
|
||||
|
||||
// we've hit the end of the control list (by moving the cursor)
|
||||
virtual OnEndOfControlList(Int32 cursorPos) {}
|
||||
virtual void OnEndOfControlList(Int32 cursorPos) {}
|
||||
|
||||
// we've hit the beginning of the control ist (by moving the cursor)
|
||||
virtual OnBeginningOfControlList(Int32 cursorPos) {}
|
||||
virtual void OnBeginningOfControlList(Int32 cursorPos) {}
|
||||
};
|
||||
|
||||
class pfGUIMultiLineEditCtrl : public pfGUIControlMod
|
||||
|
@ -150,7 +150,7 @@ void IBlueSpiral::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) {
|
||||
|
||||
//============================================================================
|
||||
void IBlueSpiral::RecvClothOrder (const Srv2Cli_BlueSpiral_ClothOrder & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -159,7 +159,7 @@ void IBlueSpiral::RecvClothOrder (const Srv2Cli_BlueSpiral_ClothOrder & msg, voi
|
||||
|
||||
//============================================================================
|
||||
void IBlueSpiral::RecvSuccessfulHit (const Srv2Cli_BlueSpiral_SuccessfulHit & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -168,7 +168,7 @@ void IBlueSpiral::RecvSuccessfulHit (const Srv2Cli_BlueSpiral_SuccessfulHit & ms
|
||||
|
||||
//============================================================================
|
||||
void IBlueSpiral::RecvGameWon (const Srv2Cli_BlueSpiral_GameWon & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -177,7 +177,7 @@ void IBlueSpiral::RecvGameWon (const Srv2Cli_BlueSpiral_GameWon & msg, void * pa
|
||||
|
||||
//============================================================================
|
||||
void IBlueSpiral::RecvGameOver (const Srv2Cli_BlueSpiral_GameOver & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -186,7 +186,7 @@ void IBlueSpiral::RecvGameOver (const Srv2Cli_BlueSpiral_GameOver & msg, void *
|
||||
|
||||
//============================================================================
|
||||
void IBlueSpiral::RecvGameStarted (const Srv2Cli_BlueSpiral_GameStarted & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
|
@ -151,7 +151,7 @@ void IClimbingWall::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) {
|
||||
|
||||
//============================================================================
|
||||
void IClimbingWall::RecvNumBlockersChanged (const Srv2Cli_ClimbingWall_NumBlockersChanged & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -160,7 +160,7 @@ void IClimbingWall::RecvNumBlockersChanged (const Srv2Cli_ClimbingWall_NumBlocke
|
||||
|
||||
//============================================================================
|
||||
void IClimbingWall::RecvReady (const Srv2Cli_ClimbingWall_Ready & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -169,7 +169,7 @@ void IClimbingWall::RecvReady (const Srv2Cli_ClimbingWall_Ready & msg, void * pa
|
||||
|
||||
//============================================================================
|
||||
void IClimbingWall::RecvBlockersChanged (const Srv2Cli_ClimbingWall_BlockersChanged & msg, void * param) {
|
||||
ref (param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -178,7 +178,7 @@ void IClimbingWall::RecvBlockersChanged (const Srv2Cli_ClimbingWall_BlockersChan
|
||||
|
||||
//============================================================================
|
||||
void IClimbingWall::RecvPlayerEntered (const Srv2Cli_ClimbingWall_PlayerEntered & msg, void * param) {
|
||||
ref (param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -187,7 +187,7 @@ void IClimbingWall::RecvPlayerEntered (const Srv2Cli_ClimbingWall_PlayerEntered
|
||||
|
||||
//============================================================================
|
||||
void IClimbingWall::RecvSuitMachineLocked (const Srv2Cli_ClimbingWall_SuitMachineLocked & msg, void * param) {
|
||||
ref (param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -196,7 +196,7 @@ void IClimbingWall::RecvSuitMachineLocked (const Srv2Cli_ClimbingWall_SuitMachin
|
||||
|
||||
//============================================================================
|
||||
void IClimbingWall::RecvGameOver (const Srv2Cli_ClimbingWall_GameOver & msg, void * param) {
|
||||
ref (param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
|
@ -151,7 +151,7 @@ void IHeek::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) {
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvPlayGame (const Srv2Cli_Heek_PlayGame & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
@ -159,7 +159,7 @@ void IHeek::RecvPlayGame (const Srv2Cli_Heek_PlayGame & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvGoodbye (const Srv2Cli_Heek_Goodbye & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
@ -167,7 +167,7 @@ void IHeek::RecvGoodbye (const Srv2Cli_Heek_Goodbye & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvWelcome (const Srv2Cli_Heek_Welcome & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
@ -175,7 +175,7 @@ void IHeek::RecvWelcome (const Srv2Cli_Heek_Welcome & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvDrop (const Srv2Cli_Heek_Drop & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
@ -183,7 +183,7 @@ void IHeek::RecvDrop (const Srv2Cli_Heek_Drop & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvSetup (const Srv2Cli_Heek_Setup & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
@ -191,7 +191,7 @@ void IHeek::RecvSetup (const Srv2Cli_Heek_Setup & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvLightState (const Srv2Cli_Heek_LightState & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
@ -199,7 +199,7 @@ void IHeek::RecvLightState (const Srv2Cli_Heek_LightState & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvInterfaceState (const Srv2Cli_Heek_InterfaceState & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
@ -207,7 +207,7 @@ void IHeek::RecvInterfaceState (const Srv2Cli_Heek_InterfaceState & msg, void *
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvCountdownState (const Srv2Cli_Heek_CountdownState & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
@ -215,7 +215,7 @@ void IHeek::RecvCountdownState (const Srv2Cli_Heek_CountdownState & msg, void *
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvWinLose (const Srv2Cli_Heek_WinLose & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
@ -223,7 +223,7 @@ void IHeek::RecvWinLose (const Srv2Cli_Heek_WinLose & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvGameWin (const Srv2Cli_Heek_GameWin & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
@ -231,7 +231,7 @@ void IHeek::RecvGameWin (const Srv2Cli_Heek_GameWin & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IHeek::RecvPointUpdate (const Srv2Cli_Heek_PointUpdate & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
gameCliMsg->Send(gameCli->GetReceiver());
|
||||
|
@ -175,7 +175,7 @@ void IMarker::RecvTeamAssigned (const Srv2Cli_Marker_TeamAssigned & msg, void *
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvGameType (const Srv2Cli_Marker_GameType & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -184,7 +184,7 @@ void IMarker::RecvGameType (const Srv2Cli_Marker_GameType & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvGameStarted (const Srv2Cli_Marker_GameStarted & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -193,7 +193,7 @@ void IMarker::RecvGameStarted (const Srv2Cli_Marker_GameStarted & msg, void * pa
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvGamePaused (const Srv2Cli_Marker_GamePaused & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -202,7 +202,7 @@ void IMarker::RecvGamePaused (const Srv2Cli_Marker_GamePaused & msg, void * para
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvGameReset (const Srv2Cli_Marker_GameReset & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -211,7 +211,7 @@ void IMarker::RecvGameReset (const Srv2Cli_Marker_GameReset & msg, void * param)
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvGameOver (const Srv2Cli_Marker_GameOver & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -220,7 +220,7 @@ void IMarker::RecvGameOver (const Srv2Cli_Marker_GameOver & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvGameNameChanged (const Srv2Cli_Marker_GameNameChanged & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -229,7 +229,7 @@ void IMarker::RecvGameNameChanged (const Srv2Cli_Marker_GameNameChanged & msg, v
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvTimeLimitChanged (const Srv2Cli_Marker_TimeLimitChanged & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -238,7 +238,7 @@ void IMarker::RecvTimeLimitChanged (const Srv2Cli_Marker_TimeLimitChanged & msg,
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvGameDeleted (const Srv2Cli_Marker_GameDeleted & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -250,7 +250,7 @@ void IMarker::RecvGameDeleted (const Srv2Cli_Marker_GameDeleted & msg, void * pa
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvMarkerAdded (const Srv2Cli_Marker_MarkerAdded & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -259,7 +259,7 @@ void IMarker::RecvMarkerAdded (const Srv2Cli_Marker_MarkerAdded & msg, void * pa
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvMarkerDeleted (const Srv2Cli_Marker_MarkerDeleted & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -268,7 +268,7 @@ void IMarker::RecvMarkerDeleted (const Srv2Cli_Marker_MarkerDeleted & msg, void
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvMarkerNameChanged (const Srv2Cli_Marker_MarkerNameChanged & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -277,7 +277,7 @@ void IMarker::RecvMarkerNameChanged (const Srv2Cli_Marker_MarkerNameChanged & ms
|
||||
|
||||
//============================================================================
|
||||
void IMarker::RecvMarkerCaptured (const Srv2Cli_Marker_MarkerCaptured & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
|
@ -153,7 +153,7 @@ void ITicTacToe::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) {
|
||||
|
||||
//============================================================================
|
||||
void ITicTacToe::RecvGameStarted (const Srv2Cli_TTT_GameStarted & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
// player that goes first is shown as X's.
|
||||
if (msg.yourTurn) {
|
||||
@ -172,7 +172,7 @@ void ITicTacToe::RecvGameStarted (const Srv2Cli_TTT_GameStarted & msg, void * pa
|
||||
|
||||
//============================================================================
|
||||
void ITicTacToe::RecvGameOver (const Srv2Cli_TTT_GameOver & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -183,7 +183,7 @@ void ITicTacToe::RecvGameOver (const Srv2Cli_TTT_GameOver & msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void ITicTacToe::RecvMoveMade (const Srv2Cli_TTT_MoveMade & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
// Update the board with the appropriate piece
|
||||
if (msg.playerId == NetCommGetPlayer()->playerInt)
|
||||
|
@ -150,7 +150,7 @@ void IVarSync::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) {
|
||||
|
||||
//============================================================================
|
||||
void IVarSync::RecvStringVarChanged (const Srv2Cli_VarSync_StringVarChanged & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -159,7 +159,7 @@ void IVarSync::RecvStringVarChanged (const Srv2Cli_VarSync_StringVarChanged & ms
|
||||
|
||||
//============================================================================
|
||||
void IVarSync::RecvNumericVarChanged (const Srv2Cli_VarSync_NumericVarChanged & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -168,7 +168,7 @@ void IVarSync::RecvNumericVarChanged (const Srv2Cli_VarSync_NumericVarChanged &
|
||||
|
||||
//============================================================================
|
||||
void IVarSync::RecvAllVarsSent (const Srv2Cli_VarSync_AllVarsSent & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -177,7 +177,7 @@ void IVarSync::RecvAllVarsSent (const Srv2Cli_VarSync_AllVarsSent & msg, void *
|
||||
|
||||
//============================================================================
|
||||
void IVarSync::RecvStringVarCreated (const Srv2Cli_VarSync_StringVarCreated & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
@ -186,7 +186,7 @@ void IVarSync::RecvStringVarCreated (const Srv2Cli_VarSync_StringVarCreated & ms
|
||||
|
||||
//============================================================================
|
||||
void IVarSync::RecvNumericVarCreated (const Srv2Cli_VarSync_NumericVarCreated & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg);
|
||||
gameCliMsg->Set(gameCli, msg);
|
||||
|
@ -64,7 +64,7 @@ struct Factory : THashKeyVal<Uuid> {
|
||||
const GameTypeReg & reg;
|
||||
|
||||
Factory (const GameTypeReg & reg);
|
||||
operator= (const Factory &); // not impl
|
||||
Factory& operator= (const Factory &); // not impl
|
||||
};
|
||||
|
||||
//============================================================================
|
||||
@ -205,7 +205,7 @@ void IGameMgr::RecvGameInstance (const Srv2Cli_GameMgr_GameInstance & msg, void
|
||||
|
||||
//============================================================================
|
||||
void IGameMgr::RecvInviteReceived (const Srv2Cli_GameMgr_InviteReceived & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameMgrMsg * gameMgrMsg = NEWZERO(pfGameMgrMsg);
|
||||
gameMgrMsg->Set(msg);
|
||||
@ -216,7 +216,7 @@ void IGameMgr::RecvInviteReceived (const Srv2Cli_GameMgr_InviteReceived & msg, v
|
||||
|
||||
//============================================================================
|
||||
void IGameMgr::RecvInviteRevoked (const Srv2Cli_GameMgr_InviteRevoked & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
pfGameMgrMsg * gameMgrMsg = NEWZERO(pfGameMgrMsg);
|
||||
gameMgrMsg->Set(msg);
|
||||
@ -587,7 +587,7 @@ void IGameCli::Recv (GameMsgHeader * msg, void * param) {
|
||||
|
||||
//============================================================================
|
||||
void IGameCli::RecvPlayerJoined (const Srv2Cli_Game_PlayerJoined & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
++playerCount;
|
||||
gameCli->OnPlayerJoined(msg);
|
||||
@ -595,7 +595,7 @@ void IGameCli::RecvPlayerJoined (const Srv2Cli_Game_PlayerJoined & msg, void * p
|
||||
|
||||
//============================================================================
|
||||
void IGameCli::RecvPlayerLeft (const Srv2Cli_Game_PlayerLeft & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
--playerCount;
|
||||
gameCli->OnPlayerLeft(msg);
|
||||
@ -603,14 +603,14 @@ void IGameCli::RecvPlayerLeft (const Srv2Cli_Game_PlayerLeft & msg, void * param
|
||||
|
||||
//============================================================================
|
||||
void IGameCli::RecvInviteFailed (const Srv2Cli_Game_InviteFailed & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
gameCli->OnInviteFailed(msg);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void IGameCli::RecvOwnerChange (const Srv2Cli_Game_OwnerChange & msg, void * param) {
|
||||
ref(param);
|
||||
REF(param);
|
||||
|
||||
gameCli->OnOwnerChange(msg);
|
||||
}
|
||||
|
@ -438,8 +438,8 @@ public:
|
||||
pfBookMultiLineEditProc(pfBookData *owner) { bookData = owner; }
|
||||
virtual ~pfBookMultiLineEditProc() {}
|
||||
|
||||
virtual OnEndOfControlList(Int32 cursorPos) { bookData->HitEndOfControlList(cursorPos); }
|
||||
virtual OnBeginningOfControlList(Int32 cursorPos) { bookData->HitBeginningOfControlList(cursorPos); }
|
||||
virtual void OnEndOfControlList(Int32 cursorPos) { bookData->HitEndOfControlList(cursorPos); }
|
||||
virtual void OnBeginningOfControlList(Int32 cursorPos) { bookData->HitBeginningOfControlList(cursorPos); }
|
||||
};
|
||||
|
||||
//// Book data class /////////////////////////////////////////////////////////
|
||||
|
@ -649,25 +649,25 @@ UInt32 cyMisc::ConvertGMTtoDni(UInt32 gtime)
|
||||
plUnifiedTime utime = plUnifiedTime();
|
||||
utime.SetSecs(dtime);
|
||||
// check for daylight savings time in New Mexico and adjust
|
||||
if ( utime.GetMonth() >= 4 && utime.GetMonth() < 11 )
|
||||
if ( utime.GetMonth() >= 3 && utime.GetMonth() <= 11 )
|
||||
{
|
||||
plUnifiedTime dstStart = plUnifiedTime();
|
||||
dstStart.SetGMTime(utime.GetYear(),4,1,2,0,0);
|
||||
// find first Sunday after 4/1 (first sunday of April)
|
||||
dstStart.SetGMTime(utime.GetYear(),3,8,2,0,0);
|
||||
// find first Sunday after (including) 3/8 (second Sunday of March)
|
||||
UInt32 days_to_go = 7 - dstStart.GetDayOfWeek();
|
||||
if (days_to_go == 7)
|
||||
days_to_go = 0;
|
||||
UInt32 dstStartSecs = dstStart.GetSecs() + days_to_go * kOneDay;
|
||||
|
||||
plUnifiedTime dstEnd = plUnifiedTime();
|
||||
dstEnd.SetGMTime(utime.GetYear(),10,25,1,0,0);
|
||||
// find first sunday after 10/25 (last sunday of Oct.)
|
||||
dstEnd.SetGMTime(utime.GetYear(),11,1,1,0,0);
|
||||
// find first sunday after (including) 11/1 (first Sunday of November)
|
||||
days_to_go = 7 - dstEnd.GetDayOfWeek();
|
||||
if (days_to_go == 7)
|
||||
days_to_go = 0;
|
||||
UInt32 dstEndSecs = dstEnd.GetSecs() + days_to_go * kOneDay;
|
||||
|
||||
if ( dtime > dstStartSecs && dtime < dstEndSecs )
|
||||
if ( dtime >= dstStartSecs && dtime < dstEndSecs )
|
||||
// add hour for daylight savings time
|
||||
dtime += kOneHour;
|
||||
}
|
||||
|
@ -196,7 +196,7 @@ PyObject* PythonInterface::dbgOut = nil;
|
||||
PyObject* PythonInterface::dbgSlice = nil; // time slice function for the debug window
|
||||
plStatusLog* PythonInterface::dbgLog = nil; // output logfile
|
||||
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
|
||||
bool PythonInterface::usePythonDebugger = false;
|
||||
plCyDebServer PythonInterface::debugServer;
|
||||
bool PythonInterface::requestedExit = false;
|
||||
@ -205,7 +205,7 @@ bool PythonInterface::requestedExit = false;
|
||||
// stupid Windows.h and who started including that!
|
||||
#undef DrawText
|
||||
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
|
||||
// Special includes for debugging
|
||||
#include <frameobject.h>
|
||||
|
||||
@ -856,7 +856,7 @@ void PythonInterface::initPython()
|
||||
Py_SetProgramName("plasma");
|
||||
Py_Initialize();
|
||||
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
|
||||
if (usePythonDebugger)
|
||||
{
|
||||
debugServer.SetCallbackClass(&debServerCallback);
|
||||
@ -1528,7 +1528,7 @@ void PythonInterface::finiPython()
|
||||
initialized--;
|
||||
if ( initialized < 1 && Py_IsInitialized() != 0 && IsInShutdown )
|
||||
{
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
|
||||
if (usePythonDebugger)
|
||||
debugServer.Disconnect();
|
||||
#endif
|
||||
@ -1675,7 +1675,7 @@ int PythonInterface::getOutputAndReset(std::string *output)
|
||||
pyOutputRedirector::ClearData(stdOut);
|
||||
|
||||
// tell python debugger
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
|
||||
if (UsePythonDebugger())
|
||||
PythonInterface::PythonDebugger()->StdOut(strVal);
|
||||
#endif
|
||||
|
@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#include "hsStlUtils.h"
|
||||
#include <python.h>
|
||||
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
|
||||
#include "../../Apps/CyPythonIDE/plCyDebug/plCyDebServer.h"
|
||||
#endif
|
||||
|
||||
@ -82,7 +82,7 @@ private:
|
||||
static PyObject* dbgSlice; // time slice function for the debug window
|
||||
static plStatusLog* dbgLog;
|
||||
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
|
||||
static bool usePythonDebugger;
|
||||
static bool requestedExit;
|
||||
static plCyDebServer debugServer;
|
||||
@ -228,7 +228,7 @@ public:
|
||||
//
|
||||
static pyKey* GetpyKeyFromPython(PyObject* pkey);
|
||||
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
|
||||
static bool UsePythonDebugger() { return usePythonDebugger; }
|
||||
static void UsePythonDebugger(bool use) { usePythonDebugger = use; }
|
||||
|
||||
|
@ -1363,12 +1363,19 @@ hsBool plPythonFileMod::MsgReceive(plMessage* msg)
|
||||
// depending on the data type create the data
|
||||
switch ( eventData->fDataType )
|
||||
{
|
||||
case proEventData::kNumber:
|
||||
PyList_SetItem(event, 3, PyFloat_FromDouble(eventData->fNumber));
|
||||
case proEventData::kFloat:
|
||||
PyList_SetItem(event, 3, PyFloat_FromDouble(eventData->fNumber.f));
|
||||
break;
|
||||
case proEventData::kKey:
|
||||
PyList_SetItem(event, 3, pyKey::New(eventData->fKey));
|
||||
break;
|
||||
case proEventData::kInt:
|
||||
PyList_SetItem(event, 3, PyInt_FromLong(eventData->fNumber.i));
|
||||
break;
|
||||
default:
|
||||
Py_XINCREF(Py_None);
|
||||
PyList_SetItem(event, 3, Py_None);
|
||||
break;
|
||||
}
|
||||
// add this event record to the main event list (lists within a list)
|
||||
PyList_Append(levents, event);
|
||||
|
@ -151,6 +151,16 @@ void pyNotify::AddVarNumber(const char* name, hsScalar number)
|
||||
fBuildMsg.AddVariableEvent(name,number);
|
||||
}
|
||||
|
||||
void pyNotify::AddVarNumber(const char* name, Int32 number)
|
||||
{
|
||||
fBuildMsg.AddVariableEvent(name,number);
|
||||
}
|
||||
|
||||
void pyNotify::AddVarNull(const char* name)
|
||||
{
|
||||
fBuildMsg.AddVariableEvent(name);
|
||||
}
|
||||
|
||||
void pyNotify::AddVarKey(const char* name, pyKey* key)
|
||||
{
|
||||
fBuildMsg.AddVariableEvent(name, key ? key->getKey() : plKey() );
|
||||
|
@ -100,6 +100,8 @@ public:
|
||||
virtual void AddPickEvent(hsBool enabled, pyKey* other, pyKey* self, pyPoint3 hitPoint);
|
||||
virtual void AddControlKeyEvent( Int32 key, hsBool down );
|
||||
virtual void AddVarNumber(const char* name, hsScalar number);
|
||||
virtual void AddVarNumber(const char* name, Int32 number);
|
||||
virtual void AddVarNull(const char* name);
|
||||
virtual void AddVarKey(const char* name, pyKey* key);
|
||||
virtual void AddFacingEvent( hsBool enabled, pyKey* other, pyKey* self, hsScalar dot);
|
||||
virtual void AddContainerEvent( hsBool entering, pyKey* container, pyKey* contained);
|
||||
|
@ -194,18 +194,86 @@ PYTHON_METHOD_DEFINITION(ptNotify, addControlKeyEvent, args)
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptNotify, addVarNumber, args)
|
||||
{
|
||||
char* name;
|
||||
PyObject* number = NULL;
|
||||
if (!PyArg_ParseTuple(args, "s|O", &name, &number))
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "addVarNumber expects a string and optional number");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
|
||||
if (number == NULL || number == Py_None)
|
||||
self->fThis->AddVarNull(name);
|
||||
else if (PyInt_Check(number))
|
||||
self->fThis->AddVarNumber(name, PyInt_AsLong(number));
|
||||
else if (PyLong_Check(number))
|
||||
{
|
||||
// try as int first
|
||||
Int32 i = (Int32)PyLong_AsLong(number);
|
||||
if (!PyErr_Occurred())
|
||||
{
|
||||
self->fThis->AddVarNumber(name, i);
|
||||
}
|
||||
else
|
||||
{
|
||||
// OverflowError, try float
|
||||
PyErr_Clear();
|
||||
self->fThis->AddVarNumber(name, (float)PyLong_AsDouble(number));
|
||||
}
|
||||
}
|
||||
else if (PyNumber_Check(number))
|
||||
{
|
||||
PyObject* f = PyNumber_Float(number);
|
||||
self->fThis->AddVarNumber(name, (float)PyFloat_AsDouble(f));
|
||||
Py_DECREF(f);
|
||||
}
|
||||
else
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "addVarNumber expects a string and optional number");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
PYTHON_RETURN_NONE;
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptNotify, addVarFloat, args)
|
||||
{
|
||||
char* name;
|
||||
float number;
|
||||
if (!PyArg_ParseTuple(args, "sf", &name, &number))
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "addVarNumber expects a string and a float");
|
||||
PyErr_SetString(PyExc_TypeError, "addVarFloat expects a string and a float");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
self->fThis->AddVarNumber(name, number);
|
||||
PYTHON_RETURN_NONE;
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptNotify, addVarInt, args)
|
||||
{
|
||||
char* name;
|
||||
Int32 number;
|
||||
if (!PyArg_ParseTuple(args, "sl", &name, &number))
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "addVarInt expects a string and a integer");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
self->fThis->AddVarNumber(name, number);
|
||||
PYTHON_RETURN_NONE;
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptNotify, addVarNull, args)
|
||||
{
|
||||
char* name;
|
||||
if (!PyArg_ParseTuple(args, "s", &name))
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "addVarNull expects a string");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
self->fThis->AddVarNull(name);
|
||||
PYTHON_RETURN_NONE;
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptNotify, addVarKey, args)
|
||||
{
|
||||
char* name;
|
||||
@ -337,6 +405,13 @@ PYTHON_START_METHODS_TABLE(ptNotify)
|
||||
PYTHON_METHOD(ptNotify, addPickEvent, "Params: enabledFlag,pickerKey,pickeeKey,hitPoint\nAdd a pick event record to the Notify message"),
|
||||
PYTHON_METHOD(ptNotify, addControlKeyEvent, "Params: keynumber,downFlag\nAdd a keyboard event record to the Notify message"),
|
||||
PYTHON_METHOD(ptNotify, addVarNumber, "Params: name,number\nAdd a number variable event record to the Notify message\n"
|
||||
"Method will try to pick appropriate variable type\n"
|
||||
"This event record is used to pass a number variable to another python program"),
|
||||
PYTHON_METHOD(ptNotify, addVarFloat, "Params: name,number\nAdd a float variable event record to the Notify message\n"
|
||||
"This event record is used to pass a number variable to another python program"),
|
||||
PYTHON_METHOD(ptNotify, addVarInt, "Params: name,number\nAdd a int variable event record to the Notify message\n"
|
||||
"This event record is used to pass a number variable to another python program"),
|
||||
PYTHON_METHOD(ptNotify, addVarNull, "Params: name,number\nAdd a null (no data) variable event record to the Notify message\n"
|
||||
"This event record is used to pass a number variable to another python program"),
|
||||
PYTHON_METHOD(ptNotify, addVarKey, "Params: name,key\nAdd a ptKey variable event record to the Notify message\n"
|
||||
"This event record is used to pass a ptKey variable to another python program"),
|
||||
@ -402,8 +477,10 @@ void pyNotify::AddPlasmaConstantsClasses(PyObject *m)
|
||||
PYTHON_ENUM_END(m, PtEventType);
|
||||
|
||||
PYTHON_ENUM_START(PtNotifyDataType);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kNumber, proEventData::kNumber);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kKey, proEventData::kKey);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kFloat, proEventData::kFloat);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kInt, proEventData::kInt);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kNull, proEventData::kNull);
|
||||
PYTHON_ENUM_ELEMENT(PtNotifyDataType, kKey, proEventData::kKey);
|
||||
PYTHON_ENUM_END(m, PtNotifyDataType);
|
||||
|
||||
PYTHON_ENUM_START(PtMultiStageEventType);
|
||||
|
Reference in New Issue
Block a user