Skip to content

Commit 8f08954

Browse files
committed
Changes how to update aim position
1 parent 12a9b61 commit 8f08954

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

Scripts/AimAtCursorPlayerCharacterController.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,11 @@ protected void UpdateInput()
233233
ReloadAmmo();
234234
}
235235
}
236-
// Update inputs
236+
237237
UpdateLookInput();
238238
UpdateWASDInput();
239-
// Set sprinting state
240239
PlayerCharacterEntity.SetExtraMovement(isSprinting ? ExtraMovementState.IsSprinting : ExtraMovementState.None);
240+
PlayerCharacterEntity.AimPosition = PlayerCharacterEntity.GetDefaultAttackAimPosition(ref isLeftHandAttacking);
241241
}
242242

243243
protected void UpdateWASDInput()
@@ -282,12 +282,7 @@ protected void UpdateFireInput()
282282
{
283283
if (!ConstructingBuildingEntity)
284284
{
285-
AimPosition aimPosition = new AimPosition()
286-
{
287-
hasValue = true,
288-
value = PlayerCharacterEntity.GetDefaultAttackAimPosition(ref isLeftHandAttacking),
289-
};
290-
if (PlayerCharacterEntity.CallServerAttack(isLeftHandAttacking, aimPosition))
285+
if (PlayerCharacterEntity.CallServerAttack(isLeftHandAttacking))
291286
isLeftHandAttacking = !isLeftHandAttacking;
292287
}
293288
}
@@ -442,7 +437,7 @@ protected void UseSkill(string id, Vector3? aimPosition)
442437
return;
443438

444439
bool isAttackSkill = skill.IsAttack();
445-
AimPosition skillAimPosition = AimPosition.CreateForSkill(PlayerCharacterEntity, aimPosition, isAttackSkill, ref isLeftHandAttacking);
440+
AimPosition skillAimPosition = AimPosition.Create(aimPosition);
446441
if (PlayerCharacterEntity.CallServerUseSkill(skill.DataId, isLeftHandAttacking, skillAimPosition) && isAttackSkill)
447442
{
448443
isLeftHandAttacking = !isLeftHandAttacking;
@@ -500,7 +495,7 @@ protected void UseItem(string id, Vector3? aimPosition)
500495
else if (item.IsSkill())
501496
{
502497
bool isAttackSkill = (item as ISkillItem).UsingSkill.IsAttack();
503-
AimPosition skillAimPosition = AimPosition.CreateForSkill(PlayerCharacterEntity, aimPosition, isAttackSkill, ref isLeftHandAttacking);
498+
AimPosition skillAimPosition = AimPosition.Create(aimPosition);
504499
if (PlayerCharacterEntity.CallServerUseSkillItem((short)itemIndex, isLeftHandAttacking, skillAimPosition) && isAttackSkill)
505500
{
506501
isLeftHandAttacking = !isLeftHandAttacking;

0 commit comments

Comments
 (0)