mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 18:59:09 +00:00
Get rid of NEW(), TRACKED_NEW, and ZERO().
This commit is contained in:
@ -207,7 +207,7 @@ void plAvatarInputInterface::IDeactivateCommand(plMouseInfo *info)
|
||||
if (IHasControlFlag(info->fCode) && !(info->fControlFlags & (kControlFlagNoDeactivate | kControlFlagToggle)))
|
||||
{
|
||||
// The mapping is currently on, it's ok to deactivate, and it's not a toggle command
|
||||
plCtrlCmd* pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd* pCmd = new plCtrlCmd( this );
|
||||
pCmd->fNetPropagateToPlayers = info->fControlFlags & kControlFlagNetPropagate;
|
||||
pCmd->fControlActivated = false;
|
||||
pCmd->fControlCode = info->fCode;
|
||||
@ -240,26 +240,26 @@ void plAvatarInputInterface::IChangeInputMaps( plAvatarInputMap *newMap )
|
||||
|
||||
void plAvatarInputInterface::ISetSuspendMovementMode()
|
||||
{
|
||||
IChangeInputMaps(TRACKED_NEW plSuspendedMovementMap());
|
||||
IChangeInputMaps(new plSuspendedMovementMap());
|
||||
fCurrentCursor = kCursorUp;
|
||||
}
|
||||
|
||||
void plAvatarInputInterface::ISetLadderMap()
|
||||
{
|
||||
IChangeInputMaps(TRACKED_NEW plLadderControlMap());
|
||||
IChangeInputMaps(new plLadderControlMap());
|
||||
fCurrentCursor = kCursorUp;
|
||||
}
|
||||
|
||||
|
||||
void plAvatarInputInterface::ISetPreLadderMap()
|
||||
{
|
||||
IChangeInputMaps(TRACKED_NEW plLadderMountMap());
|
||||
IChangeInputMaps(new plLadderMountMap());
|
||||
fCurrentCursor = kCursorUp;
|
||||
}
|
||||
|
||||
void plAvatarInputInterface::ISetPostLadderMap()
|
||||
{
|
||||
IChangeInputMaps(TRACKED_NEW plLadderDismountMap());
|
||||
IChangeInputMaps(new plLadderDismountMap());
|
||||
fCurrentCursor = kCursorUp;
|
||||
}
|
||||
|
||||
@ -267,9 +267,9 @@ void plAvatarInputInterface::ISetBasicMode()
|
||||
{
|
||||
plAvatarInputMap *map;
|
||||
if (!f3rdPerson)
|
||||
map = TRACKED_NEW plBasicFirstPersonControlMap();
|
||||
map = new plBasicFirstPersonControlMap();
|
||||
else
|
||||
map = TRACKED_NEW plBasicThirdPersonControlMap();
|
||||
map = new plBasicThirdPersonControlMap();
|
||||
|
||||
IChangeInputMaps(map);
|
||||
fCurrentCursor = kCursorUp;
|
||||
@ -278,11 +278,11 @@ void plAvatarInputInterface::ISetBasicMode()
|
||||
void plAvatarInputInterface::ISetMouseWalkMode(ControlEventCode code)
|
||||
{
|
||||
if (code == S_SET_WALK_BACK_MODE)
|
||||
IChangeInputMaps(TRACKED_NEW pl3rdWalkBackwardMap());
|
||||
IChangeInputMaps(new pl3rdWalkBackwardMap());
|
||||
else if (code == S_SET_WALK_BACK_LB_MODE)
|
||||
IChangeInputMaps(TRACKED_NEW pl3rdWalkBackwardLBMap());
|
||||
IChangeInputMaps(new pl3rdWalkBackwardLBMap());
|
||||
else
|
||||
IChangeInputMaps(TRACKED_NEW pl3rdWalkForwardMap());
|
||||
IChangeInputMaps(new pl3rdWalkForwardMap());
|
||||
|
||||
fCurrentCursor = kCursorHidden;
|
||||
}
|
||||
@ -413,7 +413,7 @@ void plAvatarInputInterface::EnableControl(hsBool val, ControlEventCode code)
|
||||
|
||||
void plAvatarInputInterface::ForceAlwaysRun(hsBool val)
|
||||
{
|
||||
plCtrlCmd *pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd *pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlCode = B_CONTROL_ALWAYS_RUN;
|
||||
pCmd->fControlActivated = val;
|
||||
pCmd->fNetPropagateToPlayers = false;
|
||||
@ -478,7 +478,7 @@ hsBool plAvatarInputInterface::IHandleCtrlCmd( plCtrlCmd *cmd )
|
||||
#if 0
|
||||
case S_SET_FIRST_PERSON_MODE:
|
||||
if( cmd->fControlActivated )
|
||||
IChangeInputMaps( TRACKED_NEW plFirstPersonControlMap() );
|
||||
IChangeInputMaps( new plFirstPersonControlMap() );
|
||||
return true;
|
||||
#endif
|
||||
case S_SET_BASIC_MODE:
|
||||
@ -486,7 +486,7 @@ hsBool plAvatarInputInterface::IHandleCtrlCmd( plCtrlCmd *cmd )
|
||||
{
|
||||
ISetBasicMode();
|
||||
#if 0
|
||||
plProxyDrawMsg* Dmsg = TRACKED_NEW plProxyDrawMsg(plProxyDrawMsg::kCamera | plProxyDrawMsg::kDestroy);
|
||||
plProxyDrawMsg* Dmsg = new plProxyDrawMsg(plProxyDrawMsg::kCamera | plProxyDrawMsg::kDestroy);
|
||||
plgDispatch::MsgSend(Dmsg);
|
||||
plVirtualCam::Instance()->GetPipeline()->SetDrawableTypeMask(plVirtualCam::Instance()->GetPipeline()->GetDrawableTypeMask() & ~plDrawableSpans::kCameraProxy);
|
||||
#endif
|
||||
@ -506,7 +506,7 @@ plVirtualCam::Instance()->GetPipeline()->SetDrawableTypeMask(plVirtualCam::Insta
|
||||
abort = true;
|
||||
#if 0
|
||||
|
||||
plProxyDrawMsg* Dmsg = TRACKED_NEW plProxyDrawMsg(plProxyDrawMsg::kCamera | plProxyDrawMsg::kDestroy);
|
||||
plProxyDrawMsg* Dmsg = new plProxyDrawMsg(plProxyDrawMsg::kCamera | plProxyDrawMsg::kDestroy);
|
||||
plgDispatch::MsgSend(Dmsg);
|
||||
plVirtualCam::Instance()->GetPipeline()->SetDrawableTypeMask(plVirtualCam::Instance()->GetPipeline()->GetDrawableTypeMask() & ~plDrawableSpans::kCameraProxy);
|
||||
#endif
|
||||
@ -531,7 +531,7 @@ plVirtualCam::Instance()->GetPipeline()->SetDrawableTypeMask(plVirtualCam::Insta
|
||||
abort = true;
|
||||
#if 0
|
||||
|
||||
plProxyDrawMsg* Dmsg = TRACKED_NEW plProxyDrawMsg(plProxyDrawMsg::kCamera | plProxyDrawMsg::kDestroy);
|
||||
plProxyDrawMsg* Dmsg = new plProxyDrawMsg(plProxyDrawMsg::kCamera | plProxyDrawMsg::kDestroy);
|
||||
plgDispatch::MsgSend(Dmsg);
|
||||
plVirtualCam::Instance()->GetPipeline()->SetDrawableTypeMask(plVirtualCam::Instance()->GetPipeline()->GetDrawableTypeMask() & ~plDrawableSpans::kCameraProxy);
|
||||
#endif
|
||||
@ -556,7 +556,7 @@ plVirtualCam::Instance()->GetPipeline()->SetDrawableTypeMask(plVirtualCam::Insta
|
||||
abort = true;
|
||||
#if 0
|
||||
|
||||
plProxyDrawMsg* Dmsg = TRACKED_NEW plProxyDrawMsg(plProxyDrawMsg::kCamera | plProxyDrawMsg::kDestroy);
|
||||
plProxyDrawMsg* Dmsg = new plProxyDrawMsg(plProxyDrawMsg::kCamera | plProxyDrawMsg::kDestroy);
|
||||
plgDispatch::MsgSend(Dmsg);
|
||||
plVirtualCam::Instance()->GetPipeline()->SetDrawableTypeMask(plVirtualCam::Instance()->GetPipeline()->GetDrawableTypeMask() & ~plDrawableSpans::kCameraProxy);
|
||||
#endif
|
||||
@ -582,14 +582,14 @@ plVirtualCam::Instance()->GetPipeline()->SetDrawableTypeMask(plVirtualCam::Insta
|
||||
if (fMessageQueue[i]->fControlActivated)
|
||||
{
|
||||
// send a 'picked' message to the picked object
|
||||
plPickedMsg* pPickedMsg = TRACKED_NEW plPickedMsg;
|
||||
plPickedMsg* pPickedMsg = new plPickedMsg;
|
||||
pPickedMsg->AddReceiver(fCurrentClickable);
|
||||
plgDispatch::MsgSend(pPickedMsg);
|
||||
}
|
||||
else
|
||||
{
|
||||
// send an 'unpicked message'
|
||||
plPickedMsg* pPickedMsg = TRACKED_NEW plPickedMsg;
|
||||
plPickedMsg* pPickedMsg = new plPickedMsg;
|
||||
pPickedMsg->AddReceiver(fCurrentClickable);
|
||||
pPickedMsg->fPicked = false;
|
||||
plgDispatch::MsgSend(pPickedMsg);
|
||||
@ -668,7 +668,7 @@ void plAvatarInputInterface::MissedInputEvent( plInputEventMsg *pMsg )
|
||||
|
||||
if( IHasKeyControlFlag( binding.GetCode() ) && binding.GetCode() != B_CONTROL_ALWAYS_RUN )
|
||||
{
|
||||
plCtrlCmd *pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd *pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlCode = binding.GetCode();
|
||||
pCmd->fControlActivated = false;
|
||||
pCmd->SetCmdString( binding.GetExtendedString() );
|
||||
@ -842,7 +842,7 @@ hsBool plAvatarInputInterface::InterpretInputEvent( plInputEventMsg *pMsg )
|
||||
|
||||
if ((mouseMap->fMap[i]->fControlFlags & kControlFlagRangePos) || (mouseMap->fMap[i]->fControlFlags & kControlFlagRangeNeg))
|
||||
{
|
||||
plCtrlCmd* pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd* pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlActivated = true;
|
||||
pCmd->fControlCode = mouseMap->fMap[i]->fCode;
|
||||
float pct = 0.0f;
|
||||
@ -872,7 +872,7 @@ hsBool plAvatarInputInterface::InterpretInputEvent( plInputEventMsg *pMsg )
|
||||
}
|
||||
if (mouseMap->fMap[i]->fControlFlags & kControlFlagDelta)
|
||||
{
|
||||
plCtrlCmd* pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd* pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlActivated = true;
|
||||
pCmd->fControlCode = mouseMap->fMap[i]->fCode;
|
||||
float pct = 0.0f;
|
||||
@ -896,7 +896,7 @@ hsBool plAvatarInputInterface::InterpretInputEvent( plInputEventMsg *pMsg )
|
||||
else // if it is an 'always if in box' command see if it's not in the box
|
||||
if ( (mouseMap->fMap[i]->fControlFlags & kControlFlagInBox) && (!CursorInBox(pMouseMsg, mouseMap->fMap[i]->fBox)) )
|
||||
{
|
||||
plCtrlCmd* pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd* pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlActivated = false;
|
||||
pCmd->fControlCode = mouseMap->fMap[i]->fCode;
|
||||
pCmd->fNetPropagateToPlayers = mouseMap->fMap[i]->fControlFlags & kControlFlagNetPropagate;
|
||||
@ -950,7 +950,7 @@ hsBool plAvatarInputInterface::InterpretInputEvent( plInputEventMsg *pMsg )
|
||||
if (!(mouseMap->fMap[i]->fControlFlags & kControlFlagInBox))
|
||||
SetControlFlag(mouseMap->fMap[i]->fCode);
|
||||
// issue the command
|
||||
plCtrlCmd* pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd* pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlActivated = true;
|
||||
pCmd->fControlCode = mouseMap->fMap[i]->fCode;
|
||||
pCmd->fNetPropagateToPlayers = mouseMap->fMap[i]->fControlFlags & kControlFlagNetPropagate;
|
||||
@ -1019,7 +1019,7 @@ hsBool plAvatarInputInterface::InterpretInputEvent( plInputEventMsg *pMsg )
|
||||
|
||||
plAvatarInputMap::plAvatarInputMap()
|
||||
{
|
||||
fMouseMap = TRACKED_NEW plMouseMap;
|
||||
fMouseMap = new plMouseMap;
|
||||
|
||||
fButtonState = 0;
|
||||
fInterface = plAvatarInputInterface::GetInstance();
|
||||
@ -1032,50 +1032,50 @@ plAvatarInputMap::~plAvatarInputMap()
|
||||
|
||||
plSuspendedMovementMap::plSuspendedMovementMap() : plAvatarInputMap()
|
||||
{
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_ACTION_MOUSE, kControlFlagLeftButtonEx, 0.0f, 1.0f, 0.0f, 1.0f, "The Picked key") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_PICK, kControlFlagLeftButton, 0.0f, 1.0f, 0.0f, 1.0f, "The Picked key") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_ACTION_MOUSE, kControlFlagLeftButtonEx, 0.0f, 1.0f, 0.0f, 1.0f, "The Picked key") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_PICK, kControlFlagLeftButton, 0.0f, 1.0f, 0.0f, 1.0f, "The Picked key") );
|
||||
}
|
||||
|
||||
plBasicControlMap::plBasicControlMap() : plSuspendedMovementMap()
|
||||
{
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_ROTATE_RIGHT, kControlFlagLeftButton | kControlFlagBoxDisable, 0.95f, 1.0f, 0.0f, 1.0f, "Rotate Player Right") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_ROTATE_LEFT, kControlFlagLeftButton | kControlFlagBoxDisable, 0.0f, 0.05f, 0.0f, 1.0f, "Rotate Player Left") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_ROTATE_RIGHT, kControlFlagLeftButton | kControlFlagBoxDisable, 0.95f, 1.0f, 0.0f, 1.0f, "Rotate Player Right") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_ROTATE_LEFT, kControlFlagLeftButton | kControlFlagBoxDisable, 0.0f, 0.05f, 0.0f, 1.0f, "Rotate Player Left") );
|
||||
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_TURN_TO, kControlFlagLeftButtonEx, 0.05f, 0.95f, 0.0f, 0.95f, "Turn to") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_WALK_MODE, kControlFlagLeftButton, 0.05f, 0.95f, 0.0f, 0.95f, "Set Walk Mode") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_WALK_BACK_LB_MODE, kControlFlagLeftButton, 0.05f, 0.95f, 0.95f, 1.0f, "Set Walk Back LB Mode") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_WALK_BACK_MODE, kControlFlagMiddleButton, 0.05f, 0.95f, 0.0f, 1.0f, "Set Walk Back Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_TURN_TO, kControlFlagLeftButtonEx, 0.05f, 0.95f, 0.0f, 0.95f, "Turn to") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_WALK_MODE, kControlFlagLeftButton, 0.05f, 0.95f, 0.0f, 0.95f, "Set Walk Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_WALK_BACK_LB_MODE, kControlFlagLeftButton, 0.05f, 0.95f, 0.95f, 1.0f, "Set Walk Back LB Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_WALK_BACK_MODE, kControlFlagMiddleButton, 0.05f, 0.95f, 0.0f, 1.0f, "Set Walk Back Mode") );
|
||||
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_CURSOR_UP, kControlFlagNormal | kControlFlagInBox, 0.05f, 0.95f, 0.0f, 0.95f, "set cursor up") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_CURSOR_DOWN, kControlFlagNormal | kControlFlagInBox, 0.05f, 0.95f, 0.95f, 1.0f, "set cursor down") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_CURSOR_RIGHT, kControlFlagNormal | kControlFlagInBox, 0.95f, 1.0f, 0.0f, 1.0f, "set cursor right") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_CURSOR_LEFT, kControlFlagNormal | kControlFlagInBox, 0.0f, 0.05f, 0.0f, 1.0f, "set cursor left") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_CURSOR_UP, kControlFlagNormal | kControlFlagInBox, 0.05f, 0.95f, 0.0f, 0.95f, "set cursor up") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_CURSOR_DOWN, kControlFlagNormal | kControlFlagInBox, 0.05f, 0.95f, 0.95f, 1.0f, "set cursor down") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_CURSOR_RIGHT, kControlFlagNormal | kControlFlagInBox, 0.95f, 1.0f, 0.0f, 1.0f, "set cursor right") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_CURSOR_LEFT, kControlFlagNormal | kControlFlagInBox, 0.0f, 0.05f, 0.0f, 1.0f, "set cursor left") );
|
||||
}
|
||||
|
||||
plLadderControlMap::plLadderControlMap() : plSuspendedMovementMap()
|
||||
{
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_MOVE_FORWARD, kControlFlagLeftButton | kControlFlagBoxDisable, 0.0f, 1.0f, 0.0f, 0.5f, "Set Walk Mode") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_MOVE_BACKWARD, kControlFlagLeftButton | kControlFlagBoxDisable, 0.0f, 1.0f, 0.5f, 1.0f, "Set Walk Back LB Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_MOVE_FORWARD, kControlFlagLeftButton | kControlFlagBoxDisable, 0.0f, 1.0f, 0.0f, 0.5f, "Set Walk Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_MOVE_BACKWARD, kControlFlagLeftButton | kControlFlagBoxDisable, 0.0f, 1.0f, 0.5f, 1.0f, "Set Walk Back LB Mode") );
|
||||
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_CURSOR_UPWARD, kControlFlagNormal | kControlFlagInBox, 0.0f, 1.0f, 0.0f, 0.5f, "set cursor up") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_CURSOR_DOWN, kControlFlagNormal | kControlFlagInBox, 0.0f, 1.0f, 0.5f, 1.0f, "set cursor down") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_CURSOR_UPWARD, kControlFlagNormal | kControlFlagInBox, 0.0f, 1.0f, 0.0f, 0.5f, "set cursor up") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_CURSOR_DOWN, kControlFlagNormal | kControlFlagInBox, 0.0f, 1.0f, 0.5f, 1.0f, "set cursor down") );
|
||||
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_FREELOOK, kControlFlagRightButton, 0.05f, 0.95f, 0.0f, 0.95f, "Set Camera first-person z-axis panning") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_FREELOOK, kControlFlagRightButton, 0.05f, 0.95f, 0.0f, 0.95f, "Set Camera first-person z-axis panning") );
|
||||
}
|
||||
|
||||
|
||||
plLadderMountMap::plLadderMountMap() : plSuspendedMovementMap()
|
||||
{
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_LADDER_CONTROL, kControlFlagLeftButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Ladder Mode") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_LADDER_CONTROL, kControlFlagRightButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Ladder Mode") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_LADDER_CONTROL, kControlFlagMiddleButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Ladder Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_LADDER_CONTROL, kControlFlagLeftButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Ladder Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_LADDER_CONTROL, kControlFlagRightButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Ladder Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_LADDER_CONTROL, kControlFlagMiddleButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Ladder Mode") );
|
||||
}
|
||||
|
||||
plLadderDismountMap::plLadderDismountMap() : plSuspendedMovementMap()
|
||||
{
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_BASIC_MODE, kControlFlagLeftButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Basic Mode") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_BASIC_MODE, kControlFlagRightButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Basic Mode") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_BASIC_MODE, kControlFlagMiddleButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Basic Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_BASIC_MODE, kControlFlagLeftButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Basic Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_BASIC_MODE, kControlFlagRightButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Basic Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_BASIC_MODE, kControlFlagMiddleButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Set Basic Mode") );
|
||||
}
|
||||
|
||||
|
||||
@ -1083,22 +1083,22 @@ plLadderDismountMap::plLadderDismountMap() : plSuspendedMovementMap()
|
||||
|
||||
plBasicThirdPersonControlMap::plBasicThirdPersonControlMap() : plBasicControlMap()
|
||||
{
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_FREELOOK, kControlFlagRightButton, 0.0f, 1.0f, 0.0f, 1.0f, "Freelook Mode") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_FREELOOK, kControlFlagRightButton, 0.0f, 1.0f, 0.0f, 1.0f, "Freelook Mode") );
|
||||
}
|
||||
|
||||
plBasicFirstPersonControlMap::plBasicFirstPersonControlMap() : plBasicControlMap()
|
||||
{
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(A_CONTROL_TURN, kControlFlagRightButtonRepeat | kControlFlagXAxisEvent | kControlFlagDelta, 0.0f, 1.0f, 0.0f, 1.0f, "Rotate Player") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_FREELOOK, kControlFlagRightButton, 0.05f, 0.95f, 0.0f, 0.95f, "Set Camera first-person z-axis panning") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_CAMERA_WALK_PAN, kControlFlagRightButton, 0.05f, 0.95f, 0.0f, 0.95f, "Set Camera first-person z-axis panning") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(A_CONTROL_TURN, kControlFlagRightButtonRepeat | kControlFlagXAxisEvent | kControlFlagDelta, 0.0f, 1.0f, 0.0f, 1.0f, "Rotate Player") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_FREELOOK, kControlFlagRightButton, 0.05f, 0.95f, 0.0f, 0.95f, "Set Camera first-person z-axis panning") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_CAMERA_WALK_PAN, kControlFlagRightButton, 0.05f, 0.95f, 0.0f, 0.95f, "Set Camera first-person z-axis panning") );
|
||||
}
|
||||
|
||||
// also used in 1st person walk mode
|
||||
pl3rdWalkMap::pl3rdWalkMap() : plAvatarInputMap()
|
||||
{
|
||||
// control special to this mode.
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_MODIFIER_FAST, kControlFlagRightButton, 0.0f, 1.0f, 0.0f, 1.0f, "Run Modifier" ) );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(A_CONTROL_TURN, kControlFlagXAxisEvent | kControlFlagDelta, 0.0f, 1.0f, 0.0f, 1.0f, "Rotate Player") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_MODIFIER_FAST, kControlFlagRightButton, 0.0f, 1.0f, 0.0f, 1.0f, "Run Modifier" ) );
|
||||
fMouseMap->AddMapping( new plMouseInfo(A_CONTROL_TURN, kControlFlagXAxisEvent | kControlFlagDelta, 0.0f, 1.0f, 0.0f, 1.0f, "Rotate Player") );
|
||||
|
||||
plInputManager::SetRecenterMouse(true);
|
||||
plMouseDevice::HideCursor();
|
||||
@ -1114,22 +1114,22 @@ pl3rdWalkMap::~pl3rdWalkMap()
|
||||
|
||||
pl3rdWalkForwardMap::pl3rdWalkForwardMap() : pl3rdWalkMap()
|
||||
{
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_BASIC_MODE, kControlFlagLeftButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Third Person") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_MOVE_FORWARD, kControlFlagLeftButton, 0.0f, 1.0f, 0.0f, 1.0f, "Walk forward") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_CAMERA_WALK_PAN, kControlFlagLeftButton, 0.0f, 1.0f, 0.0f, 1.0f, "Set Camera first-person z-axis panning") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_BASIC_MODE, kControlFlagLeftButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Third Person") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_MOVE_FORWARD, kControlFlagLeftButton, 0.0f, 1.0f, 0.0f, 1.0f, "Walk forward") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_CAMERA_WALK_PAN, kControlFlagLeftButton, 0.0f, 1.0f, 0.0f, 1.0f, "Set Camera first-person z-axis panning") );
|
||||
}
|
||||
|
||||
pl3rdWalkBackwardMap::pl3rdWalkBackwardMap() : pl3rdWalkMap()
|
||||
{
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_BASIC_MODE, kControlFlagMiddleButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Third Person") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_MOVE_BACKWARD, kControlFlagMiddleButton, 0.0f, 1.0f, 0.0f, 1.0f, "Walk backward") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_CAMERA_WALK_PAN, kControlFlagMiddleButton, 0.0f, 1.0f, 0.0f, 1.0f, "Set Camera first-person z-axis panning") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_BASIC_MODE, kControlFlagMiddleButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Third Person") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_MOVE_BACKWARD, kControlFlagMiddleButton, 0.0f, 1.0f, 0.0f, 1.0f, "Walk backward") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_CAMERA_WALK_PAN, kControlFlagMiddleButton, 0.0f, 1.0f, 0.0f, 1.0f, "Set Camera first-person z-axis panning") );
|
||||
}
|
||||
|
||||
// same as the other backward walk map, but this one is triggered by the left mouse button.
|
||||
pl3rdWalkBackwardLBMap::pl3rdWalkBackwardLBMap() : pl3rdWalkMap()
|
||||
{
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(S_SET_BASIC_MODE, kControlFlagLeftButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Third Person") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_MOVE_BACKWARD, kControlFlagLeftButton, 0.0f, 1.0f, 0.0f, 1.0f, "Walk backward") );
|
||||
fMouseMap->AddMapping( TRACKED_NEW plMouseInfo(B_CONTROL_CAMERA_WALK_PAN, kControlFlagLeftButton, 0.0f, 1.0f, 0.0f, 1.0f, "Set Camera first-person z-axis panning") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(S_SET_BASIC_MODE, kControlFlagLeftButtonUp, 0.0f, 1.0f, 0.0f, 1.0f, "Third Person") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_MOVE_BACKWARD, kControlFlagLeftButton, 0.0f, 1.0f, 0.0f, 1.0f, "Walk backward") );
|
||||
fMouseMap->AddMapping( new plMouseInfo(B_CONTROL_CAMERA_WALK_PAN, kControlFlagLeftButton, 0.0f, 1.0f, 0.0f, 1.0f, "Set Camera first-person z-axis panning") );
|
||||
}
|
@ -74,7 +74,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
int i = (int)(js->dwData);
|
||||
if (i <= -1)
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_MOVE_FORWARD );
|
||||
pMsg->SetControlActivated( true );
|
||||
plgDispatch::MsgSend( pMsg );
|
||||
@ -82,7 +82,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
else
|
||||
if (i >= 1)
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_MOVE_BACKWARD );
|
||||
pMsg->SetControlActivated( true );
|
||||
plgDispatch::MsgSend( pMsg );
|
||||
@ -90,11 +90,11 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
else
|
||||
if (i == 0)
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_MOVE_BACKWARD );
|
||||
pMsg->SetControlActivated( false );
|
||||
plgDispatch::MsgSend( pMsg );
|
||||
plControlEventMsg* pMsg2 = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg2 = new plControlEventMsg;
|
||||
pMsg2->SetControlCode( B_CONTROL_MOVE_FORWARD );
|
||||
pMsg2->SetControlActivated( false );
|
||||
plgDispatch::MsgSend( pMsg2 );
|
||||
@ -106,7 +106,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
{
|
||||
int i = (int)(js->dwData);
|
||||
float f = ((float)i) * 0.001f;
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( A_CONTROL_TURN );
|
||||
if (f <= 0.02 && f >= -0.02)
|
||||
pMsg->SetControlActivated( false );
|
||||
@ -118,7 +118,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_ACTION:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_ACTION );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -126,7 +126,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_MODIFIER_FAST:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_MODIFIER_FAST );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -134,7 +134,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_JUMP:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_JUMP );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -142,7 +142,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_STRAFE_LEFT:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_STRAFE_LEFT );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -150,7 +150,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_STRAFE_RIGHT:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_STRAFE_RIGHT);
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -158,7 +158,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_EQUIP:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_EQUIP );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -166,7 +166,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_DROP:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_DROP );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -174,7 +174,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_MOVE_FORWARD:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_MOVE_FORWARD );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -182,7 +182,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_MOVE_BACKWARD:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_MOVE_BACKWARD );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -190,7 +190,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_ROTATE_RIGHT:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_ROTATE_RIGHT);
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -198,7 +198,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_ROTATE_LEFT:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_ROTATE_LEFT );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -206,7 +206,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CONTROL_TURN_TO:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CONTROL_TURN_TO );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -214,7 +214,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
break;
|
||||
case B_CAMERA_RECENTER:
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlCode( B_CAMERA_RECENTER );
|
||||
pMsg->SetControlActivated(js->dwData & 0x80);
|
||||
plgDispatch::MsgSend(pMsg);
|
||||
@ -227,12 +227,12 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
float f = ((float)i) * 0.001f;
|
||||
if (f <= 0.02 && f >= -0.02)
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlActivated( false );
|
||||
pMsg->SetControlCode(B_CAMERA_ROTATE_DOWN);
|
||||
pMsg->SetControlPct(0);
|
||||
plgDispatch::MsgSend( pMsg );
|
||||
plControlEventMsg* pMsg2 = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg2 = new plControlEventMsg;
|
||||
pMsg2->SetControlActivated( false );
|
||||
pMsg2->SetControlCode(B_CAMERA_ROTATE_UP);
|
||||
pMsg2->SetControlPct(0);
|
||||
@ -240,7 +240,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
}
|
||||
else
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlActivated( true );
|
||||
if (f < 0)
|
||||
pMsg->SetControlCode(B_CAMERA_ROTATE_DOWN);
|
||||
@ -258,12 +258,12 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
float f = ((float)i) * 0.001f;
|
||||
if (f <= 0.02 && f >= -0.02)
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlActivated( false );
|
||||
pMsg->SetControlCode(B_CAMERA_ROTATE_RIGHT);
|
||||
pMsg->SetControlPct(0);
|
||||
plgDispatch::MsgSend( pMsg );
|
||||
plControlEventMsg* pMsg2 = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg2 = new plControlEventMsg;
|
||||
pMsg2->SetControlActivated( false );
|
||||
pMsg2->SetControlCode(B_CAMERA_ROTATE_LEFT);
|
||||
pMsg2->SetControlPct(0);
|
||||
@ -271,7 +271,7 @@ void plDInputDevice::Update(DIDEVICEOBJECTDATA* js)
|
||||
}
|
||||
else
|
||||
{
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
pMsg->SetControlActivated( true );
|
||||
if (f < 0)
|
||||
pMsg->SetControlCode(B_CAMERA_ROTATE_RIGHT);
|
||||
|
@ -225,7 +225,7 @@ hsBool plDebugInputInterface::InterpretInputEvent( plInputEventMsg *pMsg )
|
||||
|
||||
if (disable)
|
||||
{
|
||||
plCtrlCmd* pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd* pCmd = new plCtrlCmd( this );
|
||||
pCmd->fNetPropagateToPlayers = fMouseMap.fMap[i]->fControlFlags & kControlFlagNetPropagate;
|
||||
pCmd->fControlActivated = false;
|
||||
pCmd->fControlCode = fMouseMap.fMap[i]->fCode;
|
||||
@ -238,7 +238,7 @@ hsBool plDebugInputInterface::InterpretInputEvent( plInputEventMsg *pMsg )
|
||||
|
||||
if ((fMouseMap.fMap[i]->fControlFlags & kControlFlagRangePos) || (fMouseMap.fMap[i]->fControlFlags & kControlFlagRangeNeg))
|
||||
{
|
||||
plCtrlCmd* pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd* pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlActivated = true;
|
||||
pCmd->fControlCode = fMouseMap.fMap[i]->fCode;
|
||||
float pct = 0.0f;
|
||||
@ -270,7 +270,7 @@ hsBool plDebugInputInterface::InterpretInputEvent( plInputEventMsg *pMsg )
|
||||
else // if it is an 'always if in box' command see if it's not in the box
|
||||
if ( (fMouseMap.fMap[i]->fControlFlags & kControlFlagInBox) && (!CursorInBox(pMouseMsg, fMouseMap.fMap[i]->fBox)) )
|
||||
{
|
||||
plCtrlCmd* pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd* pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlActivated = false;
|
||||
pCmd->fControlCode = fMouseMap.fMap[i]->fCode;
|
||||
pCmd->fNetPropagateToPlayers = fMouseMap.fMap[i]->fControlFlags & kControlFlagNetPropagate;
|
||||
@ -310,7 +310,7 @@ hsBool plDebugInputInterface::InterpretInputEvent( plInputEventMsg *pMsg )
|
||||
if (!(fMouseMap.fMap[i]->fControlFlags & kControlFlagInBox))
|
||||
fControlFlags.SetBit(fMouseMap.fMap[i]->fCode);
|
||||
// issue the command
|
||||
plCtrlCmd* pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd* pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlActivated = true;
|
||||
pCmd->fControlCode = fMouseMap.fMap[i]->fCode;
|
||||
pCmd->fNetPropagateToPlayers = fMouseMap.fMap[i]->fControlFlags & kControlFlagNetPropagate;
|
||||
|
@ -108,7 +108,7 @@ void plKeyboardDevice::ReleaseAllKeys()
|
||||
fKeyboardState[i] = false;
|
||||
|
||||
// fake a key-up command
|
||||
plKeyEventMsg* pMsg = TRACKED_NEW plKeyEventMsg;
|
||||
plKeyEventMsg* pMsg = new plKeyEventMsg;
|
||||
pMsg->SetKeyCode( (plKeyDef)i );
|
||||
pMsg->SetKeyDown( false );
|
||||
pMsg->SetShiftKeyDown( fShiftKeyDown );
|
||||
@ -128,7 +128,7 @@ void plKeyboardDevice::ReleaseAllKeys()
|
||||
fKeyboardState[KEY_SHIFT] = false;
|
||||
fShiftKeyDown = false;
|
||||
|
||||
plKeyEventMsg* pMsg = TRACKED_NEW plKeyEventMsg;
|
||||
plKeyEventMsg* pMsg = new plKeyEventMsg;
|
||||
pMsg->SetKeyCode( KEY_SHIFT );
|
||||
pMsg->SetKeyDown( false );
|
||||
pMsg->SetShiftKeyDown( false );
|
||||
@ -142,7 +142,7 @@ void plKeyboardDevice::ReleaseAllKeys()
|
||||
fKeyboardState[KEY_CTRL] = false;
|
||||
fCtrlKeyDown = false;
|
||||
|
||||
plKeyEventMsg* pMsg = TRACKED_NEW plKeyEventMsg;
|
||||
plKeyEventMsg* pMsg = new plKeyEventMsg;
|
||||
pMsg->SetKeyCode( KEY_CTRL );
|
||||
pMsg->SetKeyDown( false );
|
||||
pMsg->SetShiftKeyDown( false );
|
||||
@ -187,7 +187,7 @@ void plKeyboardDevice::HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDo
|
||||
}
|
||||
|
||||
// send a key event...
|
||||
plKeyEventMsg* pMsg = TRACKED_NEW plKeyEventMsg;
|
||||
plKeyEventMsg* pMsg = new plKeyEventMsg;
|
||||
pMsg->SetKeyChar( c );
|
||||
pMsg->SetKeyCode( key );
|
||||
pMsg->SetKeyDown( bKeyDown );
|
||||
@ -405,7 +405,7 @@ hsBool plMouseDevice::MsgReceive(plMessage* msg)
|
||||
}
|
||||
else
|
||||
{
|
||||
plMouseEventMsg* pMsg = TRACKED_NEW plMouseEventMsg;
|
||||
plMouseEventMsg* pMsg = new plMouseEventMsg;
|
||||
pMsg->SetXPos( fXPos );
|
||||
pMsg->SetYPos( fYPos );
|
||||
pMsg->SetDX(0);
|
||||
@ -420,7 +420,7 @@ hsBool plMouseDevice::MsgReceive(plMessage* msg)
|
||||
}
|
||||
else
|
||||
{
|
||||
plMouseEventMsg* pMsg = TRACKED_NEW plMouseEventMsg;
|
||||
plMouseEventMsg* pMsg = new plMouseEventMsg;
|
||||
pMsg->SetXPos( fXPos );
|
||||
pMsg->SetYPos( fYPos );
|
||||
pMsg->SetDX(0);
|
||||
@ -466,7 +466,7 @@ hsBool plMouseDevice::MsgReceive(plMessage* msg)
|
||||
if (pXMsg)
|
||||
{
|
||||
// send a mouse event
|
||||
plMouseEventMsg* pMsg = TRACKED_NEW plMouseEventMsg;
|
||||
plMouseEventMsg* pMsg = new plMouseEventMsg;
|
||||
if (pXMsg->fX == 999)
|
||||
pMsg->SetXPos( fXPos + 0.001f );
|
||||
else
|
||||
@ -504,7 +504,7 @@ hsBool plMouseDevice::MsgReceive(plMessage* msg)
|
||||
if (pYMsg)
|
||||
{
|
||||
// send a mouse event
|
||||
plMouseEventMsg* pMsg = TRACKED_NEW plMouseEventMsg;
|
||||
plMouseEventMsg* pMsg = new plMouseEventMsg;
|
||||
pMsg->SetXPos( fXPos );
|
||||
if (pYMsg->fY == 999)
|
||||
pMsg->SetYPos( fYPos + 0.01f );
|
||||
@ -543,7 +543,7 @@ hsBool plMouseDevice::MsgReceive(plMessage* msg)
|
||||
{
|
||||
|
||||
// send a mouse event
|
||||
plMouseEventMsg* pMsg = TRACKED_NEW plMouseEventMsg;
|
||||
plMouseEventMsg* pMsg = new plMouseEventMsg;
|
||||
pMsg->SetXPos( fXPos );
|
||||
pMsg->SetYPos( fYPos );
|
||||
pMsg->SetDX(0);
|
||||
@ -603,7 +603,7 @@ hsBool plMouseDevice::MsgReceive(plMessage* msg)
|
||||
if (pBMsg->fButton & kRightButtonDblClk)
|
||||
{
|
||||
// right button dbl clicked, send TWO messages
|
||||
plMouseEventMsg* pMsg2 = TRACKED_NEW plMouseEventMsg;
|
||||
plMouseEventMsg* pMsg2 = new plMouseEventMsg;
|
||||
pMsg2->SetXPos( fXPos );
|
||||
pMsg2->SetYPos( fYPos );
|
||||
pMsg2->SetDX(0);
|
||||
@ -621,7 +621,7 @@ hsBool plMouseDevice::MsgReceive(plMessage* msg)
|
||||
if (pBMsg->fButton & kLeftButtonDblClk)
|
||||
{
|
||||
// left button dbl clicked, send TWO messages
|
||||
plMouseEventMsg* pMsg2 = TRACKED_NEW plMouseEventMsg;
|
||||
plMouseEventMsg* pMsg2 = new plMouseEventMsg;
|
||||
pMsg2->SetXPos( fXPos );
|
||||
pMsg2->SetYPos( fYPos );
|
||||
pMsg2->SetDX(0);
|
||||
|
@ -65,7 +65,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
plInputInterface::plInputInterface()
|
||||
{
|
||||
fEnabled = false;
|
||||
fControlMap = TRACKED_NEW plKeyMap;
|
||||
fControlMap = new plKeyMap;
|
||||
}
|
||||
|
||||
plInputInterface::~plInputInterface()
|
||||
@ -123,7 +123,7 @@ void plInputInterface::IDeactivateBinding(const plKeyBinding *binding)
|
||||
{
|
||||
if( !(binding->GetCodeFlags() & kControlFlagNoDeactivate) && !(binding->GetCodeFlags() & kControlFlagToggle) )
|
||||
{
|
||||
plCtrlCmd *pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd *pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlCode = binding->GetCode();
|
||||
pCmd->fControlActivated = false;
|
||||
pCmd->SetCmdString( binding->GetExtendedString() );
|
||||
@ -293,7 +293,7 @@ hsBool plInputInterface::ProcessKeyBindings( plInputEventMsg *msg )
|
||||
return true;
|
||||
|
||||
/// OK, generate the message to send
|
||||
plCtrlCmd *pCmd = TRACKED_NEW plCtrlCmd( this );
|
||||
plCtrlCmd *pCmd = new plCtrlCmd( this );
|
||||
pCmd->fControlCode = binding->GetCode();
|
||||
pCmd->fControlActivated = activate;
|
||||
|
||||
|
@ -158,15 +158,15 @@ void plInputInterfaceMgr::Init( void )
|
||||
plgDispatch::Dispatch()->RegisterForExactType( plClientMsg::Index(), GetKey() );
|
||||
|
||||
/// Hacks (?) for now
|
||||
plAvatarInputInterface *avatar = TRACKED_NEW plAvatarInputInterface();
|
||||
plAvatarInputInterface *avatar = new plAvatarInputInterface();
|
||||
IAddInterface( avatar );
|
||||
hsRefCnt_SafeUnRef( avatar );
|
||||
|
||||
plSceneInputInterface *scene = TRACKED_NEW plSceneInputInterface();
|
||||
plSceneInputInterface *scene = new plSceneInputInterface();
|
||||
IAddInterface( scene );
|
||||
hsRefCnt_SafeUnRef( scene );
|
||||
|
||||
plDebugInputInterface *camDrive = TRACKED_NEW plDebugInputInterface();
|
||||
plDebugInputInterface *camDrive = new plDebugInputInterface();
|
||||
IAddInterface( camDrive );
|
||||
hsRefCnt_SafeUnRef( camDrive );
|
||||
|
||||
@ -313,7 +313,7 @@ hsBool plInputInterfaceMgr::IEval( double secs, float del, uint32_t dirty )
|
||||
if( !fMessageQueue[ i ]->GetSource()->IHandleCtrlCmd( fMessageQueue[ i ] ) )
|
||||
{
|
||||
// Nope, just dispatch it like normal
|
||||
plControlEventMsg* pMsg = TRACKED_NEW plControlEventMsg;
|
||||
plControlEventMsg* pMsg = new plControlEventMsg;
|
||||
for (int j = 0; j < fReceivers.Count(); j++)
|
||||
pMsg->AddReceiver( fReceivers[ j ] );
|
||||
pMsg->SetControlActivated( fMessageQueue[i]->fControlActivated );
|
||||
@ -330,7 +330,7 @@ hsBool plInputInterfaceMgr::IEval( double secs, float del, uint32_t dirty )
|
||||
|
||||
if (fMessageQueue[i]->fNetPropagateToPlayers)
|
||||
{
|
||||
pMsg = TRACKED_NEW plControlEventMsg;
|
||||
pMsg = new plControlEventMsg;
|
||||
for (int j = 0; j < fReceivers.Count(); j++)
|
||||
if (fReceivers[j] == plNetClientApp::GetInstance()->GetLocalPlayerKey())
|
||||
pMsg->AddReceiver( fReceivers[j] );
|
||||
|
@ -174,7 +174,7 @@ void plInputManager::RecenterCursor()
|
||||
}
|
||||
void plInputManager::CreateInterfaceMod(plPipeline* p)
|
||||
{
|
||||
fInterfaceMgr = TRACKED_NEW plInputInterfaceMgr();
|
||||
fInterfaceMgr = new plInputInterfaceMgr();
|
||||
fInterfaceMgr->Init();
|
||||
}
|
||||
|
||||
@ -182,7 +182,7 @@ void plInputManager::InitDInput(HINSTANCE hInst, HWND hWnd)
|
||||
{
|
||||
if (fUseDInput)
|
||||
{
|
||||
fDInputMgr = TRACKED_NEW plDInputMgr;
|
||||
fDInputMgr = new plDInputMgr;
|
||||
fDInputMgr->Init(hInst, hWnd);
|
||||
}
|
||||
}
|
||||
@ -309,7 +309,7 @@ void plInputManager::HandleWin32ControlEvent(UINT message, WPARAM Wparam, LPARAM
|
||||
break;
|
||||
case MOUSEWHEEL:
|
||||
{
|
||||
plMouseEventMsg* pMsg = TRACKED_NEW plMouseEventMsg;
|
||||
plMouseEventMsg* pMsg = new plMouseEventMsg;
|
||||
int zDelta = GET_WHEEL_DELTA_WPARAM(Wparam);
|
||||
pMsg->SetWheelDelta((float)zDelta);
|
||||
if (zDelta < 0)
|
||||
@ -339,9 +339,9 @@ void plInputManager::HandleWin32ControlEvent(UINT message, WPARAM Wparam, LPARAM
|
||||
RECT rect;
|
||||
GetClientRect(hWnd, &rect);
|
||||
|
||||
plIMouseXEventMsg* pXMsg = TRACKED_NEW plIMouseXEventMsg;
|
||||
plIMouseYEventMsg* pYMsg = TRACKED_NEW plIMouseYEventMsg;
|
||||
plIMouseBEventMsg* pBMsg = TRACKED_NEW plIMouseBEventMsg;
|
||||
plIMouseXEventMsg* pXMsg = new plIMouseXEventMsg;
|
||||
plIMouseYEventMsg* pYMsg = new plIMouseYEventMsg;
|
||||
plIMouseBEventMsg* pBMsg = new plIMouseBEventMsg;
|
||||
|
||||
pXMsg->fWx = LOWORD(Lparam);
|
||||
pXMsg->fX = (float)LOWORD(Lparam) / (float)rect.right;
|
||||
@ -466,7 +466,7 @@ void plInputManager::AddInputDevice( plInputDevice *pDev )
|
||||
plDInputMgr::plDInputMgr() :
|
||||
fDI(nil)
|
||||
{
|
||||
fDI = TRACKED_NEW plDInput;
|
||||
fDI = new plDInput;
|
||||
}
|
||||
|
||||
plDInputMgr::~plDInputMgr()
|
||||
@ -503,7 +503,7 @@ void plDInputMgr::Init(HINSTANCE hInst, HWND hWnd)
|
||||
|
||||
|
||||
// set up the action mapping
|
||||
fDI->fActionFormat = TRACKED_NEW DIACTIONFORMAT;
|
||||
fDI->fActionFormat = new DIACTIONFORMAT;
|
||||
fDI->fActionFormat->dwSize = sizeof(DIACTIONFORMAT);
|
||||
fDI->fActionFormat->dwActionSize = sizeof(DIACTION);
|
||||
fDI->fActionFormat->dwDataSize = NUM_ACTIONS * sizeof(DWORD);
|
||||
@ -527,7 +527,7 @@ void plDInputMgr::Init(HINSTANCE hInst, HWND hWnd)
|
||||
|
||||
for (i = 0; i < fDI->fSticks.Count(); i++)
|
||||
{
|
||||
fDI->fSticks[i]->fCaps = TRACKED_NEW DIDEVCAPS;
|
||||
fDI->fSticks[i]->fCaps = new DIDEVCAPS;
|
||||
fDI->fSticks[i]->fCaps->dwSize = sizeof(DIDEVCAPS);
|
||||
hr = fDI->fSticks[i]->fDevice->GetCapabilities(fDI->fSticks[i]->fCaps);
|
||||
hsAssert(!hr, "Unable to acquire devcaps in DInput Device!");
|
||||
@ -538,7 +538,7 @@ void plDInputMgr::Init(HINSTANCE hInst, HWND hWnd)
|
||||
fhWnd = hWnd;
|
||||
|
||||
for (i = 0; i < fDI->fSticks.Count(); i++)
|
||||
fInputDevice.Append( TRACKED_NEW plDInputDevice );
|
||||
fInputDevice.Append( new plDInputDevice );
|
||||
}
|
||||
|
||||
void plDInputMgr::Update()
|
||||
@ -632,7 +632,7 @@ int __stdcall plDInputMgr::EnumGamepadCallback(const DIDEVICEINSTANCE* device, v
|
||||
|
||||
if(!FAILED(hr))
|
||||
{
|
||||
pDI->fSticks.Append(TRACKED_NEW plDIDevice(fStick));
|
||||
pDI->fSticks.Append(new plDIDevice(fStick));
|
||||
|
||||
// the following code pertaining to the action map shouldn't be here.
|
||||
// in fact this shouldn't work at all according to MS, but this is
|
||||
|
@ -149,7 +149,7 @@ void plSceneInputInterface::Init( plInputInterfaceMgr *manager )
|
||||
fPendingLink = false;
|
||||
|
||||
// register for control messages
|
||||
plCmdIfaceModMsg* pModMsg = TRACKED_NEW plCmdIfaceModMsg;
|
||||
plCmdIfaceModMsg* pModMsg = new plCmdIfaceModMsg;
|
||||
pModMsg->SetBCastFlag(plMessage::kBCastByExactType);
|
||||
pModMsg->SetSender(fManager->GetKey());
|
||||
pModMsg->SetCmd(plCmdIfaceModMsg::kAdd);
|
||||
@ -179,7 +179,7 @@ void plSceneInputInterface::ClearClickableMap()
|
||||
|
||||
void plSceneInputInterface::IHalfFadeAvatar(hsBool out)
|
||||
{
|
||||
plIfaceFadeAvatarMsg* pMsg = TRACKED_NEW plIfaceFadeAvatarMsg();
|
||||
plIfaceFadeAvatarMsg* pMsg = new plIfaceFadeAvatarMsg();
|
||||
pMsg->SetSubjectKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
|
||||
pMsg->SetBCastFlag(plMessage::kBCastByExactType);
|
||||
pMsg->SetBCastFlag(plMessage::kNetPropagate, FALSE);
|
||||
@ -224,7 +224,7 @@ hsBool plSceneInputInterface::IEval( double secs, float del, uint32_t dirty )
|
||||
int i;
|
||||
for (i=0; i < fClickableMap.Count(); i++)
|
||||
{
|
||||
plFakeOutMsg *pMsg = TRACKED_NEW plFakeOutMsg;
|
||||
plFakeOutMsg *pMsg = new plFakeOutMsg;
|
||||
pMsg->SetSender( fManager->GetKey() );
|
||||
pMsg->AddReceiver( fClickableMap[i]->key );
|
||||
plgDispatch::MsgSend( pMsg );
|
||||
@ -295,7 +295,7 @@ hsBool plSceneInputInterface::MsgReceive( plMessage *msg )
|
||||
fCurrentClickableLogicMod = pLogicMod->GetKey();
|
||||
fCurrentClickPoint = pLOSMsg->fHitPoint;
|
||||
for (int x = 0; x < pMod->GetNumReferencedKeys(); x++)
|
||||
fClickableMap.Append( TRACKED_NEW clickableTest(pMod->GetReferencedKey(x)));
|
||||
fClickableMap.Append( new clickableTest(pMod->GetReferencedKey(x)));
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -626,7 +626,7 @@ hsBool plSceneInputInterface::MsgReceive( plMessage *msg )
|
||||
{
|
||||
// tell them to ignore us
|
||||
|
||||
plInputIfaceMgrMsg* pMsg = TRACKED_NEW plInputIfaceMgrMsg(plInputIfaceMgrMsg::kDisableAvatarClickable);
|
||||
plInputIfaceMgrMsg* pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kDisableAvatarClickable);
|
||||
pMsg->SetAvKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
|
||||
pMsg->SetBCastFlag(plMessage::kNetPropagate);
|
||||
pMsg->SetBCastFlag(plMessage::kNetForce);
|
||||
@ -636,7 +636,7 @@ hsBool plSceneInputInterface::MsgReceive( plMessage *msg )
|
||||
|
||||
// and tell them to ignore our victim
|
||||
|
||||
//plInputIfaceMgrMsg* pMsg2 = TRACKED_NEW plInputIfaceMgrMsg(plInputIfaceMgrMsg::kDisableAvatarClickable);
|
||||
//plInputIfaceMgrMsg* pMsg2 = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kDisableAvatarClickable);
|
||||
//pMsg2->SetAvKey(fOffereeKey);
|
||||
//pMsg2->SetBCastFlag(plMessage::kNetPropagate);
|
||||
//pMsg2->SetBCastFlag(plMessage::kNetForce);
|
||||
@ -650,7 +650,7 @@ hsBool plSceneInputInterface::MsgReceive( plMessage *msg )
|
||||
{
|
||||
if (fGUIIgnoredAvatars[x] == plNetClientMgr::GetInstance()->GetLocalPlayerKey())
|
||||
{
|
||||
plInputIfaceMgrMsg* pMsg3 = TRACKED_NEW plInputIfaceMgrMsg(plInputIfaceMgrMsg::kGUIDisableAvatarClickable);
|
||||
plInputIfaceMgrMsg* pMsg3 = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kGUIDisableAvatarClickable);
|
||||
pMsg3->SetAvKey(fGUIIgnoredAvatars[x]);
|
||||
pMsg3->SetBCastFlag(plMessage::kNetPropagate);
|
||||
pMsg3->SetBCastFlag(plMessage::kNetForce);
|
||||
@ -916,14 +916,14 @@ void plSceneInputInterface::ISetLastClicked( plKey obj, hsPoint3 hitPoint )
|
||||
// Send an "un-picked" message to it
|
||||
if( !fLastClickIsAvatar )
|
||||
{
|
||||
plPickedMsg *pPickedMsg = TRACKED_NEW plPickedMsg;
|
||||
plPickedMsg *pPickedMsg = new plPickedMsg;
|
||||
pPickedMsg->AddReceiver( fLastClicked );
|
||||
pPickedMsg->fPicked = false;
|
||||
plgDispatch::MsgSend( pPickedMsg );
|
||||
}
|
||||
else
|
||||
{
|
||||
plRemoteAvatarInfoMsg *pMsg = TRACKED_NEW plRemoteAvatarInfoMsg;
|
||||
plRemoteAvatarInfoMsg *pMsg = new plRemoteAvatarInfoMsg;
|
||||
pMsg->SetAvatarKey( nil );
|
||||
plgDispatch::MsgSend( pMsg );
|
||||
}
|
||||
@ -936,7 +936,7 @@ void plSceneInputInterface::ISetLastClicked( plKey obj, hsPoint3 hitPoint )
|
||||
{
|
||||
#ifdef MATT_WAS_HERE
|
||||
// now we send pick messages to avatars as well...
|
||||
plPickedMsg *pPickedMsg = TRACKED_NEW plPickedMsg;
|
||||
plPickedMsg *pPickedMsg = new plPickedMsg;
|
||||
pPickedMsg->AddReceiver( fLastClicked );
|
||||
pPickedMsg->fHitPoint = hitPoint;
|
||||
plgDispatch::MsgSend( pPickedMsg );
|
||||
@ -944,7 +944,7 @@ void plSceneInputInterface::ISetLastClicked( plKey obj, hsPoint3 hitPoint )
|
||||
// if it's an avatar, we also send this thing
|
||||
if(fLastClickIsAvatar)
|
||||
{
|
||||
plRemoteAvatarInfoMsg *pMsg = TRACKED_NEW plRemoteAvatarInfoMsg;
|
||||
plRemoteAvatarInfoMsg *pMsg = new plRemoteAvatarInfoMsg;
|
||||
pMsg->SetAvatarKey( fLastClicked );
|
||||
plgDispatch::MsgSend( pMsg );
|
||||
}
|
||||
@ -952,14 +952,14 @@ void plSceneInputInterface::ISetLastClicked( plKey obj, hsPoint3 hitPoint )
|
||||
// Send a "picked" message to it
|
||||
if( !fLastClickIsAvatar )
|
||||
{
|
||||
plPickedMsg *pPickedMsg = TRACKED_NEW plPickedMsg;
|
||||
plPickedMsg *pPickedMsg = new plPickedMsg;
|
||||
pPickedMsg->AddReceiver( fLastClicked );
|
||||
pPickedMsg->fHitPoint = hitPoint;
|
||||
plgDispatch::MsgSend( pPickedMsg );
|
||||
}
|
||||
else
|
||||
{
|
||||
plRemoteAvatarInfoMsg *pMsg = TRACKED_NEW plRemoteAvatarInfoMsg;
|
||||
plRemoteAvatarInfoMsg *pMsg = new plRemoteAvatarInfoMsg;
|
||||
pMsg->SetAvatarKey( fLastClicked );
|
||||
plgDispatch::MsgSend( pMsg );
|
||||
}
|
||||
@ -1074,9 +1074,9 @@ void plSceneInputInterface::IManageIgnoredAvatars(plKey& offeree, hsBool add)
|
||||
// tell everyone else to be able to / not to be able to select this avatar
|
||||
plInputIfaceMgrMsg* pMsg = 0;
|
||||
if (!add)
|
||||
pMsg = TRACKED_NEW plInputIfaceMgrMsg(plInputIfaceMgrMsg::kEnableAvatarClickable);
|
||||
pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kEnableAvatarClickable);
|
||||
else
|
||||
pMsg = TRACKED_NEW plInputIfaceMgrMsg(plInputIfaceMgrMsg::kDisableAvatarClickable);
|
||||
pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kDisableAvatarClickable);
|
||||
pMsg->SetAvKey(offeree);
|
||||
pMsg->SetBCastFlag(plMessage::kNetPropagate);
|
||||
pMsg->SetBCastFlag(plMessage::kNetForce);
|
||||
@ -1112,7 +1112,7 @@ void plSceneInputInterface::ISendOfferNotification(plKey& offeree, int ID, hsBoo
|
||||
delete [] members;
|
||||
|
||||
}
|
||||
plNotifyMsg* pMsg = TRACKED_NEW plNotifyMsg;
|
||||
plNotifyMsg* pMsg = new plNotifyMsg;
|
||||
pMsg->AddOfferBookEvent(plNetClientMgr::GetInstance()->GetLocalPlayerKey(), ID, offereeID);
|
||||
pMsg->AddReceiver(fBookKey);
|
||||
if (net)
|
||||
@ -1135,9 +1135,9 @@ void plSceneInputInterface::ISendAvatarDisabledNotification(hsBool enabled)
|
||||
{
|
||||
plInputIfaceMgrMsg* pMsg = 0;
|
||||
if (enabled)
|
||||
pMsg = TRACKED_NEW plInputIfaceMgrMsg(plInputIfaceMgrMsg::kEnableAvatarClickable);
|
||||
pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kEnableAvatarClickable);
|
||||
else
|
||||
pMsg = TRACKED_NEW plInputIfaceMgrMsg(plInputIfaceMgrMsg::kDisableAvatarClickable);
|
||||
pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kDisableAvatarClickable);
|
||||
pMsg->SetAvKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
|
||||
pMsg->SetBCastFlag(plMessage::kNetPropagate);
|
||||
pMsg->SetBCastFlag(plMessage::kNetForce);
|
||||
@ -1170,12 +1170,12 @@ void plSceneInputInterface::IRequestLOSCheck( float xPos, float yPos, int ID
|
||||
plLOSRequestMsg* pMsg;
|
||||
|
||||
if(ID == ID_FIND_CLICKABLE) {
|
||||
pMsg = TRACKED_NEW plLOSRequestMsg( fManager->GetKey(), startPos, endPos, plSimDefs::kLOSDBUIItems, plLOSRequestMsg::kTestClosest );
|
||||
pMsg = new plLOSRequestMsg( fManager->GetKey(), startPos, endPos, plSimDefs::kLOSDBUIItems, plLOSRequestMsg::kTestClosest );
|
||||
pMsg->SetCullDB(plSimDefs::kLOSDBUIBlockers);
|
||||
} else if(ID == ID_FIND_WALKABLE_GROUND) {
|
||||
pMsg = TRACKED_NEW plLOSRequestMsg( fManager->GetKey(), startPos, endPos, plSimDefs::kLOSDBAvatarWalkable, plLOSRequestMsg::kTestClosest);
|
||||
pMsg = new plLOSRequestMsg( fManager->GetKey(), startPos, endPos, plSimDefs::kLOSDBAvatarWalkable, plLOSRequestMsg::kTestClosest);
|
||||
} else
|
||||
pMsg = TRACKED_NEW plLOSRequestMsg( fManager->GetKey(), startPos, endPos, plSimDefs::kLOSDBLocalAvatar, plLOSRequestMsg::kTestClosest);
|
||||
pMsg = new plLOSRequestMsg( fManager->GetKey(), startPos, endPos, plSimDefs::kLOSDBLocalAvatar, plLOSRequestMsg::kTestClosest);
|
||||
|
||||
pMsg->SetReportType( plLOSRequestMsg::kReportHitOrMiss );
|
||||
|
||||
|
Reference in New Issue
Block a user